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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-02-15 14:21:26 +0200 (Thu, 15 Feb 2007)
New Revision: 9898

Modified:
   projects/haf/trunk/apt/debian/apt.postinst
   projects/haf/trunk/apt/debian/compat
   projects/haf/trunk/apt/debian/control
   projects/haf/trunk/apt/debian/rules
Log:
  * Do not expect the debian-archive-keyring package to be present.  Don't
    run apt-get update in apt.postinst.
  * Reduced debhelper compat version to 4, fingers crossed.
  * Do not Build-Depend on libdb4.4-dev, don't expect apt-ftparchive to be
    build.


Modified: projects/haf/trunk/apt/debian/apt.postinst
===================================================================
--- projects/haf/trunk/apt/debian/apt.postinst	2007-02-15 12:19:12 UTC (rev 9897)
+++ projects/haf/trunk/apt/debian/apt.postinst	2007-02-15 12:21:26 UTC (rev 9898)
@@ -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/compat
===================================================================
--- projects/haf/trunk/apt/debian/compat	2007-02-15 12:19:12 UTC (rev 9897)
+++ projects/haf/trunk/apt/debian/compat	2007-02-15 12:21:26 UTC (rev 9898)
@@ -1 +1 @@
-5
+4

Modified: projects/haf/trunk/apt/debian/control
===================================================================
--- projects/haf/trunk/apt/debian/control	2007-02-15 12:19:12 UTC (rev 9897)
+++ projects/haf/trunk/apt/debian/control	2007-02-15 12:21:26 UTC (rev 9898)
@@ -4,12 +4,12 @@
 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>
 Standards-Version: 3.6.2.2
-Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12)
+Build-Depends: debhelper (>= 4), gettext (>= 0.12)
 Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
 
 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}

Modified: projects/haf/trunk/apt/debian/rules
===================================================================
--- projects/haf/trunk/apt/debian/rules	2007-02-15 12:19:12 UTC (rev 9897)
+++ projects/haf/trunk/apt/debian/rules	2007-02-15 12:21:26 UTC (rev 9898)
@@ -69,7 +69,7 @@
 endif
 
 # APT Programs in apt-utils
-APT_UTILS=ftparchive sortpkgs extracttemplates
+APT_UTILS=sortpkgs extracttemplates
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1