diff -Nru /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/debian/changelog /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/debian/changelog --- /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/debian/changelog 2005-02-15 18:45:04.000000000 +0100 +++ /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/debian/changelog 2006-04-17 21:01:51.000000000 +0200 @@ -1,3 +1,10 @@ +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) unstable; urgency=medium * Improve daemonizing: Reopen file descriptors 0, 1, 2 to /dev/null. diff -Nru /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/debian/control /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/debian/control --- /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/debian/control 2004-03-13 20:50:57.000000000 +0100 +++ /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/debian/control 2006-04-17 20:56:41.000000000 +0200 @@ -8,7 +8,7 @@ Package: mini-dinstall Architecture: all Depends: ${python:Depends}, python-apt, apt-utils -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 -Nru /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/doc/mini-dinstall.conf /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/doc/mini-dinstall.conf --- /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/doc/mini-dinstall.conf 2004-03-04 01:37:21.000000000 +0100 +++ /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/doc/mini-dinstall.conf 2006-04-17 20:59:31.000000000 +0200 @@ -32,7 +32,7 @@ # 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 -Nru /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/lib/DebianSigVerifier.py /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/lib/DebianSigVerifier.py --- /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/lib/DebianSigVerifier.py 2004-03-04 01:37:21.000000000 +0100 +++ /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/lib/DebianSigVerifier.py 2006-04-17 21:00:01.000000000 +0200 @@ -25,7 +25,7 @@ _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 -Nru /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/lib/version.py /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/lib/version.py --- /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/lib/version.py 2005-02-15 18:45:12.000000000 +0100 +++ /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/lib/version.py 2006-04-17 21:10:34.000000000 +0200 @@ -1 +1 @@ -pkg_version = "0.6.21" +pkg_version = "0.6.21ubuntu1" diff -Nru /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/mini-dinstall /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/mini-dinstall --- /tmp/G6Zx3sPPnJ/mini-dinstall-0.6.21/mini-dinstall 2005-02-12 19:09:45.000000000 +0100 +++ /tmp/T106WREVSt/mini-dinstall-0.6.21ubuntu1/mini-dinstall 2006-04-17 20:57:21.000000000 +0200 @@ -293,7 +293,7 @@ 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