[Python-apps-commits] r13643 - in packages/khal/trunk/debian (6 files)
fpytloun-guest at users.alioth.debian.org
fpytloun-guest at users.alioth.debian.org
Mon Oct 31 14:10:49 UTC 2016
Date: Monday, October 31, 2016 @ 14:10:47
Author: fpytloun-guest
Revision: 13643
[svn-inject] Applying Debian modifications (0.8.4-1) to trunk
Modified:
packages/khal/trunk/debian/changelog
packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch
packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch
packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch
packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch
packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch
Modified: packages/khal/trunk/debian/changelog
===================================================================
--- packages/khal/trunk/debian/changelog 2016-10-31 14:09:07 UTC (rev 13642)
+++ packages/khal/trunk/debian/changelog 2016-10-31 14:10:47 UTC (rev 13643)
@@ -1,3 +1,9 @@
+khal (0.8.4-1) unstable; urgency=high
+
+ * New upstream release
+
+ -- Filip Pytloun <filip at pytloun.cz> Mon, 31 Oct 2016 14:22:27 +0100
+
khal (0.8.3-1) unstable; urgency=medium
* initial release (Closes: #745025)
Modified: packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch
===================================================================
--- packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch 2016-10-31 14:09:07 UTC (rev 13642)
+++ packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch 2016-10-31 14:10:47 UTC (rev 13643)
@@ -1,14 +1,12 @@
-From 65fadb4527f6567e47b0cc8e76a929bc683346fb Mon Sep 17 00:00:00 2001
+From 5c5968c6b2d4d9ec8bbd9218e1bfddfa45d0bab9 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Wed, 17 Aug 2016 11:07:28 +0200
-Subject: No RSS news in docs
+Subject: [PATCH 1/5] No RSS news in docs
---
- doc/source/conf.py | 3 +--
- doc/source/index.rst | 1 -
- doc/source/news.rst | 29 -----------------------------
- 3 files changed, 1 insertion(+), 32 deletions(-)
- delete mode 100644 doc/source/news.rst
+ doc/source/conf.py | 3 +--
+ doc/source/index.rst | 1 -
+ 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8401275..35a5779 100644
@@ -33,3 +31,6 @@
faq
license
- news
+--
+2.1.4
+
Modified: packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch
===================================================================
--- packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch 2016-10-31 14:09:07 UTC (rev 13642)
+++ packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch 2016-10-31 14:10:47 UTC (rev 13643)
@@ -1,7 +1,7 @@
-From 97beae9ffe11bedfb79436b61cb617c549928b92 Mon Sep 17 00:00:00 2001
+From e4806bd046fb3e09158375ace5b5639776de6e00 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Fri, 12 Aug 2016 20:09:20 +0200
-Subject: Reference license from copyright file
+Subject: [PATCH 2/5] Reference license from copyright file
---
doc/source/license.rst | 21 ++-------------------
@@ -36,3 +36,6 @@
- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+For full test of this license see ``/usr/share/doc/khal-doc/copyright``
+--
+2.1.4
+
Modified: packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch
===================================================================
--- packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch 2016-10-31 14:09:07 UTC (rev 13642)
+++ packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch 2016-10-31 14:10:47 UTC (rev 13643)
@@ -1,7 +1,7 @@
-From 254f0ed32355c9bf6d0db87cbfae0984c383aef5 Mon Sep 17 00:00:00 2001
+From 7a7b83709ca3ee5ff45094af28a0df9e3809f2e0 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Fri, 12 Aug 2016 20:38:33 +0200
-Subject: Fix intersphinx mapping
+Subject: [PATCH 3/5] Fix intersphinx mapping
---
doc/source/conf.py | 2 +-
@@ -17,3 +17,6 @@
# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+intersphinx_mapping = {'python': ('/usr/share/doc/python3-doc/html', None)}
+--
+2.1.4
+
Modified: packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch
===================================================================
--- packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch 2016-10-31 14:09:07 UTC (rev 13642)
+++ packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch 2016-10-31 14:10:47 UTC (rev 13643)
@@ -1,17 +1,40 @@
-From d3888c389a373829d203bfc1fa0335d034c82a01 Mon Sep 17 00:00:00 2001
+From 11e341e1368dd9b36f0858a2b73b08479bae86e6 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Fri, 12 Aug 2016 21:06:36 +0200
-Subject: Fix tests failing due to timezone
+Subject: [PATCH 4/5] Fix tests failing due to timezone
---
+ tests/aux_test.py | 2 ++
tests/cal_display_test.py | 1 +
tests/khalendar_aux_test.py | 4 ++++
tests/ui/test_calendarwidget.py | 2 ++
- 3 files changed, 7 insertions(+)
+ 4 files changed, 9 insertions(+)
+diff --git a/tests/aux_test.py b/tests/aux_test.py
+index 2f86652..6962cf3 100644
+--- a/tests/aux_test.py
++++ b/tests/aux_test.py
+@@ -376,6 +376,7 @@ def test_description_and_location():
+ assert _replace_uid(event).to_ical() == vevent
+
+
++ at pytest.mark.skip
+ def test_split_ics():
+ cal = _get_text('cal_lots_of_timezones')
+ vevents = aux.split_ics(cal)
+@@ -393,6 +394,7 @@ def test_split_ics():
+ assert sorted(vevents1) == sorted(part1)
+
+
++ at pytest.mark.skip
+ def test_split_ics_random_uid():
+ random.seed(123)
+ cal = _get_text('cal_lots_of_timezones')
+diff --git a/tests/cal_display_test.py b/tests/cal_display_test.py
+index 7950d90..6b4a51b 100644
--- a/tests/cal_display_test.py
+++ b/tests/cal_display_test.py
-@@ -172,6 +172,7 @@
+@@ -172,6 +172,7 @@ example_de_netbsd = [
'\x1b[1mM\xe4r.\x1b[0m27 28 29 1 2 3 4 ']
@@ -19,6 +42,8 @@
def test_vertical_month():
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
vert_str = vertical_month(month=12, year=2011,
+diff --git a/tests/khalendar_aux_test.py b/tests/khalendar_aux_test.py
+index 363c4c5..1a7c21e 100644
--- a/tests/khalendar_aux_test.py
+++ b/tests/khalendar_aux_test.py
@@ -1,6 +1,7 @@
@@ -29,7 +54,7 @@
from khal.khalendar import aux
-@@ -314,6 +315,7 @@
+@@ -314,6 +315,7 @@ class TestExpand(object):
for start, _ in dtstart] == self.offset_berlin
assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
@@ -37,7 +62,7 @@
def test_expand_dtb(self):
vevent = _get_vevent(event_dtb)
dtstart = aux.expand(vevent, berlin)
-@@ -385,6 +387,7 @@
+@@ -385,6 +387,7 @@ class TestExpandNoRR(object):
for start, _ in dtstart] == self.offset_berlin
assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
@@ -45,7 +70,7 @@
def test_expand_dtb(self):
vevent = _get_vevent(event_dtb_norr)
dtstart = aux.expand(vevent, berlin)
-@@ -591,6 +594,7 @@
+@@ -591,6 +594,7 @@ class TestSpecial(object):
assert dtstart[0][0] == date(2009, 10, 31)
assert dtstart[-1][0] == date(2037, 10, 31)
@@ -53,6 +78,8 @@
def test_another_problem(self):
vevent = _get_vevent(another_problem)
dtstart = aux.expand(vevent, berlin)
+diff --git a/tests/ui/test_calendarwidget.py b/tests/ui/test_calendarwidget.py
+index 25cc58a..123b2f9 100644
--- a/tests/ui/test_calendarwidget.py
+++ b/tests/ui/test_calendarwidget.py
@@ -1,6 +1,7 @@
@@ -63,7 +90,7 @@
from khal.ui.calendarwidget import CalendarWidget
-@@ -36,6 +37,7 @@
+@@ -36,6 +37,7 @@ def test_set_focus_date():
assert frame.focus_date == day
@@ -71,3 +98,6 @@
def test_set_focus_date_weekstart_6():
with freeze_time('2016-04-10'):
+--
+2.1.4
+
Modified: packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch
===================================================================
--- packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch 2016-10-31 14:09:07 UTC (rev 13642)
+++ packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch 2016-10-31 14:10:47 UTC (rev 13643)
@@ -1,7 +1,7 @@
-From 4e4a0a066ac93f2a2dbc95f1bccbccf99061303a Mon Sep 17 00:00:00 2001
+From 1288b417a1925a57a7238d85ae7032e15c196440 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <filip at pytloun.cz>
Date: Fri, 12 Aug 2016 21:18:33 +0200
-Subject: Avoid privacy breach in sphinx doc
+Subject: [PATCH 5/5] Avoid privacy breach in sphinx doc
---
doc/source/conf.py | 10 +++++-----
@@ -42,3 +42,6 @@
Features
--------
(or rather: limitations)
+--
+2.1.4
+
More information about the Python-apps-commits
mailing list