summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-02-28 17:08:17 +0000
committerColin Watson <cjwatson@debian.org>2018-02-28 17:09:32 +0000
commit6afbd6cfb2ceae0444b1ad15f143117315c0b8e2 (patch)
tree294ffe7ca0d12231dfff2a3d8dd7011aaf824cbc /debian
parentfa31bef2ea6d7c2207dec570119291fa83e6675d (diff)
parentd918563db4de954c3df719d06a31bdd3aec3a8fc (diff)
New upstream release (1.1.3)
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm14
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
-rw-r--r--debian/patches/improve-unknown-interaction-mock.patch2
-rw-r--r--debian/patches/isolate-from-proxy.patch4
5 files changed, 16 insertions, 11 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 77259fe..ffca26b 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,11 +1,11 @@
# see git-dpm(1) from git-dpm package
-c1850c8a10886894255100fae185c450e800564a
-c1850c8a10886894255100fae185c450e800564a
-dfa331b7d67b5d89f2fdbe0406374810aaf33b57
-dfa331b7d67b5d89f2fdbe0406374810aaf33b57
-py-macaroon-bakery_1.1.2.orig.tar.gz
-62cbacb048ef5de21894228e3fa8934eae960591
-82228
+d918563db4de954c3df719d06a31bdd3aec3a8fc
+d918563db4de954c3df719d06a31bdd3aec3a8fc
+4379a501141f75557e535f9c2ef3b58ef362259c
+4379a501141f75557e535f9c2ef3b58ef362259c
+py-macaroon-bakery_1.1.3.orig.tar.gz
+0531fe0fcaa20b9554b17347b36a1b3c4cb84e06
+82450
debianTag="debian/%e%v"
patchedTag="patched/%e%v"
upstreamTag="upstream/%e%u"
diff --git a/debian/changelog b/debian/changelog
index dfe9b9e..60371fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+py-macaroon-bakery (1.1.3-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org> Wed, 28 Feb 2018 17:09:10 +0000
+
py-macaroon-bakery (1.1.2-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 5d18578..de763c1 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 9~),
python3-rfc3339 (>= 1.0),
python3-setuptools,
python3-six (>= 1.11.0),
- python3-tz (>= 2017.2)
Standards-Version: 4.1.1
X-Python3-Version: >= 3.5
Vcs-Git: https://salsa.debian.org/python-team/modules/py-macaroon-bakery
diff --git a/debian/patches/improve-unknown-interaction-mock.patch b/debian/patches/improve-unknown-interaction-mock.patch
index c885b7a..746662a 100644
--- a/debian/patches/improve-unknown-interaction-mock.patch
+++ b/debian/patches/improve-unknown-interaction-mock.patch
@@ -1,4 +1,4 @@
-From c1850c8a10886894255100fae185c450e800564a Mon Sep 17 00:00:00 2001
+From d918563db4de954c3df719d06a31bdd3aec3a8fc Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Fri, 9 Feb 2018 21:54:21 +0000
Subject: Improve mock setup for 407-then-unknown test
diff --git a/debian/patches/isolate-from-proxy.patch b/debian/patches/isolate-from-proxy.patch
index 2648b94..3a4c18c 100644
--- a/debian/patches/isolate-from-proxy.patch
+++ b/debian/patches/isolate-from-proxy.patch
@@ -1,4 +1,4 @@
-From 68863455145e5ca2ff2091c1e5c31b2a6bf05140 Mon Sep 17 00:00:00 2001
+From 920e53a9172a6a76d6f1abcef56be2edf4301596 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Mon, 6 Nov 2017 10:27:10 +0000
Subject: Isolate client tests from any HTTP proxy
@@ -41,7 +41,7 @@ index a6c3e58..72a6928 100644
def assert_cookie_security(self, cookies, name, secure):
for cookie in cookies:
diff --git a/macaroonbakery/tests/test_client.py b/macaroonbakery/tests/test_client.py
-index ab20c3b..04e2f2b 100644
+index bfc7807..baafeed 100644
--- a/macaroonbakery/tests/test_client.py
+++ b/macaroonbakery/tests/test_client.py
@@ -3,6 +3,7 @@