10 files changed, 264 insertions, 0 deletions
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..2c8afeb
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+/files
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..dbda37e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,168 @@
+py-macaroon-bakery (1.3.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Modernize unittest method spelling (closes: #1058354).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 17 Dec 2023 15:38:56 +0000
+
+py-macaroon-bakery (1.3.1-5) unstable; urgency=medium
+
+  [ Colin Watson ]
+  * Set upstream metadata fields: Repository.
+
+  [ Steve Beattie ]
+  * Fix saving macaroons to MozillaCookieJar() on Python 3.10
+    (LP: #1970267).
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 28 Feb 2023 09:35:23 +0000
+
+py-macaroon-bakery (1.3.1-4) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Set upstream metadata fields: Repository-Browse.
+
+ -- Jelmer Vernooĳ <jelmer@debian.org>  Sun, 16 Oct 2022 18:08:31 +0100
+
+py-macaroon-bakery (1.3.1-3) unstable; urgency=medium
+
+  * Switch from nose to pytest.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 22 Aug 2022 11:51:37 +0100
+
+py-macaroon-bakery (1.3.1-2) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Bump debhelper from old 9 to 12.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit.
+
+  [ Ondřej Nový ]
+  * d/control: Update Maintainer field with new Debian Python Team
+    contact address.
+  * d/control: Update Vcs-* fields with new Debian Python Team Salsa
+    layout.
+
+  [ Debian Janitor ]
+  * Bump debhelper from old 12 to 13.
+  * Remove constraints unnecessary since buster:
+    + Build-Depends: Drop versioned constraint on python3-nacl,
+      python3-protobuf, python3-pymacaroons, python3-requests, python3-rfc3339
+      and python3-six.
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 26 Dec 2021 13:20:06 +0000
+
+py-macaroon-bakery (1.3.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 14 Feb 2020 11:22:12 +0000
+
+py-macaroon-bakery (1.3.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 29 Jan 2020 17:25:18 +0000
+
+py-macaroon-bakery (1.2.3-3) unstable; urgency=medium
+
+  * Cherry-pick from upstream:
+    - Avoid using deprecated platform.dist() in setup.py.
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 26 Dec 2019 22:46:22 +0000
+
+py-macaroon-bakery (1.2.3-2) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Use debhelper-compat instead of debian/compat.
+  * d/control: Remove ancient X-Python3-Version field.
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 26 Dec 2019 02:13:31 +0000
+
+py-macaroon-bakery (1.2.3-1) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * d/watch: Use https protocol.
+
+  [ Colin Watson ]
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 09 May 2019 09:54:14 +0100
+
+py-macaroon-bakery (1.2.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 15 Oct 2018 10:59:57 +0100
+
+py-macaroon-bakery (1.2.0-1) unstable; urgency=medium
+
+  * debian/watch: Switch to PyPI, which upstream updates more reliably than
+    GitHub releases.
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 12 Oct 2018 15:29:00 +0100
+
+py-macaroon-bakery (1.1.4-1) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Convert git repository from git-dpm to gbp layout
+
+  [ Colin Watson ]
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 20 Aug 2018 17:54:44 +0100
+
+py-macaroon-bakery (1.1.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 28 Feb 2018 17:09:45 +0000
+
+py-macaroon-bakery (1.1.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 20 Feb 2018 23:47:51 +0000
+
+py-macaroon-bakery (1.1.0-2) unstable; urgency=medium
+
+  * Move VCS to salsa.debian.org.
+  * Improve mock setup for 407-then-unknown test.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 09 Feb 2018 22:05:55 +0000
+
+py-macaroon-bakery (1.1.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 05 Feb 2018 16:04:22 +0000
+
+py-macaroon-bakery (0.0.6-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Sat, 11 Nov 2017 12:55:42 +0000
+
+py-macaroon-bakery (0.0.5-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Apply https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/28
+    to isolate client tests from any configured HTTP proxy.
+  * Set Rules-Requires-Root: no.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 06 Nov 2017 10:42:31 +0000
+
+py-macaroon-bakery (0.0.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Cherry-pick
+    https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/26 to
+    lower protobuf and requests dependencies to versions satisfiable in
+    unstable.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 03 Nov 2017 16:11:44 +0000
+
+py-macaroon-bakery (0.0.3-1) unstable; urgency=medium
+
+  * Initial release (closes: #866779).
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 02 Nov 2017 14:35:45 +0000
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..466239c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,44 @@
+Source: py-macaroon-bakery
+Section: python
+Priority: optional
+Maintainer: Debian Python Team <team+python@tracker.debian.org>
+Uploaders: Colin Watson <cjwatson@debian.org>
+Build-Depends: debhelper-compat (= 13),
+               dh-python,
+               python3-all,
+               python3-fixtures,
+               python3-httmock,
+               python3-mock,
+               python3-nacl,
+               python3-protobuf,
+               python3-pymacaroons,
+               python3-pytest,
+               python3-requests,
+               python3-rfc3339,
+               python3-setuptools,
+               python3-six,
+Standards-Version: 4.1.1
+Vcs-Git: https://salsa.debian.org/python-team/packages/py-macaroon-bakery.git
+Vcs-Browser: https://salsa.debian.org/python-team/packages/py-macaroon-bakery
+Homepage: https://github.com/go-macaroon-bakery/py-macaroon-bakery
+Rules-Requires-Root: no
+
+Package: python3-macaroonbakery
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${python3:Depends}
+Description: Higher-level macaroon operations for Python 3
+ Macaroons, like cookies, are a form of bearer credential.  Unlike opaque
+ tokens, macaroons embed caveats that define specific authorization
+ requirements for the target service, the service that issued the root
+ macaroon and which is capable of verifying the integrity of macaroons it
+ receives.
+ .
+ Macaroons allow for delegation and attenuation of authorization.  They are
+ simple and fast to verify, and decouple authorization policy from the
+ enforcement of that policy.
+ .
+ The macaroonbakery library builds on pymacaroons to allow working with
+ macaroons at a higher level, such as by automatically gathering discharge
+ macaroons for third-party caveats from their corresponding services.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..ed4a695
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,10 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: py-macaroon-bakery
+Upstream-Contact: Juju UI Team <juju-gui@lists.ubuntu.com>
+Source: https://github.com/go-macaroon-bakery/py-macaroon-bakery
+
+Files: *
+Copyright: 2017 Canonical Ltd.
+License: LGPL-3
+ On Debian and Debian-based systems, a copy of the GNU Lesser General Public
+ License version 3 is available in /usr/share/common-licenses/LGPL-3.
diff --git a/debian/patches/fix-saving-macaroons-in-mozillacookiejar.patch b/debian/patches/fix-saving-macaroons-in-mozillacookiejar.patch
new file mode 100644
index 0000000..f4deb3b
--- /dev/null
+++ b/debian/patches/fix-saving-macaroons-in-mozillacookiejar.patch
@@ -0,0 +1,25 @@
+From: Steve Beattie <steve.beattie@canonical.com>
+Date: Tue, 28 Feb 2023 09:27:58 +0000
+Subject: Fix saving macaroons in MozillaCookieJar() on Python 3.10
+
+Origin: other, https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/88#issue-1214739879
+Bug: https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/88
+Reviewed-by: Alex Murray <alex.murray@canonical.com>
+Last-Update: 2023-02-28
+---
+ macaroonbakery/_utils/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/macaroonbakery/_utils/__init__.py b/macaroonbakery/_utils/__init__.py
+index 977cdbe..d1afe31 100644
+--- a/macaroonbakery/_utils/__init__.py
++++ b/macaroonbakery/_utils/__init__.py
+@@ -160,7 +160,7 @@ def cookie(
+         discard=False,
+         comment=None,
+         comment_url=None,
+-        rest=None,
++        rest={},
+         rfc2109=False,
+     )
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a66820f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-saving-macaroons-in-mozillacookiejar.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..f3204a6
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,7 @@
+#! /usr/bin/make -f
+
+export PYBUILD_NAME := macaroonbakery
+export PYBUILD_TEST_PYTEST := 1
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..628873d
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues
+Bug-Submit: https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/new
+Repository: https://github.com/go-macaroon-bakery/py-macaroon-bakery.git
+Repository-Browse: https://github.com/go-macaroon-bakery/py-macaroon-bakery
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..2f3e303
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+opts="uversionmangle=s/(rc|a|b|c)/~$1/" \
+    https://pypi.debian.net/macaroonbakery/macaroonbakery@ANY_VERSION@@ARCHIVE_EXT@