summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/improve-unknown-interaction-mock.patch1
-rw-r--r--debian/patches/isolate-from-proxy.patch3
3 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 3e33b2c..570d5e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-py-macaroon-bakery (1.1.3-2) UNRELEASED; urgency=medium
+py-macaroon-bakery (1.1.4-1) UNRELEASED; urgency=medium
+ [ Ondřej Nový ]
* Convert git repository from git-dpm to gbp layout
+ [ Colin Watson ]
+ * New upstream release.
+
-- Ondřej Nový <onovy@debian.org> Wed, 08 Aug 2018 09:17:28 +0200
py-macaroon-bakery (1.1.3-1) unstable; urgency=medium
diff --git a/debian/patches/improve-unknown-interaction-mock.patch b/debian/patches/improve-unknown-interaction-mock.patch
index 746662a..b09b3a2 100644
--- a/debian/patches/improve-unknown-interaction-mock.patch
+++ b/debian/patches/improve-unknown-interaction-mock.patch
@@ -1,4 +1,3 @@
-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 3a4c18c..40803e2 100644
--- a/debian/patches/isolate-from-proxy.patch
+++ b/debian/patches/isolate-from-proxy.patch
@@ -1,4 +1,3 @@
-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 +40,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 bfc7807..baafeed 100644
+index 4061a8a..aa1f268 100644
--- a/macaroonbakery/tests/test_client.py
+++ b/macaroonbakery/tests/test_client.py
@@ -3,6 +3,7 @@