Bläddra i källkod

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.

David Kalnischkies 16 år sedan
förälder
incheckning
6aa944bc53
5 ändrade filer med 3 tillägg och 7 borttagningar
  1. 0 6
      debian/apt.postinst
  2. 3 0
      debian/changelog
  3. 0 1
      debian/rules
  4. BIN
      share/debian-archive.gpg
  5. BIN
      share/ubuntu-archive.gpg

+ 0 - 6
debian/apt.postinst

@@ -15,13 +15,7 @@ set -e
 
 
 case "$1" in
 case "$1" in
     configure)
     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)

+ 3 - 0
debian/changelog

@@ -36,6 +36,9 @@ apt (0.7.26) UNRELEASED; urgency=low
       too many or too big patches (Closes: #554349)
       too many or too big patches (Closes: #554349)
   * debian/control:
   * debian/control:
     - let all packages depend on ${misc:Depends}
     - 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
 
 

+ 0 - 1
debian/rules

@@ -213,7 +213,6 @@ apt: build build-doc debian/shlibs.local
 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
 	cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
 	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
 	cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
 #	head -n 500 ChangeLog > debian/ChangeLog
 #	head -n 500 ChangeLog > debian/ChangeLog
 
 

BIN
share/debian-archive.gpg


BIN
share/ubuntu-archive.gpg