diff -pruN 0.6.29/debian/changelog 0.6.29ubuntu1/debian/changelog --- 0.6.29/debian/changelog 2011-10-06 17:51:31.000000000 +0000 +++ 0.6.29ubuntu1/debian/changelog 2011-12-17 17:25:33.000000000 +0000 @@ -1,3 +1,15 @@ +mini-dinstall (0.6.29ubuntu1) precise; urgency=low + + * Merge from debian testing. (LP: #905671) Remaining changes: + - minidinstall/version.py: set current version. + - debian/control: modify Suggests to ubuntu-keyring + - Change all occurrences of /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg. + - minidinstall/DebianSigVerifier.py: Remove debian-keyring.pgp. + * mini-dinstall: Dropped applied in Debian. + + -- Mahyuddin Susanto Sat, 17 Dec 2011 18:58:07 +0700 + mini-dinstall (0.6.29) unstable; urgency=low [ Christoph Goehre ] @@ -14,6 +26,29 @@ mini-dinstall (0.6.29) unstable; urgency -- Christoph Goehre Thu, 06 Oct 2011 19:50:46 +0200 +mini-dinstall (0.6.28.1ubuntu3) oneiric; urgency=low + + * DebianSigVerifier.py: (LP: 3417) + Remove debian-keyring.pgp, since that change was lost in merge + + -- Mackenzie Morgan Mon, 30 May 2011 22:35:00 -0400 + +mini-dinstall (0.6.28.1ubuntu2) natty; urgency=low + + * mini-dinstall: Fix error using logging.StreamHandler (LP: #721413) + + -- Sameer Morar Fri, 18 Feb 2011 20:09:19 +0200 + +mini-dinstall (0.6.28.1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - minidinstall/version.py: set current version. + - debian/control: modify Suggests to ubuntu-keyring + - Change all occurrences of /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg. + + -- Bhavani Shankar Thu, 21 Oct 2010 12:09:13 +0530 + mini-dinstall (0.6.28.1) unstable; urgency=low * The "Python 2.6 transitional" release @@ -28,6 +63,16 @@ mini-dinstall (0.6.28.1) unstable; urgen -- Christoph Goehre Wed, 20 Oct 2010 17:56:40 +0200 +mini-dinstall (0.6.28ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining Ubuntu changes: + - minidinstall/version.py: set current version. + - debian/control: modify Suggests to ubuntu-keyring + - Change all occurrences of /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg. + + -- Andrew Starr-Bochicchio Fri, 18 Jun 2010 14:28:59 -0400 + mini-dinstall (0.6.28) unstable; urgency=low [ Christoph Goehre ] @@ -54,6 +99,16 @@ mini-dinstall (0.6.28) unstable; urgency -- Christoph Goehre Sun, 30 May 2010 19:33:52 +0200 +mini-dinstall (0.6.27ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #416455 + - minidinstall/version.py: set current version. + - debian/control: modify Suggests to ubuntu-keyring + - Change all occurrences of /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg. + + -- Bhavani Shankar Thu, 20 Aug 2009 19:49:17 +0530 + mini-dinstall (0.6.27) unstable; urgency=low [ Christoph Goehre ] @@ -72,6 +127,16 @@ mini-dinstall (0.6.27) unstable; urgency -- Christoph Goehre Sun, 16 Aug 2009 18:17:14 +0200 +mini-dinstall (0.6.26ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #303173) + - minidinstall/version.py: set current version. + - debian/control: modify Suggests to ubuntu-keyring + - Change all occurrences of /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg. + + -- Bhavani Shankar Sat, 29 Nov 2008 20:07:04 +0530 + mini-dinstall (0.6.26) unstable; urgency=low [ Christoph Goehre ] @@ -89,6 +154,17 @@ mini-dinstall (0.6.26) unstable; urgency -- Christoph Goehre Mon, 17 Nov 2008 18:35:35 +0100 +mini-dinstall (0.6.25ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #244270). Remaining Ubuntu changes: + - minidinstall/version.py: modify pkg_version to 0.6.25ubuntu1 + - Modify all occurrences of /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg + - debian/control: modify Maintainer to Ubuntu MOTU Developers + - debian/control: modify Suggests to ubuntu-keyring + + -- Devid Filoni Sun, 29 Jun 2008 11:31:25 +0200 + mini-dinstall (0.6.25) unstable; urgency=low * add experimental release support to Release file. Thanks to Stephan @@ -99,6 +175,16 @@ mini-dinstall (0.6.25) unstable; urgency -- Christoph Goehre Sat, 28 Jun 2008 19:15:56 +0200 +mini-dinstall (0.6.24ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - Change all occurrences of /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg. + - minidinstall/version.py: set current version. + - debian/control: update Maintainer field as per spec. + + -- Luca Falavigna Thu, 29 May 2008 23:58:49 +0200 + mini-dinstall (0.6.24) unstable; urgency=low * correct manpage formatting @@ -106,6 +192,16 @@ mini-dinstall (0.6.24) unstable; urgency -- Christoph Goehre Sun, 06 Apr 2008 18:46:31 +0200 +mini-dinstall (0.6.23ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Ubuntufication: change all /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg. + - debian/control: + + Update maintainer field. + + -- Michele Angrisano Wed, 06 Feb 2008 23:33:34 +0100 + mini-dinstall (0.6.23) unstable; urgency=low * use templates to generate success email (Closes: #451949) @@ -119,6 +215,17 @@ mini-dinstall (0.6.23) unstable; urgency -- Christoph Goehre Sun, 03 Feb 2008 10:53:25 +0100 +mini-dinstall (0.6.22ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Ubuntufication: change all /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg. + - Update maintainer field as per spec. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Luke Yelavich Thu, 25 Oct 2007 22:38:33 +1000 + mini-dinstall (0.6.22) unstable; urgency=low [ Guido Guenther ] @@ -136,6 +243,28 @@ mini-dinstall (0.6.22) unstable; urgency -- Christoph Goehre Sat, 06 Oct 2007 12:07:44 +0200 +mini-dinstall (0.6.21ubuntu3) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Ubuntufication: change all /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg (Closes: Malone #3417). + * Changed maintainer field to MOTU. + + -- Luke Yelavich Tue, 15 May 2007 19:50:27 +1000 + +mini-dinstall (0.6.21ubuntu2) edgy; urgency=low + + * Merge from debian unstable. + + -- Jeremie Corbier Tue, 8 Aug 2006 11:49:50 +0200 + +mini-dinstall (0.6.21ubuntu1) dapper; urgency=low + + * Ubuntufication: change all /usr/share/keyrings/debian-keyring.gpg to + /usr/share/keyrings/ubuntu-archive-keyring.gpg (Closes: Malone #3417). + + -- Jeremie Corbier Mon, 17 Apr 2006 21:00:09 +0200 + mini-dinstall (0.6.21-0.2) unstable; urgency=low * NMU with maintainers approval diff -pruN 0.6.29/debian/control 0.6.29ubuntu1/debian/control --- 0.6.29/debian/control 2011-10-06 17:51:31.000000000 +0000 +++ 0.6.29ubuntu1/debian/control 2011-12-17 17:25:33.000000000 +0000 @@ -1,7 +1,8 @@ Source: mini-dinstall Priority: optional Section: devel -Maintainer: Christoph Goehre +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Christoph Goehre Uploaders: Guido Guenther Build-Depends: cdbs, debhelper (>= 7), python, python-support (>= 0.3) Standards-Version: 3.9.2 @@ -12,7 +13,7 @@ Package: mini-dinstall Architecture: all Depends: ${python:Depends}, python-apt (>= 0.7.93), apt-utils, ${misc:Depends} Recommends: gpgv -Suggests: debian-keyring +Suggests: ubuntu-keyring Description: daemon for updating Debian packages in a repository This program implements a miniature version of the "dinstall" program which installs packages in the Debian archive. It doesn't require a diff -pruN 0.6.29/doc/mini-dinstall.conf 0.6.29ubuntu1/doc/mini-dinstall.conf --- 0.6.29/doc/mini-dinstall.conf 2011-10-06 17:51:31.000000000 +0000 +++ 0.6.29ubuntu1/doc/mini-dinstall.conf 2011-12-17 17:25:33.000000000 +0000 @@ -32,7 +32,7 @@ verify_sigs = 1 # GNUPG keyrings to use for signature verification, separated by # commas. This will override the builtin keyrings. Generally you # shouldn't specify this option; use extra_keyrings instead. -keyrings = /usr/share/keyrings/debian-keyring.gpg, /path/to/other/keyring.gpg +keyrings = /usr/share/keyrings/ubuntu-archive-keyring.gpg, /path/to/other/keyring.gpg # Additional GNUPG keyrings to use for signature verification, separated by commas extra_keyrings = ~/.gnupg/pubring.gpg, ~/.gnupg/other.gpg diff -pruN 0.6.29/minidinstall/DebianSigVerifier.py 0.6.29ubuntu1/minidinstall/DebianSigVerifier.py --- 0.6.29/minidinstall/DebianSigVerifier.py 2011-10-06 17:51:31.000000000 +0000 +++ 0.6.29ubuntu1/minidinstall/DebianSigVerifier.py 2011-12-17 17:25:33.000000000 +0000 @@ -25,7 +25,7 @@ class DebianSigVerifier(GPGSigVerifier): _dpkg_ring = '/etc/dpkg/local-keyring.gpg' def __init__(self, keyrings=None, extra_keyrings=None): if keyrings is None: - keyrings = ['/usr/share/keyrings/debian-keyring.gpg', '/usr/share/keyrings/debian-keyring.pgp'] + keyrings = ['/usr/share/keyrings/ubuntu-archive-keyring.gpg'] if os.access(self._dpkg_ring, os.R_OK): keyrings.append(self._dpkg_ring) if not extra_keyrings is None: diff -pruN 0.6.29/minidinstall/version.py 0.6.29ubuntu1/minidinstall/version.py --- 0.6.29/minidinstall/version.py 2011-10-06 17:52:25.000000000 +0000 +++ 0.6.29ubuntu1/minidinstall/version.py 2011-12-17 17:25:52.000000000 +0000 @@ -1 +1 @@ -pkg_version = "0.6.29" +pkg_version = "0.6.29ubuntu1" diff -pruN 0.6.29/mini-dinstall 0.6.29ubuntu1/mini-dinstall --- 0.6.29/mini-dinstall 2011-10-06 17:51:31.000000000 +0000 +++ 0.6.29ubuntu1/mini-dinstall 2011-12-17 17:25:33.000000000 +0000 @@ -315,7 +315,7 @@ if not configp.has_option('DEFAULT', 'ar logging.shutdown() sys.exit(1) -default_verify_sigs = os.access('/usr/share/keyrings/debian-keyring.gpg', os.R_OK) +default_verify_sigs = os.access('/usr/share/keyrings/ubuntu-archive-keyring.gpg', os.R_OK) default_extra_keyrings = [] default_keyrings = None