[Python-apps-commits] r14090 - in packages/khal/trunk/debian (8 files)
fpytloun-guest at users.alioth.debian.org
fpytloun-guest at users.alioth.debian.org
Wed May 31 20:26:24 UTC 2017
Date: Wednesday, May 31, 2017 @ 20:26:22
Author: fpytloun-guest
Revision: 14090
New experimental release
Modified:
packages/khal/trunk/debian/changelog
packages/khal/trunk/debian/control
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
packages/khal/trunk/debian/patches/series
Modified: packages/khal/trunk/debian/changelog
===================================================================
--- packages/khal/trunk/debian/changelog 2017-05-31 05:43:24 UTC (rev 14089)
+++ packages/khal/trunk/debian/changelog 2017-05-31 20:26:22 UTC (rev 14090)
@@ -1,3 +1,22 @@
+khal (1:0.9.5-4) experimental; urgency=medium
+
+ * Add locales-all into build dependencies as all locales are needed to
+ execute tests (open-infrastructure-locales-c.utf-8 that also satisfies
+ locales requirement doesn't provide all required locales)
+
+ -- Filip Pytloun <filip at pytloun.cz> Tue, 09 May 2017 13:59:57 +0200
+
+khal (1:0.9.5-3) experimental; urgency=medium
+
+ * New upstream version
+ * d/patches: rebase for new version
+ * d/patches: drop patch
+ 0006-Tolerate-occassionally-failing-update_db-related-tes.patch which
+ should not be needed anymore
+ * Suggest khal-doc (Closes: #861813)
+
+ -- Filip Pytloun <filip at pytloun.cz> Tue, 09 May 2017 11:57:40 +0200
+
khal (1:0.8.4-4) unstable; urgency=medium
* Raise epoch to "revert" new upstream version in unstable and pass
Modified: packages/khal/trunk/debian/control
===================================================================
--- packages/khal/trunk/debian/control 2017-05-31 05:43:24 UTC (rev 14089)
+++ packages/khal/trunk/debian/control 2017-05-31 20:26:22 UTC (rev 14090)
@@ -7,6 +7,7 @@
dh-exec,
dh-python (>= 2.20160609~),
locales,
+ locales-all,
python3-alabaster,
python3-all,
python3-click (>= 3.2),
@@ -34,6 +35,7 @@
Architecture: all
Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
Recommends: python3-setproctitle
+Suggests: khal-doc
Description: Standards based CLI and terminal calendar program
Features:
- khal can read and write events/icalendars to vdir, so vdirsyncer can be
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-05-31 05:43:24 UTC (rev 14089)
+++ packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch 2017-05-31 20:26:22 UTC (rev 14090)
@@ -1,7 +1,7 @@
-From 5c5968c6b2d4d9ec8bbd9218e1bfddfa45d0bab9 Mon Sep 17 00:00:00 2001
+From 76da03778dfba760a43a761d94f6a13a8a3aa5c6 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/5] No RSS news in docs
+Subject: [PATCH 1/6] No RSS news in docs
---
doc/source/conf.py | 3 +--
@@ -9,10 +9,10 @@
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 8401275..35a5779 100644
+index d544c1e..858faf0 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -30,8 +30,7 @@ import khal
+@@ -102,8 +102,7 @@ with open('configspec.rst', 'w') as f:
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
@@ -23,7 +23,7 @@
# Add any paths that contain templates here, relative to this directory.
diff --git a/doc/source/index.rst b/doc/source/index.rst
-index 2fd8724..e4418c1 100644
+index 8118c65..5b90dee 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -45,4 +45,3 @@ Table of Contents
@@ -32,5 +32,5 @@
license
- news
--
-2.1.4
+2.11.0
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-05-31 05:43:24 UTC (rev 14089)
+++ packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch 2017-05-31 20:26:22 UTC (rev 14090)
@@ -1,24 +1,24 @@
-From e4806bd046fb3e09158375ace5b5639776de6e00 Mon Sep 17 00:00:00 2001
+From c2b6c2cee96504ec32681170ac21f8b5ef91da17 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/5] Reference license from copyright file
+Subject: [PATCH 2/6] Reference license from copyright file
---
- doc/source/license.rst | 21 ++-------------------
- 1 file changed, 2 insertions(+), 19 deletions(-)
+ doc/source/license.rst | 20 ++------------------
+ 1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/doc/source/license.rst b/doc/source/license.rst
-index 1d3bcf3..90b3e5c 100644
+index 0c6cf9f..1f52202 100644
--- a/doc/source/license.rst
+++ b/doc/source/license.rst
-@@ -1,22 +1,5 @@
+@@ -1,22 +1,6 @@
License
-------
-khal is released under the Expat/MIT License::
-+khal is released under the Expat/MIT License:
-- Copyright (c) 2013-2015 Christian Geier et al.
--
+- Copyright (c) 2013-2017 Christian Geier et al.
++khal is released under the Expat/MIT License.
+
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
@@ -35,7 +35,7 @@
- COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- 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``
++For full text of this license see ``/usr/share/doc/khal-doc/copyright``
--
-2.1.4
+2.11.0
Modified: packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch
===================================================================
--- packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch 2017-05-31 05:43:24 UTC (rev 14089)
+++ packages/khal/trunk/debian/patches/0003-Fix-intersphinx-mapping.patch 2017-05-31 20:26:22 UTC (rev 14090)
@@ -1,22 +1,22 @@
-From 7a7b83709ca3ee5ff45094af28a0df9e3809f2e0 Mon Sep 17 00:00:00 2001
+From fca3740b109d216d4ef5fde8cbbd579b9f089844 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/5] Fix intersphinx mapping
+Subject: [PATCH 3/6] Fix intersphinx mapping
---
doc/source/conf.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 35a5779..54b4002 100644
+index 858faf0..8e37071 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -276,4 +276,4 @@ texinfo_documents = [
+@@ -348,4 +348,4 @@ texinfo_documents = [
# 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
+2.11.0
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-05-31 05:43:24 UTC (rev 14089)
+++ packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch 2017-05-31 20:26:22 UTC (rev 14090)
@@ -1,37 +1,17 @@
-From 11e341e1368dd9b36f0858a2b73b08479bae86e6 Mon Sep 17 00:00:00 2001
+From 89ecfb540def12dae2541dc177a137901958f63f 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/5] Fix tests failing due to timezone
+Subject: [PATCH 4/6] Fix tests failing due to timezone
---
- tests/aux_test.py | 2 ++
tests/cal_display_test.py | 1 +
- tests/khalendar_aux_test.py | 4 ++++
+ tests/khalendar_utils_test.py | 4 ++++
tests/ui/test_calendarwidget.py | 2 ++
+ tests/utils_test.py | 2 ++
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
+index c309317..94c4c08 100644
--- a/tests/cal_display_test.py
+++ b/tests/cal_display_test.py
@@ -172,6 +172,7 @@ example_de_netbsd = [
@@ -40,44 +20,44 @@
+ at pytest.mark.skip
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
+ 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
+--- a/tests/khalendar_utils_test.py
++++ b/tests/khalendar_utils_test.py
@@ -1,6 +1,7 @@
from datetime import date, datetime, timedelta
import icalendar
import pytz
+import pytest
- from khal.khalendar import aux
+ from khal.khalendar import utils
-@@ -314,6 +315,7 @@ class TestExpand(object):
+@@ -317,6 +318,7 @@ class TestExpand(object):
for start, _ in dtstart] == self.offset_berlin
assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
+ @pytest.mark.skip
def test_expand_dtb(self):
vevent = _get_vevent(event_dtb)
- dtstart = aux.expand(vevent, berlin)
-@@ -385,6 +387,7 @@ class TestExpandNoRR(object):
+ dtstart = utils.expand(vevent, berlin)
+@@ -403,6 +405,7 @@ class TestExpandNoRR(object):
for start, _ in dtstart] == self.offset_berlin
assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
+ @pytest.mark.skip
def test_expand_dtb(self):
vevent = _get_vevent(event_dtb_norr)
- dtstart = aux.expand(vevent, berlin)
-@@ -591,6 +594,7 @@ class TestSpecial(object):
+ dtstart = utils.expand(vevent, berlin)
+@@ -610,6 +613,7 @@ class TestSpecial(object):
assert dtstart[0][0] == date(2009, 10, 31)
assert dtstart[-1][0] == date(2037, 10, 31)
+ @pytest.mark.skip
def test_another_problem(self):
vevent = _get_vevent(another_problem)
- dtstart = aux.expand(vevent, berlin)
+ dtstart = utils.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
@@ -98,6 +78,26 @@
def test_set_focus_date_weekstart_6():
with freeze_time('2016-04-10'):
+diff --git a/tests/utils_test.py b/tests/utils_test.py
+index 974cf35..c50f6cd 100644
+--- a/tests/utils_test.py
++++ b/tests/utils_test.py
+@@ -561,6 +561,7 @@ def test_description_and_location_and_categories():
+ assert _replace_uid(event).to_ical() == vevent
+
+
++ at pytest.mark.skip
+ def test_split_ics():
+ cal = _get_text('cal_lots_of_timezones')
+ vevents = utils.split_ics(cal)
+@@ -578,6 +579,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')
--
-2.1.4
+2.11.0
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-05-31 05:43:24 UTC (rev 14089)
+++ packages/khal/trunk/debian/patches/0005-Avoid-privacy-breach-in-sphinx-doc.patch 2017-05-31 20:26:22 UTC (rev 14090)
@@ -1,7 +1,7 @@
-From 1288b417a1925a57a7238d85ae7032e15c196440 Mon Sep 17 00:00:00 2001
+From fa9f4aba3a2490eefe5aba515974e9a8ffc4de94 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/5] Avoid privacy breach in sphinx doc
+Subject: [PATCH 5/6] Avoid privacy breach in sphinx doc
---
doc/source/conf.py | 10 +++++-----
@@ -9,10 +9,10 @@
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 54b4002..82062ca 100644
+index 8e37071..0f94c3f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -108,11 +108,11 @@ html_theme = 'alabaster'
+@@ -180,11 +180,11 @@ html_theme = 'alabaster'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
@@ -30,7 +30,7 @@
# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
diff --git a/doc/source/index.rst b/doc/source/index.rst
-index e4418c1..38d0bd7 100644
+index 5b90dee..8e684e0 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -4,8 +4,6 @@ khal
@@ -43,5 +43,5 @@
--------
(or rather: limitations)
--
-2.1.4
+2.11.0
Modified: packages/khal/trunk/debian/patches/series
===================================================================
--- packages/khal/trunk/debian/patches/series 2017-05-31 05:43:24 UTC (rev 14089)
+++ packages/khal/trunk/debian/patches/series 2017-05-31 20:26:22 UTC (rev 14090)
@@ -3,5 +3,4 @@
0003-Fix-intersphinx-mapping.patch
0004-Fix-tests-failing-due-to-timezone.patch
0005-Avoid-privacy-breach-in-sphinx-doc.patch
-0006-Tolerate-occassionally-failing-update_db-related-tes.patch
-0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
+0006-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch
More information about the Python-apps-commits
mailing list