Merge changes from Ubuntu 0.8.16~exp5ubuntu14.2 upload

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index efc61362cf3a2745dad275424b6792d175562745..8016687c9065ab940b7ec343380456240c279fa4 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -457,10 +457,7 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then
         # now run apt-xapian-index if it is installed to ensure the index
         # is up-to-date
         if [ -x /usr/sbin/update-apt-xapian-index ]; then
         # now run apt-xapian-index if it is installed to ensure the index
         # is up-to-date
         if [ -x /usr/sbin/update-apt-xapian-index ]; then

-            if [ "$(dpkg --print-architecture)" = "armel" ]; then
-                xapian_extra_args='-u'
-            fi
-            nice ionice -c3 update-apt-xapian-index -q $xapian_extra_args
+            nice ionice -c3 update-apt-xapian-index -q -u

         fi
     else
        debug_echo "download updated metadata (error)"
         fi
     else
        debug_echo "download updated metadata (error)"

diff --git a/debian/changelog b/debian/changelog
index e64ee60266cb3c415bd2493e967f0b7e6ce76113..c49c56bca7a3beb87b6e40b977edb9b1a37449ab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -131,13 +131,20 @@ apt (0.8.16~exp6) experimental; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Wed, 14 Sep 2011 21:06:51 +0200
 
 
  -- Michael Vogt <mvo@debian.org>  Wed, 14 Sep 2011 21:06:51 +0200
 

-apt (0.8.16~exp5ubuntu14.2) UNRELEASED; urgency=low
+apt (0.8.16~exp5ubuntu14.2.1) UNRELEASED; urgency=low

 
   [ Daniel Hahler ]
   * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 20 Oct 2011 10:58:20 +0200
 
 
   [ Daniel Hahler ]
   * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 20 Oct 2011 10:58:20 +0200
 

+apt (0.8.16~exp5ubuntu14.2) precise; urgency=low
+
+  * Call update-apt-xapian-index with -u on all arches in
+    cron.daily to make it behave slightly more pleasantly.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 09 Jan 2012 07:41:03 -0700
+

 apt (0.8.16~exp5ubuntu14.1) precise; urgency=low
 
   * apt-pkg/edsp.cc:
 apt (0.8.16~exp5ubuntu14.1) precise; urgency=low
 
   * apt-pkg/edsp.cc: