[maemo-commits] [maemo-commits] r14921 - projects/haf/trunk/apt/debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-12-09 00:28:13 +0200 (Sun, 09 Dec 2007)
New Revision: 14921

Modified:
   projects/haf/trunk/apt/debian/apt.postinst
   projects/haf/trunk/apt/debian/changelog
   projects/haf/trunk/apt/debian/control
Log:
apt (0.7.6maemo1) unstable; urgency=low

  * Don't depend on debian-archive-keyring.  Don't don't do anything with
    it in postinst.

 -- Marius Vollmer <mvo at zagadka.de>  Sun, 09 Dec 2007 00:27:38 +0200


Modified: projects/haf/trunk/apt/debian/apt.postinst
===================================================================
--- projects/haf/trunk/apt/debian/apt.postinst	2007-12-07 19:19:24 UTC (rev 14920)
+++ projects/haf/trunk/apt/debian/apt.postinst	2007-12-08 22:28:13 UTC (rev 14921)
@@ -16,12 +16,6 @@
 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)

Modified: projects/haf/trunk/apt/debian/changelog
===================================================================
--- projects/haf/trunk/apt/debian/changelog	2007-12-07 19:19:24 UTC (rev 14920)
+++ projects/haf/trunk/apt/debian/changelog	2007-12-08 22:28:13 UTC (rev 14921)
@@ -1,3 +1,10 @@
+apt (0.7.6maemo1) unstable; urgency=low
+
+  * Don't depend on debian-archive-keyring.  Don't don't do anything with
+    it in postinst.
+
+ -- Marius Vollmer <mvo at zagadka.de>  Sun, 09 Dec 2007 00:27:38 +0200
+
 apt (0.7.6maemo0) unstable; urgency=low
 
   * Applied maemostrip.diff

Modified: projects/haf/trunk/apt/debian/control
===================================================================
--- projects/haf/trunk/apt/debian/control	2007-12-07 19:19:24 UTC (rev 14920)
+++ projects/haf/trunk/apt/debian/control	2007-12-08 22:28:13 UTC (rev 14921)
@@ -1,15 +1,14 @@
 Source: apt
 Section: admin
 Priority: important
-Maintainer: APT Development Team <deity at lists.debian.org>
-Uploaders: Jason Gunthorpe <jgg at debian.org>, Adam Heath <doogie at debian.org>, Matt Zimmerman <mdz at debian.org>, Michael Vogt <mvo at debian.org>, Otavio Salvador <otavio at debian.org>
+Maintainer: Marius Vollmer <marius.vollmer at nokia.com>
 Standards-Version: 3.7.2.2
 Build-Depends: debhelper (>= 5.0), gettext (>= 0.12)
 XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 
 Package: apt
 Architecture: any
-Depends: ${shlibs:Depends}, debian-archive-keyring
+Depends: ${shlibs:Depends}
 Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}