Bug#884111: stretch-pu: package vdirsyncer/0.14.1-1
Thank you, uploaded and waiting in stable-new. Filip On 2018/01/13 18:21, Julien Cristau wrote: > Control: tag -1 confirmed > > On Mon, Dec 11, 2017 at 15:53:28 +0100, Filip Pytloun wrote: > > > Package: release.debian.org > > Severity: normal > > Tags: stretch > > User: release.debian@packages.debian.org > > Usertags: pu > > > > Hello, > > > > I would like to upload vdirsyncer 0.14.1-2 containing fix for bug #883299 > > [1][2][3]. This fixes critical issue that's making vdirsyncer 0.14.1 > > unusable for > > some users as it's unable to sync Google contacts. > > > The version number should be 0.14.1-1+deb9u1. With that fixed, and > assuming the updated package is tested in stretch, please go ahead. > > Cheers, > Julien signature.asc Description: PGP signature
Bug#884111: stretch-pu: package vdirsyncer/0.14.1-1
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu
Hello,
I would like to upload vdirsyncer 0.14.1-2 containing fix for bug #883299
[1][2][3]. This fixes critical issue that's making vdirsyncer 0.14.1 unusable
for
some users as it's unable to sync Google contacts.
Attaching debdiff.
Thank you,
Filip
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=883299
[2] https://github.com/pimutils/vdirsyncer/issues/551
[3] https://github.com/pimutils/vdirsyncer/pull/564
-- System Information:
Debian Release: 9.2
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable'), (100, 'unstable'), (50,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.13.0-0.bpo.1-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), LANGUAGE=en_US.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 vdirsyncer-0.14.1/debian/changelog vdirsyncer-0.14.1/debian/changelog
--- vdirsyncer-0.14.1/debian/changelog 2017-03-27 09:41:21.0 +0200
+++ vdirsyncer-0.14.1/debian/changelog 2017-12-11 15:12:09.0 +0100
@@ -1,3 +1,9 @@
+vdirsyncer (0.14.1-2) stretch; urgency=medium
+
+ * Backport fix for discovering Google contacts (Closes: #883299)
+
+ -- Filip Pytloun <fi...@pytloun.cz> Mon, 11 Dec 2017 15:12:09 +0100
+
vdirsyncer (0.14.1-1) unstable; urgency=medium
* New upstream release
diff -Nru
vdirsyncer-0.14.1/debian/patches/0005-Work-around-Google-Contacts-discovery-bug-564.patch
vdirsyncer-0.14.1/debian/patches/0005-Work-around-Google-Contacts-discovery-bug-564.patch
---
vdirsyncer-0.14.1/debian/patches/0005-Work-around-Google-Contacts-discovery-bug-564.patch
1970-01-01 01:00:00.0 +0100
+++
vdirsyncer-0.14.1/debian/patches/0005-Work-around-Google-Contacts-discovery-bug-564.patch
2017-12-11 15:11:33.0 +0100
@@ -0,0 +1,71 @@
+From ac662b5c11223157e8a0df8988a1af63a0a4ce82 Mon Sep 17 00:00:00 2001
+From: Markus Unterwaditzer <mar...@unterwaditzer.net>
+Date: Mon, 27 Feb 2017 16:06:28 +0100
+Subject: [PATCH] Work around Google Contacts discovery bug (#564)
+
+* Work around Google Contacts discovery bug
+
+* fixup
+
+* changelog
+---
+ vdirsyncer/storage/dav.py| 20 ++--
+ vdirsyncer/storage/google.py | 4
+ 2 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
+index 905c8d0..ed6dd61 100644
+--- a/vdirsyncer/storage/dav.py
b/vdirsyncer/storage/dav.py
+@@ -201,6 +201,23 @@ class Discover(object):
+ dav_logger.debug('Given URL is not a homeset URL')
+ return self._find_collections_impl(self.find_home())
+
++def _check_collection_resource_type(self, response):
++if self._resourcetype is None:
++return True
++
++props = _merge_xml(response.findall(
++'{DAV:}propstat/{DAV:}prop'
++))
++if not props:
++dav_logger.debug('Skipping, missing : %s', response)
++return False
++if props.find('{DAV:}resourcetype/' + self._resourcetype) \
++ is None:
++dav_logger.debug('Skipping, not of resource type %s: %s',
++ self._resourcetype, response)
++return False
++return True
++
+ def _find_collections_impl(self, url):
+ headers = self.session.get_default_headers()
+ headers['Depth'] = '1'
+@@ -209,8 +226,7 @@ class Discover(object):
+ root = _parse_xml(r.content)
+ done = set()
+ for response in root.findall('{DAV:}response'):
+-props = _merge_xml(response.findall('{DAV:}propstat/{DAV:}prop'))
+-if props.find('{DAV:}resourcetype/' + self._resourcetype) is None:
++if not self._check_collection_resource_type(response):
+ continue
+
+ href = response.find('{DAV:}href')
+diff --git a/vdirsyncer/storage/google.py b/vdirsyncer/storage/google.py
+index d6520cc..0dc1173 100644
+--- a/vdirsyncer/storage/google.py
b/vdirsyncer/storage/google.py
+@@ -157,6 +157,10 @@ class GoogleContactsStorage(dav.CardDAVStorage):
+ url = 'https://www.googleapis.com/.well-known/carddav'
+ scope = ['https://www.googleapis.com/auth/carddav']
+
++class discovery_class(dav.CardDAVStorage.discovery_class):
++# Google CardDAV doesn't return any resourcetype prop.
++_resourcetype = None
++
+ storage_name = 'google_contacts'
+
+ def __init__(self, token_file, client_id, client_secret, **kwargs):
+--
+2.14.2
+
diff -Nru vdirsyncer-0.14.1/debian/patches/series
vdirsyncer-0.14.1/debian/patches/series
--- vdirsyncer-0.14.1/debian/patches/series 2017-03-27 09:41:21.0
+0200
+++ vdirsyncer-0.14.1/debian/patches/series 2017
Bug#861385: Ready to go
Hello,
uploaded 1:0.8.4-4 into unstable, built successfuly on all relevant
architectures.
Removing moreinfo and attaching actual debdiff.
Thank you,
Filip
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.0 +0100
+++ khal-0.8.4/debian/changelog 2017-05-03 14:08:59.0 +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/copyright: mention presence of
+0002-Reference-license-from-copyright-file.patch (Closes: #860984)
+ * d/copyright: add upstream contact
+ * d/copyright: update copyright year
+ * 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)
+
+ -- Filip Pytloun <fi...@pytloun.cz> Wed, 03 May 2017 14:08:59 +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.0 +0200
+++ khal-0.8.4/debian/copyright 2017-04-28 10:29:42.0 +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.0 +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.0 +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/series2017-01-17 19:30:14.0 +0100
+++ khal-0.8.4/debian/patches/series2017-04-28 10:28:06.0 +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
Bug#861385: Acknowledgement (unblock (pre-approval): khal/1:0.8.4-4)
I see, didn't realized that epoch is not in file names. So new debdiff
attached and retitling.
On 2017/04/29 15:09, Andreas Beckmann wrote:
> On Fri, 28 Apr 2017 10:49:05 +0200 Filip Pytloun <fi...@pytloun.cz> wrote:
> > Attaching updated debdiff with correct revision (-1 instead of -4)
>
> -4 was the correct one, the version with the epoch removed must not have
> been used previously.
>
>
> Andreas
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.0 +0100
+++ khal-0.8.4/debian/changelog 2017-04-28 10:28:13.0 +0200
@@ -1,3 +1,28 @@
+khal (1:0.8.4-4) unstable; urgency=medium
+
+ * Raise epoch to "revert" new upstream version in unstable and pass
+stretch migration
+
+ -- Filip Pytloun <fi...@pytloun.cz> Fri, 28 Apr 2017 10:28:13 +0200
+
+khal (0.9.5-2) unstable; urgency=medium
+
+ * 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> Mon, 24 Apr 2017 09:45:57 +0200
+
+khal (0.9.5-1) unstable; urgency=medium
+
+ * New upstream release
+ * 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)
+
+ -- Filip Pytloun <fi...@pytloun.cz> Thu, 20 Apr 2017 20:55:06 +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.0 +0200
+++ khal-0.8.4/debian/copyright 2017-04-28 10:28:13.0 +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.0 +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.0 +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/series2017-01-17 19:30:14.0 +0100
+++ khal-0.8.4/debian/patches/series2017-04-28 10:28:06.0 +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
Bug#861385: Acknowledgement (unblock (pre-approval): khal/1:0.8.4-4)
Fixed d/changelog to avoid removal of 0.9.5 version, attaching new
debdiff.
On 2017/04/28 10:49, Filip Pytloun wrote:
> 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-release@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.0 +0100
> +++ khal-0.8.4/debian/changelog 2017-04-28 10:28:13.0 +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.0 +0200
> +++ khal-0.8.4/debian/copyright 2017-04-28 10:28:13.0 +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.0 +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.0 +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 impor
Bug#861385: Acknowledgement (unblock (pre-approval): khal/1:0.8.4-4)
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-release@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.0 +0100
+++ khal-0.8.4/debian/changelog 2017-04-28 10:28:13.0 +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.0 +0200
+++ khal-0.8.4/debian/copyright 2017-04-28 10:28:13.0 +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.0 +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.0 +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/series2017-01-17 19:30:14.0 +0100
+++ khal-0.8.4/debian/patches/series2017-04-28 10:28:06.0 +0200
@@ -4,3 +4,4 @@
0004-Fix-tests-failing-due-to-timezone.patch
0005-Avoid-privacy-breach-in-sphinx-
Bug#861385: unblock (pre-approval): khal/1:0.8.4-4
Package: release.debian.org
Severity: normal
User: release.debian@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.0 +0100
+++ khal-0.8.4/debian/changelog 2017-04-28 10:28:13.0 +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 <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.0 +0200
+++ khal-0.8.4/debian/copyright 2017-04-28 10:28:13.0 +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.0 +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.0 +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/series2017-01-17 19:30:14.0 +0100
+++ khal-0.8.4/debian/patches/series2017-04-28 10:28:06.0 +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
Bug#858814: unblock: vdirsyncer/0.14.1-1
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Please unblock package vdirsyncer
Hello,
Version 0.14.1 is bugfixing version which fixes mainly documentation and
2 bugs in code. For list of changes please refer to comparison of 0.14.0
and 0.14.1 git tags:
https://github.com/pimutils/vdirsyncer/compare/0.14.0...0.14.1
Debdiff is attached.
Thank you
unblock vdirsyncer/0.14.1-1
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (400, 'testing'), (100, 'unstable')
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 vdirsyncer-0.14.0/CHANGELOG.rst vdirsyncer-0.14.1/CHANGELOG.rst
--- vdirsyncer-0.14.0/CHANGELOG.rst 2016-10-26 16:35:37.0 +0200
+++ vdirsyncer-0.14.1/CHANGELOG.rst 2017-01-05 17:48:30.0 +0100
@@ -9,6 +9,15 @@
may want to subscribe to `GitHub's tag feed
<https://github.com/pimutils/vdirsyncer/tags.atom>`_.
+Version 0.14.1
+==
+
+*released on 05 January 2017*
+
+- ``vdirsyncer repair`` no longer changes "unsafe" UIDs by default, an extra
+ option has to be specified. See :gh:`527`.
+- A lot of important documentation updates.
+
Version 0.14.0
==
diff -Nru vdirsyncer-0.14.0/debian/changelog vdirsyncer-0.14.1/debian/changelog
--- vdirsyncer-0.14.0/debian/changelog 2017-01-05 10:31:08.0 +0100
+++ vdirsyncer-0.14.1/debian/changelog 2017-03-27 09:41:21.0 +0200
@@ -1,3 +1,11 @@
+vdirsyncer (0.14.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * d/patches: drop 0005-Direct-users-to-Debian-BTS.patch as upstream docs
+already covers Debian packages
+
+ -- Filip Pytloun <fi...@pytloun.cz> Mon, 27 Mar 2017 09:41:21 +0200
+
vdirsyncer (0.14.0-3) unstable; urgency=medium
* d/patches: Direct users to Debian BTS to avoid bothering upstream with
diff -Nru vdirsyncer-0.14.0/debian/files vdirsyncer-0.14.1/debian/files
--- vdirsyncer-0.14.0/debian/files 1970-01-01 01:00:00.0 +0100
+++ vdirsyncer-0.14.1/debian/files 2017-03-27 09:41:21.0 +0200
@@ -0,0 +1 @@
+vdirsyncer_0.14.1-1_source.buildinfo utils optional
diff -Nru vdirsyncer-0.14.0/debian/patches/0001-Don-t-use-subtest.patch
vdirsyncer-0.14.1/debian/patches/0001-Don-t-use-subtest.patch
--- vdirsyncer-0.14.0/debian/patches/0001-Don-t-use-subtest.patch
2016-10-31 14:52:10.0 +0100
+++ vdirsyncer-0.14.1/debian/patches/0001-Don-t-use-subtest.patch
2017-03-27 09:40:40.0 +0200
@@ -1,4 +1,4 @@
-From 0c7227f42c25525f3029da0086b94597b318361c Mon Sep 17 00:00:00 2001
+From e952d015f28441a703edbee4b26051145047ef0f Mon Sep 17 00:00:00 2001
From: Filip Pytloun <fi...@pytloun.cz>
Date: Mon, 31 Oct 2016 14:40:47 +0100
Subject: [PATCH 1/4] Don't use subtest
@@ -94,5 +94,5 @@
runner.write_with_general(dedent('''
[pair foobar]
--
-2.1.4
+2.11.0
diff -Nru
vdirsyncer-0.14.0/debian/patches/0002-Include-license-from-copyright-file.patch
vdirsyncer-0.14.1/debian/patches/0002-Include-license-from-copyright-file.patch
---
vdirsyncer-0.14.0/debian/patches/0002-Include-license-from-copyright-file.patch
2016-10-31 14:52:10.0 +0100
+++
vdirsyncer-0.14.1/debian/patches/0002-Include-license-from-copyright-file.patch
2017-03-27 09:40:40.0 +0200
@@ -1,4 +1,4 @@
-From 76db0343cbdd6b48dabcaecee255b28d30c838a6 Mon Sep 17 00:00:00 2001
+From 82598e72b021eab12ba2e7fb0918788bf96052f7 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <fi...@pytloun.cz>
Date: Thu, 11 Aug 2016 14:35:29 +0200
Subject: [PATCH 2/4] Include license from copyright file
@@ -18,5 +18,5 @@
-.. include:: ../LICENSE
+.. literalinclude:: /usr/share/doc/vdirsyncer-doc/copyright
--
-2.1.4
+2.11.0
diff -Nru vdirsyncer-0.14.0/debian/patches/0003-Skip-SSL-tests.patch
vdirsyncer-0.14.1/debian/patches/0003-Skip-SSL-tests.patch
--- vdirsyncer-0.14.0/debian/patches/0003-Skip-SSL-tests.patch 2016-10-31
14:52:10.0 +0100
+++ vdirsyncer-0.14.1/debian/patches/0003-Skip-SSL-tests.patch 2017-03-27
09:40:40.0 +0200
@@ -1,4 +1,4 @@
-From c758b0d86679aecfcd58750fe22c49696023cab2 Mon Sep 17 00:00:00 2001
+From a341ff03f0dcecead442e174b5d1a89775e68097 Mon Sep 17 00:00:00 2001
From: Filip Pytloun <fi...@pytloun.cz>
Date: Mon, 31 Oct 2016 14:42:00 +0100
Subject: [PATCH 3/4] Skip SSL tests
@@ -28,5 +28,5 @@
reason='https://github.com/shazow/urllib3/issues/529')
@pytest.mark.parametrize('fingerprint', [
--
-2.1.4
+2.11.0
diff -Nru
vdirsyncer-0.14.0/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch
vdirsyncer-0.14.1/debian/patches/0004-Suppress-HealthCheck.too_slow-to-fix-build-on-slow-p.patch
--
Bug#857347: unblock: reclass/1.4.1-2
Hello,
thank you, I uploaded -3 without raising debhelper compat. Debdiff
against original -1 attached.
Filip
On 2017/03/11 07:58, Niels Thykier wrote:
> Control: tags -1 moreinfo confirmed
>
> Filip Pytloun:
> > Package: release.debian.org
> > Severity: normal
> > User: release.debian@packages.debian.org
> > Usertags: unblock
> >
> > Please unblock package reclass
> >
> > It's mainly fixing #857337 by backporting simple upstream code change
> > that fixes handling of usage error that may happen pretty often and will
> > help user to debug the issue by returning relevant information.
> >
> > Debdiff is included.
> >
> > Thank you
> >
> > unblock reclass/1.4.1-2
> >
> > [...]
>
> Hi,
>
> Thanks for looking at fixing this bug. I am happy to accept the
> undefined variable fix, but I would prefer it without the debhelper
> compat bump.
>
> Would you kindly upload a -3 without the compat bump?
>
> Thanks,
> ~Niels
>
>
>
>
diff -Nru reclass-1.4.1/debian/changelog reclass-1.4.1/debian/changelog
--- reclass-1.4.1/debian/changelog 2014-10-28 15:57:42.0 +0100
+++ reclass-1.4.1/debian/changelog 2017-03-11 10:14:58.00000 +0100
@@ -1,3 +1,18 @@
+reclass (1.4.1-3) unstable; urgency=medium
+
+ * Revert d/compat and standards update to allow stretch migration
+
+ -- Filip Pytloun <fi...@pytloun.cz> Sat, 11 Mar 2017 10:14:58 +0100
+
+reclass (1.4.1-2) unstable; urgency=medium
+
+ * d/patches: backport Fix UndefinedVariableError (Closes: #857337)
+ * Add d/watch file
+ * Raise d/compat to 10, update standards to 3.9.8
+ * Add myself as uploader
+
+ -- Filip Pytloun <fi...@pytloun.cz> Fri, 10 Mar 2017 08:45:53 +0100
+
reclass (1.4.1-1) unstable; urgency=low
* New upstream release reverting the logging changes, which weren't ready
diff -Nru reclass-1.4.1/debian/control reclass-1.4.1/debian/control
--- reclass-1.4.1/debian/control2014-10-25 20:45:57.0 +0200
+++ reclass-1.4.1/debian/control2017-03-11 10:14:21.0 +0100
@@ -2,8 +2,12 @@
Section: python
Priority: extra
Maintainer: martin f. krafft <madd...@debian.org>
-Uploaders: Jonas Smedegaard <d...@jones.dk>
-Build-Depends: python-setuptools, python, debhelper (>= 8.9.7), python-sphinx,
python-yaml
+Uploaders: Jonas Smedegaard <d...@jones.dk>, Filip Pytloun <fi...@pytloun.cz>
+Build-Depends: debhelper (>= 8.9.7),
+ python,
+ python-setuptools,
+ python-sphinx,
+ python-yaml
Standards-Version: 3.9.6
XS-Python-Version: all
Homepage: http://reclass.pantsfullofunix.net/
@@ -13,7 +17,9 @@
Package: reclass
Architecture: all
Section: admin
-Depends: python-reclass (= ${binary:Version}), ${misc:Depends},
${python:Depends}
+Depends: python-reclass (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
Suggests: reclass-doc
Description: hierarchical inventory backend for configuration management
systems
reclass is an "external node classifier" (ENC) as can be used with automation
@@ -38,7 +44,7 @@
Package: python-reclass
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
Description: hierarchical inventory backend for configuration management
systems
reclass is an "external node classifier" (ENC) as can be used with automation
tools, such as Puppet, Salt, and Ansible. It is also a stand-alone tool for
@@ -61,7 +67,7 @@
Package: reclass-doc
Architecture: all
Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
Description: reclass documentation
reclass is an "external node classifier" (ENC) as can be used with automation
tools, such as Puppet, Salt, and Ansible. It is also a stand-alone tool for
diff -Nru
reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
---
reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
1970-01-01 01:00:00.0 +0100
+++
reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
2017-03-10 09:19:32.0 +0100
@@ -0,0 +1,31 @@
+From fbd22d42a20a0fdd53bc42fd27ad9f3d6af70f80 Mon Sep 17 00:00:00 2001
+From: Michael Kuty <6du1r...@gmail.com>
+Date: Fri, 16 Oct 2015 18:10:18 +0200
+Subject: [PATCH 1/2] Fix UndefinedVariableError, which had, uh, undefined
+ variables
+
+Signed-off-by: martin f. krafft <madd...@madduck.net>
+---
+ reclass/errors.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/reclass/
Bug#857347: Acknowledgement (unblock: reclass/1.4.1-2)
I am sorry, here is missing debdiff.
Filip
On 2017/03/10 09:57, 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.
>
> As you requested using X-Debbugs-CC, your message was also forwarded to
> madd...@debian.org
> (after having been given a Bug report number, if it did not have one).
>
> Your message has been sent to the package maintainer(s):
> Debian Release Team <debian-release@lists.debian.org>
>
> If you wish to submit further information on this problem, please
> send it to 857...@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.
>
> --
> 857347: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857347
> Debian Bug Tracking System
> Contact ow...@bugs.debian.org with problems
diff -Nru reclass-1.4.1/debian/changelog reclass-1.4.1/debian/changelog
--- reclass-1.4.1/debian/changelog 2014-10-28 15:57:42.0 +0100
+++ reclass-1.4.1/debian/changelog 2017-03-10 08:45:53.0 +0100
@@ -1,3 +1,12 @@
+reclass (1.4.1-2) unstable; urgency=medium
+
+ * d/patches: backport Fix UndefinedVariableError (Closes: #857337)
+ * Add d/watch file
+ * Raise d/compat to 10, update standards to 3.9.8
+ * Add myself as uploader
+
+ -- Filip Pytloun <fi...@pytloun.cz> Fri, 10 Mar 2017 08:45:53 +0100
+
reclass (1.4.1-1) unstable; urgency=low
* New upstream release reverting the logging changes, which weren't ready
diff -Nru reclass-1.4.1/debian/compat reclass-1.4.1/debian/compat
--- reclass-1.4.1/debian/compat 2014-10-25 15:10:11.0 +0200
+++ reclass-1.4.1/debian/compat 2017-03-10 08:45:53.0 +0100
@@ -1 +1 @@
-8
+10
diff -Nru reclass-1.4.1/debian/control reclass-1.4.1/debian/control
--- reclass-1.4.1/debian/control2014-10-25 20:45:57.0 +0200
+++ reclass-1.4.1/debian/control2017-03-10 08:45:53.0 +0100
@@ -2,9 +2,13 @@
Section: python
Priority: extra
Maintainer: martin f. krafft <madd...@debian.org>
-Uploaders: Jonas Smedegaard <d...@jones.dk>
-Build-Depends: python-setuptools, python, debhelper (>= 8.9.7), python-sphinx,
python-yaml
-Standards-Version: 3.9.6
+Uploaders: Jonas Smedegaard <d...@jones.dk>, Filip Pytloun <fi...@pytloun.cz>
+Build-Depends: debhelper (>= 10),
+ python,
+ python-setuptools,
+ python-sphinx,
+ python-yaml
+Standards-Version: 3.9.8
XS-Python-Version: all
Homepage: http://reclass.pantsfullofunix.net/
Vcs-Git: git://anonscm.debian.org/collab-maint/reclass.git
@@ -13,7 +17,9 @@
Package: reclass
Architecture: all
Section: admin
-Depends: python-reclass (= ${binary:Version}), ${misc:Depends},
${python:Depends}
+Depends: python-reclass (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
Suggests: reclass-doc
Description: hierarchical inventory backend for configuration management
systems
reclass is an "external node classifier" (ENC) as can be used with automation
@@ -38,7 +44,7 @@
Package: python-reclass
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
Description: hierarchical inventory backend for configuration management
systems
reclass is an "external node classifier" (ENC) as can be used with automation
tools, such as Puppet, Salt, and Ansible. It is also a stand-alone tool for
@@ -61,7 +67,7 @@
Package: reclass-doc
Architecture: all
Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
Description: reclass documentation
reclass is an "external node classifier" (ENC) as can be used with automation
tools, such as Puppet, Salt, and Ansible. It is also a stand-alone tool for
diff -Nru
reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
---
reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
1970-01-01 01:00:00.0 +0100
+++
reclass-1.4.1/debian/patches/0001-Fix-UndefinedVariableError-which-had-uh-undefined-va.patch
2017-03-10 08:45:53.0 +0100
@@ -0,0 +1,31 @@
+From fbd22d42a20a0fdd53bc42fd27ad9f3d6af70f80 Mon Sep 17 00:00:00 2001
+From: Michael Kuty <6du1r...@gmail.com>
+Date: Fri, 16 Oct 2015 18:10:18 +0200
+Subject: [PATCH 1/2] Fix UndefinedVariableError, which had, uh, undefined
+ variables
+
+Signed-off-by: martin f. krafft <m
Bug#857347: unblock: reclass/1.4.1-2
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock Please unblock package reclass It's mainly fixing #857337 by backporting simple upstream code change that fixes handling of usage error that may happen pretty often and will help user to debug the issue by returning relevant information. Debdiff is included. Thank you unblock reclass/1.4.1-2 -- System Information: Debian Release: 9.0 APT prefers testing APT policy: (400, 'testing'), (100, 'unstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.7.0-0.bpo.1-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) signature.asc Description: PGP signature
