[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#861385: marked as done (unblock (pre-approval): khal/1:0.8.4-4)

Your message dated Thu, 04 May 2017 22:01:57 +0000
with message-id <E1d6Oov-0008OS-Pw@respighi.debian.org>
and subject line unblock khal
has caused the Debian Bug report #861385,
regarding unblock (pre-approval): khal/1:0.8.4-4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
861385: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861385
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please consider unblocking of package khal/1:0.8.4-4

Newer upstream version was uploaded into unstable so to fix FTBFS
#859472, I am raising epoch to revert new version from unstable and make
migration possible.

Debdiff attached

unblock khal/1:0.8.4-4

-- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (400, 'testing'), (100, 'unstable'), (50, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=cs_CZ.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

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-4) 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 <filip@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 <khal@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 <filip@pytloun.cz>
+Copyright: 2016-2017 Filip Pytloun <filip@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 <filip@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

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Unblocked khal.

--- End Message ---
Reply to: