diff options
| -rw-r--r-- | debian/apt.postinst | 6 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | share/debian-archive.gpg | bin | 2280 -> 0 bytes | |||
| -rw-r--r-- | share/ubuntu-archive.gpg | bin | 1724 -> 0 bytes |
5 files changed, 3 insertions, 7 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst index 88fb932df..cc0d8b1fe 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,13 +15,7 @@ set -e case "$1" in configure) - - if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg - fi - apt-key update - ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index 1e935c682..ffd8f5c59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,9 @@ apt (0.7.26) UNRELEASED; urgency=low too many or too big patches (Closes: #554349) * debian/control: - let all packages depend on ${misc:Depends} + * share/*-archive.gpg: + - remove the horrible outdated files. We already depend on + the keyring so we don't need to ship our own version -- Michael Vogt <mvo@debian.org> Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/debian/rules b/debian/rules index d01b57cd6..37c96ef20 100755 --- a/debian/rules +++ b/debian/rules @@ -213,7 +213,6 @@ apt: build build-doc debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt - cp share/debian-archive.gpg debian/$@/usr/share/$@ cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg Binary files differdeleted file mode 100644 index da1aa5e97..000000000 --- a/share/debian-archive.gpg +++ /dev/null diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg Binary files differdeleted file mode 100644 index 2ce60d454..000000000 --- a/share/ubuntu-archive.gpg +++ /dev/null |