[Python-apps-commits] r14252 - in packages/khal/trunk/debian (7 files)

fpytloun-guest at users.alioth.debian.org fpytloun-guest at users.alioth.debian.org
Tue Jul 18 12:03:53 UTC 2017


    Date: Tuesday, July 18, 2017 @ 12:03:50
  Author: fpytloun-guest
Revision: 14252

New upstream release

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
Deleted:
  packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch

Modified: packages/khal/trunk/debian/changelog
===================================================================
--- packages/khal/trunk/debian/changelog	2017-07-18 10:31:24 UTC (rev 14251)
+++ packages/khal/trunk/debian/changelog	2017-07-18 12:03:50 UTC (rev 14252)
@@ -1,3 +1,10 @@
+khal (1:0.9.6-1) unstable; urgency=medium
+
+  * New upstream version (Closes: #867797)
+  * d/patches: rebase for new release
+
+ -- Filip Pytloun <filip at pytloun.cz>  Tue, 18 Jul 2017 11:49:34 +0200
+
 khal (1:0.9.5-4) experimental; urgency=medium
 
   * Add locales-all into build dependencies as all locales are needed to

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	2017-07-18 10:31:24 UTC (rev 14251)
+++ packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch	2017-07-18 12:03:50 UTC (rev 14252)
@@ -1,4 +1,4 @@
-From 76da03778dfba760a43a761d94f6a13a8a3aa5c6 Mon Sep 17 00:00:00 2001
+From fa69e3cc18a84e4a8012ce0349e70abb7efcba06 Mon Sep 17 00:00:00 2001
 From: Filip Pytloun <filip at pytloun.cz>
 Date: Wed, 17 Aug 2016 11:07:28 +0200
 Subject: [PATCH 1/6] No RSS news in docs

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	2017-07-18 10:31:24 UTC (rev 14251)
+++ packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch	2017-07-18 12:03:50 UTC (rev 14252)
@@ -1,4 +1,4 @@
-From c2b6c2cee96504ec32681170ac21f8b5ef91da17 Mon Sep 17 00:00:00 2001
+From fa3b335e5e4105aac11aa9dab4c062435bcde16e Mon Sep 17 00:00:00 2001
 From: Filip Pytloun <filip at pytloun.cz>
 Date: Fri, 12 Aug 2016 20:09:20 +0200
 Subject: [PATCH 2/6] Reference license from copyright file

Modified: packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch
===================================================================
--- packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch	2017-07-18 10:31:24 UTC (rev 14251)
+++ packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch	2017-07-18 12:03:50 UTC (rev 14252)
@@ -1,4 +1,4 @@
-From fca3740b109d216d4ef5fde8cbbd579b9f089844 Mon Sep 17 00:00:00 2001
+From ddc8c68e1a17af3f052185d17b1d3fe88da37f2b Mon Sep 17 00:00:00 2001
 From: Filip Pytloun <filip at pytloun.cz>
 Date: Fri, 12 Aug 2016 20:38:33 +0200
 Subject: [PATCH 3/6] Fix intersphinx mapping

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	2017-07-18 10:31:24 UTC (rev 14251)
+++ packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch	2017-07-18 12:03:50 UTC (rev 14252)
@@ -1,4 +1,4 @@
-From 89ecfb540def12dae2541dc177a137901958f63f Mon Sep 17 00:00:00 2001
+From 89ae1a80ef67f5cf5c99e974a33e6fede2cb647a Mon Sep 17 00:00:00 2001
 From: Filip Pytloun <filip at pytloun.cz>
 Date: Fri, 12 Aug 2016 21:06:36 +0200
 Subject: [PATCH 4/6] Fix tests failing due to timezone
@@ -11,11 +11,11 @@
  4 files changed, 9 insertions(+)
 
 diff --git a/tests/cal_display_test.py b/tests/cal_display_test.py
-index c309317..94c4c08 100644
+index 74ca501..4ff3e5e 100644
 --- a/tests/cal_display_test.py
 +++ b/tests/cal_display_test.py
-@@ -172,6 +172,7 @@ example_de_netbsd = [
-     '\x1b[1mM\xe4r.\x1b[0m27 28 29  1  2  3  4 ']
+@@ -190,6 +190,7 @@ example_fr = [
+     '\x1b[1mmars  \x1b[0m27 28 29  1  2  3  4 ']
  
  
 + at pytest.mark.skip
@@ -23,7 +23,7 @@
      try:
          locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
 diff --git a/tests/khalendar_utils_test.py b/tests/khalendar_utils_test.py
-index ad653f1..9d6d859 100644
+index f3170a6..b1932b7 100644
 --- a/tests/khalendar_utils_test.py
 +++ b/tests/khalendar_utils_test.py
 @@ -1,6 +1,7 @@
@@ -55,8 +55,8 @@
          assert dtstart[-1][0] == date(2037, 10, 31)
  
 +    @pytest.mark.skip
-     def test_another_problem(self):
-         vevent = _get_vevent(another_problem)
+     def test_recurrence_id_with_timezone(self):
+         vevent = _get_vevent(recurrence_id_with_timezone)
          dtstart = utils.expand(vevent, berlin)
 diff --git a/tests/ui/test_calendarwidget.py b/tests/ui/test_calendarwidget.py
 index 25cc58a..123b2f9 100644
@@ -79,10 +79,10 @@
  
      with freeze_time('2016-04-10'):
 diff --git a/tests/utils_test.py b/tests/utils_test.py
-index 974cf35..c50f6cd 100644
+index 6e1fe53..5e4a0fd 100644
 --- a/tests/utils_test.py
 +++ b/tests/utils_test.py
-@@ -561,6 +561,7 @@ def test_description_and_location_and_categories():
+@@ -569,6 +569,7 @@ def test_description_and_location_and_categories():
              assert _replace_uid(event).to_ical() == vevent
  
  
@@ -90,7 +90,7 @@
  def test_split_ics():
      cal = _get_text('cal_lots_of_timezones')
      vevents = utils.split_ics(cal)
-@@ -578,6 +579,7 @@ def test_split_ics():
+@@ -586,6 +587,7 @@ def test_split_ics():
      assert sorted(vevents1) == sorted(part1)
  
  

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	2017-07-18 10:31:24 UTC (rev 14251)
+++ packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch	2017-07-18 12:03:50 UTC (rev 14252)
@@ -1,4 +1,4 @@
-From fa9f4aba3a2490eefe5aba515974e9a8ffc4de94 Mon Sep 17 00:00:00 2001
+From ba564ab1d6d6521ad2451e76d58cfdc4d0115caa Mon Sep 17 00:00:00 2001
 From: Filip Pytloun <filip at pytloun.cz>
 Date: Fri, 12 Aug 2016 21:18:33 +0200
 Subject: [PATCH 5/6] Avoid privacy breach in sphinx doc

Deleted: packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
===================================================================
--- packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch	2017-07-18 10:31:24 UTC (rev 14251)
+++ packages/khal/trunk/debian/patches/0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch	2017-07-18 12:03:50 UTC (rev 14252)
@@ -1,45 +0,0 @@
-From 3120c689448b6218d4f0209bc630e4582777677a Mon Sep 17 00:00:00 2001
-From: Filip Pytloun <filip at pytloun.cz>
-Date: Thu, 20 Apr 2017 20:54:05 +0200
-Subject: [PATCH 6/6] Timezone tests may fail due to older pytz with newer TZ
- definitions
-
----
- tests/event_test.py     | 1 +
- tests/vtimezone_test.py | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/tests/event_test.py b/tests/event_test.py
-index 79ff17b..8a524c1 100644
---- a/tests/event_test.py
-+++ b/tests/event_test.py
-@@ -299,6 +299,7 @@ def test_event_dt_long():
-         '09.04.2014 09:30-12.04.2014 10:30 An Event \x1b[0m'
- 
- 
-+ at pytest.mark.xfail
- def test_event_no_dst(pytz_version):
-     """test the creation of a corect VTIMEZONE for timezones with no dst"""
-     event_no_dst = _get_text('event_no_dst')
-diff --git a/tests/vtimezone_test.py b/tests/vtimezone_test.py
-index d810c64..e4d0fb8 100644
---- a/tests/vtimezone_test.py
-+++ b/tests/vtimezone_test.py
-@@ -1,5 +1,6 @@
- from datetime import datetime as datetime
- import pytz
-+import pytest
- from khal.khalendar.event import create_timezone
- 
- berlin = pytz.timezone('Europe/Berlin')
-@@ -61,6 +62,7 @@ def test_berlin_rdate():
-     assert vberlin_dst in vberlin
- 
- 
-+ at pytest.mark.xfail
- def test_bogota(pytz_version):
-     vbogota = [b'BEGIN:VTIMEZONE',
-                b'TZID:America/Bogota',
--- 
-2.11.0
-




More information about the Python-apps-commits mailing list