summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm14
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/improve-unknown-interaction-mock.patch2
-rw-r--r--debian/patches/isolate-from-proxy.patch2
4 files changed, 15 insertions, 9 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 8a9d05a..77259fe 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,11 +1,11 @@
# see git-dpm(1) from git-dpm package
-ce949d55b30a9ac5a74439727aacf0fab004d6cf
-ce949d55b30a9ac5a74439727aacf0fab004d6cf
-9e4403035a9953c99117083e6373ae3c441a76b5
-9e4403035a9953c99117083e6373ae3c441a76b5
-py-macaroon-bakery_1.1.0.orig.tar.gz
-690a8b89539dd1e2ade3f11481b2a56d8d55d281
-82188
+c1850c8a10886894255100fae185c450e800564a
+c1850c8a10886894255100fae185c450e800564a
+dfa331b7d67b5d89f2fdbe0406374810aaf33b57
+dfa331b7d67b5d89f2fdbe0406374810aaf33b57
+py-macaroon-bakery_1.1.2.orig.tar.gz
+62cbacb048ef5de21894228e3fa8934eae960591
+82228
debianTag="debian/%e%v"
patchedTag="patched/%e%v"
upstreamTag="upstream/%e%u"
diff --git a/debian/changelog b/debian/changelog
index 3ca66c9..6a193ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+py-macaroon-bakery (1.1.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org> Tue, 20 Feb 2018 18:32:29 +0000
+
py-macaroon-bakery (1.1.0-2) unstable; urgency=medium
* Move VCS to salsa.debian.org.
diff --git a/debian/patches/improve-unknown-interaction-mock.patch b/debian/patches/improve-unknown-interaction-mock.patch
index 0ba7a7e..c885b7a 100644
--- a/debian/patches/improve-unknown-interaction-mock.patch
+++ b/debian/patches/improve-unknown-interaction-mock.patch
@@ -1,4 +1,4 @@
-From ce949d55b30a9ac5a74439727aacf0fab004d6cf Mon Sep 17 00:00:00 2001
+From c1850c8a10886894255100fae185c450e800564a 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 46df46e..2648b94 100644
--- a/debian/patches/isolate-from-proxy.patch
+++ b/debian/patches/isolate-from-proxy.patch
@@ -1,4 +1,4 @@
-From 00ab469a4ae426c346228bd68eabe0fd4e689e4c Mon Sep 17 00:00:00 2001
+From 68863455145e5ca2ff2091c1e5c31b2a6bf05140 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