* debian/apt.postinst:

  - do not fail if ubuntu-keyring is not installed

diff --git a/debian/apt.postinst b/debian/apt.postinst
index 34545468e18a0597a200e57b50d8c1159c47be7c..2ebcfb19b8858c020074e16d608cb65f9c83fb76 100644 (file)
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -18,7 +18,7 @@ case "$1" in
         if ! test -f /etc/apt/trusted.gpg; then
                 cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
         fi
-       apt-key update
+       apt-key update || true
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/debian/changelog b/debian/changelog
index d4d4ece09f209415604b5aeb085bd9e7a4f73d92..9434dfd8e0d8d4ad22b1a4feb931f2c74a05c569 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.26~exp12ubuntu2) maverick; urgency=low
+
+  * debian/apt.postinst:
+    - do not fail if ubuntu-keyring is not installed
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 02 Aug 2010 11:47:59 +0200
+
 apt (0.7.26~exp12ubuntu1) maverick; urgency=low
 
   * ABI break upload