Attaching updated debdiff with correct revision (-1 instead of -4) On 2017/04/28 08:45, Debian Bug Tracking System wrote: > Thank you for filing a new Bug report with Debian. > > This is an automatically generated reply to let you know your message > has been received. > > Your message is being forwarded to the package maintainers and other > interested parties for their attention; they will reply in due course. > > Your message has been sent to the package maintainer(s): > Debian Release Team <debian-rele...@lists.debian.org> > > If you wish to submit further information on this problem, please > send it to 861...@bugs.debian.org. > > Please do not send mail to ow...@bugs.debian.org unless you wish > to report a problem with the Bug-tracking system. > > -- > 861385: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861385 > Debian Bug Tracking System > Contact ow...@bugs.debian.org with problems
diff -Nru khal-0.8.4/debian/changelog khal-0.8.4/debian/changelog --- khal-0.8.4/debian/changelog 2017-01-17 19:30:32.000000000 +0100 +++ khal-0.8.4/debian/changelog 2017-04-28 10:28:13.000000000 +0200 @@ -1,3 +1,17 @@ +khal (1:0.8.4-1) unstable; urgency=medium + + * Raise epoch to "revert" new upstream version in unstable and pass + stretch migration + * d/patches: some TZ tests may fail due to Debian's python-tz of older + version but with newer TZ definitions, should be removed when 2017.2 + reaches sid (Closes: #859472) + * d/copyright: mention presence of + 0002-Reference-license-from-copyright-file.patch (Closes: #860984) + * d/copyright: add upstream contact + * d/copyright: update copyright year + + -- Filip Pytloun <fi...@pytloun.cz> Fri, 28 Apr 2017 10:28:13 +0200 + khal (0.8.4-3) unstable; urgency=medium * d/patches: tolerate more occasionally failing tests where diff -Nru khal-0.8.4/debian/copyright khal-0.8.4/debian/copyright --- khal-0.8.4/debian/copyright 2016-09-05 10:09:54.000000000 +0200 +++ khal-0.8.4/debian/copyright 2017-04-28 10:28:13.000000000 +0200 @@ -1,13 +1,18 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: khal +Upstream-Contact: Christian Geier <k...@lostpackets.de> Source: https://github.com/pimutils/khal Files: * -Copyright: 2013-2016 Christian Geier et al. +Copyright: 2013-2017 Christian Geier et al. License: Expat +Comment: + Original license file in khal-doc is replaced by + 0002-Reference-license-from-copyright-file.patch to reference this copyright + file instead. Files: debian/* -Copyright: 2016 Filip Pytloun <fi...@pytloun.cz> +Copyright: 2016-2017 Filip Pytloun <fi...@pytloun.cz> License: Expat License: Expat diff -Nru khal-0.8.4/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch khal-0.8.4/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch --- khal-0.8.4/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch 1970-01-01 01:00:00.000000000 +0100 +++ khal-0.8.4/debian/patches/0007-Timezone-tests-may-fail-due-to-older-pytz-with-newer.patch 2017-04-28 10:27:39.000000000 +0200 @@ -0,0 +1,45 @@ +From 5953d313fa9bc4f48ffaa4f941f665a32dce62b3 Mon Sep 17 00:00:00 2001 +From: Filip Pytloun <fi...@pytloun.cz> +Date: Thu, 20 Apr 2017 20:54:05 +0200 +Subject: [PATCH 7/7] 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 121efc2..107acc0 100644 +--- a/tests/event_test.py ++++ b/tests/event_test.py +@@ -246,6 +246,7 @@ def test_event_dt_long(): + assert event.event_description == '09.04.2014 09:30 - 12.04.2014 10:30: An Event' + + ++@pytest.mark.xfail + def test_event_no_dst(): + """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 cf20eb0..89c369e 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 + + ++@pytest.mark.xfail + def test_bogota(): + vbogota = [b'BEGIN:VTIMEZONE', + b'TZID:America/Bogota', +-- +2.11.0 + diff -Nru khal-0.8.4/debian/patches/series khal-0.8.4/debian/patches/series --- khal-0.8.4/debian/patches/series 2017-01-17 19:30:14.000000000 +0100 +++ khal-0.8.4/debian/patches/series 2017-04-28 10:28:06.000000000 +0200 @@ -4,3 +4,4 @@ 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
signature.asc
Description: PGP signature
