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 88fb932dfed5628494fd8efdb2b8b945755b12ff..cc0d8b1fec4ef94f8edfbb6584e26704a2aa8e4e 100644 (file)
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,13 +15,7 @@ set -e
 
 case "$1" in
     configure)
 
 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
        apt-key update

-

     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/debian/changelog b/debian/changelog
index 1e935c682768cd6fa72a28f29f71367918838c7e..ffd8f5c595421130cf529ec0480faeb4e88f0695 100644 (file)
--- 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}
       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
 
 
  -- Michael Vogt <mvo@debian.org>  Thu, 10 Dec 2009 22:02:38 +0100
 

diff --git a/debian/rules b/debian/rules
index d01b57cd637aa84c1530b737b09b8196f6b918de..37c96ef20eff7914496ae6824949ddcae31ee816 100755 (executable)
--- 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 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
 
        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 (file)
index da1aa5e..0000000
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 (file)
index 2ce60d4..0000000
Binary files a/share/ubuntu-archive.gpg and /dev/null differ