From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 2 Jan 2010 16:53:05 +0000 (+0100)
Subject: remove the horrible outdated share/*-archive.gpg files and all there traces
X-Git-Tag: 0.8.0~39^2~22
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/6aa944bc539cea4095971ccb2354c1e8f9f2c90a

remove the horrible outdated share/*-archive.gpg files and all there traces
We already depend on the proper keyring so we don't need to ship our
own version which isn't used anyway.
---

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
deleted file mode 100644
index da1aa5e97..000000000
Binary files a/share/debian-archive.gpg and /dev/null differ
diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg
deleted file mode 100644
index 2ce60d454..000000000
Binary files a/share/ubuntu-archive.gpg and /dev/null differ