diff -Nru py-macaroon-bakery-0.0.6/debian/changelog py-macaroon-bakery-0.0.6/debian/changelog --- py-macaroon-bakery-0.0.6/debian/changelog 2017-11-11 13:55:42.000000000 +0100 +++ py-macaroon-bakery-0.0.6/debian/changelog 2017-11-29 19:32:18.000000000 +0100 @@ -1,3 +1,9 @@ +py-macaroon-bakery (0.0.6-1ubuntu1) xenial; urgency=medium + + * Backport to xenial + + -- Andrea Azzarone Tue, 28 Nov 2017 15:34:37 +0000 + py-macaroon-bakery (0.0.6-1) unstable; urgency=medium * New upstream release. diff -Nru py-macaroon-bakery-0.0.6/debian/control py-macaroon-bakery-0.0.6/debian/control --- py-macaroon-bakery-0.0.6/debian/control 2017-11-10 16:50:54.000000000 +0100 +++ py-macaroon-bakery-0.0.6/debian/control 2017-11-29 19:46:14.000000000 +0100 @@ -10,13 +10,13 @@ python3-mock, python3-nacl (>= 1.1.2), python3-nose, - python3-protobuf (>= 3.0.0), + python3-protobuf, python3-pymacaroons (>= 0.12.0), - python3-requests (>= 2.18.1), + python3-requests (>= 2.9.1), python3-rfc3339 (>= 1.0), python3-setuptools, - python3-six (>= 1.11.0), - python3-tz (>= 2017.2) + python3-six (>= 1.10.0), + python3-tz Standards-Version: 4.1.1 X-Python3-Version: >= 3.5 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/py-macaroon-bakery.git diff -Nru py-macaroon-bakery-0.0.6/debian/patches/lower-deps.patch py-macaroon-bakery-0.0.6/debian/patches/lower-deps.patch --- py-macaroon-bakery-0.0.6/debian/patches/lower-deps.patch 1970-01-01 01:00:00.000000000 +0100 +++ py-macaroon-bakery-0.0.6/debian/patches/lower-deps.patch 2017-11-29 19:31:35.000000000 +0100 @@ -0,0 +1,31 @@ +Description: Relax six dependency + python-six >= 1.11.0 is not available in xenial. Relax the dependency as it's + not a strict one. +Author: Andrea Azzarone +Forwarded: not-needed +Last-Update: <2017-11-29> +Patch-Name: lower-deps.patch +--- + +--- a/requirements.txt ++++ b/requirements.txt +@@ -4,7 +4,7 @@ + requests>=2.18.4,<3.0 + PyNaCl>=1.1.2,<2.0 + pymacaroons>=0.12.0,<1.0 +-six>=1.11.0,<2.0 ++six>=1.10.0,<2.0 + protobuf>=3.4.0,<4.0 + pyRFC3339>=1.0,<2.0 + pytz>=2017.2,<2018.0 +--- a/setup.py ++++ b/setup.py +@@ -27,7 +27,7 @@ + 'requests>=2.18.1,<3.0', + 'PyNaCl>=1.1.2,<2.0', + 'pymacaroons>=0.12.0,<1.0', +- 'six>=1.11.0,<2.0', ++ 'six>=1.10.0,<2.0', + 'protobuf>=3.0.0,<4.0', + 'pyRFC3339>=1.0,<2.0', + 'pytz>=2017.2,<2018.0' diff -Nru py-macaroon-bakery-0.0.6/debian/patches/series py-macaroon-bakery-0.0.6/debian/patches/series --- py-macaroon-bakery-0.0.6/debian/patches/series 2017-11-10 16:50:54.000000000 +0100 +++ py-macaroon-bakery-0.0.6/debian/patches/series 2017-11-29 01:04:22.000000000 +0100 @@ -1 +1,3 @@ isolate-from-proxy.patch +use_proto2.patch +lower-deps.patch diff -Nru py-macaroon-bakery-0.0.6/debian/patches/use_proto2.patch py-macaroon-bakery-0.0.6/debian/patches/use_proto2.patch --- py-macaroon-bakery-0.0.6/debian/patches/use_proto2.patch 1970-01-01 01:00:00.000000000 +0100 +++ py-macaroon-bakery-0.0.6/debian/patches/use_proto2.patch 2017-11-29 19:31:48.000000000 +0100 @@ -0,0 +1,128 @@ +Description: Use Protocol Buffers Version 2 + Use Protocol Buffers version 2 because version 3 is not available in xenial. +Author: Andrea Azzarone +Forwarded: not-needed +Last-Update: <2017-11-29> +Patch-Name: use_proto2.patch +--- + +--- py-macaroon-bakery-0.0.6.orig/macaroonbakery/internal/id.proto ++++ py-macaroon-bakery-0.0.6/macaroonbakery/internal/id.proto +@@ -1,14 +1,14 @@ +-syntax="proto3"; ++syntax="proto2"; + + option go_package = "macaroonpb"; + + message MacaroonId { +- bytes nonce = 1; +- bytes storageId = 2; ++ required bytes nonce = 1; ++ required bytes storageId = 2; + repeated Op ops = 3; + } + + message Op { +- string entity = 1; ++ required string entity = 1; + repeated string actions = 2; + } +--- py-macaroon-bakery-0.0.6.orig/macaroonbakery/internal/id_pb2.py ++++ py-macaroon-bakery-0.0.6/macaroonbakery/internal/id_pb2.py +@@ -1,5 +1,5 @@ + # Generated by the protocol buffer compiler. DO NOT EDIT! +-# source: macaroonbakery/internal/id.proto ++# source: id.proto + + import sys + _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +@@ -16,11 +16,11 @@ _sym_db = _symbol_database.Default() + + + DESCRIPTOR = _descriptor.FileDescriptor( +- name='macaroonbakery/internal/id.proto', ++ name='id.proto', + package='', +- syntax='proto3', +- serialized_pb=_b('\n macaroonbakery/internal/id.proto\"@\n\nMacaroonId\x12\r\n\x05nonce\x18\x01 \x01(\x0c\x12\x11\n\tstorageId\x18\x02 \x01(\x0c\x12\x10\n\x03ops\x18\x03 \x03(\x0b\x32\x03.Op\"%\n\x02Op\x12\x0e\n\x06\x65ntity\x18\x01 \x01(\t\x12\x0f\n\x07\x61\x63tions\x18\x02 \x03(\tB\x0cZ\nmacaroonpbb\x06proto3') ++ serialized_pb=_b('\n\x08id.proto\"@\n\nMacaroonId\x12\r\n\x05nonce\x18\x01 \x02(\x0c\x12\x11\n\tstorageId\x18\x02 \x02(\x0c\x12\x10\n\x03ops\x18\x03 \x03(\x0b\x32\x03.Op\"%\n\x02Op\x12\x0e\n\x06\x65ntity\x18\x01 \x02(\t\x12\x0f\n\x07\x61\x63tions\x18\x02 \x03(\tB\x0cZ\nmacaroonpb') + ) ++_sym_db.RegisterFileDescriptor(DESCRIPTOR) + + + +@@ -34,14 +34,14 @@ _MACAROONID = _descriptor.Descriptor( + fields=[ + _descriptor.FieldDescriptor( + name='nonce', full_name='MacaroonId.nonce', index=0, +- number=1, type=12, cpp_type=9, label=1, ++ number=1, type=12, cpp_type=9, label=2, + has_default_value=False, default_value=_b(""), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='storageId', full_name='MacaroonId.storageId', index=1, +- number=2, type=12, cpp_type=9, label=1, ++ number=2, type=12, cpp_type=9, label=2, + has_default_value=False, default_value=_b(""), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, +@@ -61,12 +61,11 @@ _MACAROONID = _descriptor.Descriptor( + ], + options=None, + is_extendable=False, +- syntax='proto3', + extension_ranges=[], + oneofs=[ + ], +- serialized_start=36, +- serialized_end=100, ++ serialized_start=12, ++ serialized_end=76, + ) + + +@@ -79,7 +78,7 @@ _OP = _descriptor.Descriptor( + fields=[ + _descriptor.FieldDescriptor( + name='entity', full_name='Op.entity', index=0, +- number=1, type=9, cpp_type=9, label=1, ++ number=1, type=9, cpp_type=9, label=2, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, +@@ -99,29 +98,27 @@ _OP = _descriptor.Descriptor( + ], + options=None, + is_extendable=False, +- syntax='proto3', + extension_ranges=[], + oneofs=[ + ], +- serialized_start=102, +- serialized_end=139, ++ serialized_start=78, ++ serialized_end=115, + ) + + _MACAROONID.fields_by_name['ops'].message_type = _OP + DESCRIPTOR.message_types_by_name['MacaroonId'] = _MACAROONID + DESCRIPTOR.message_types_by_name['Op'] = _OP +-_sym_db.RegisterFileDescriptor(DESCRIPTOR) + + MacaroonId = _reflection.GeneratedProtocolMessageType('MacaroonId', (_message.Message,), dict( + DESCRIPTOR = _MACAROONID, +- __module__ = 'macaroonbakery.internal.id_pb2' ++ __module__ = 'id_pb2' + # @@protoc_insertion_point(class_scope:MacaroonId) + )) + _sym_db.RegisterMessage(MacaroonId) + + Op = _reflection.GeneratedProtocolMessageType('Op', (_message.Message,), dict( + DESCRIPTOR = _OP, +- __module__ = 'macaroonbakery.internal.id_pb2' ++ __module__ = 'id_pb2' + # @@protoc_insertion_point(class_scope:Op) + )) + _sym_db.RegisterMessage(Op)