summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Conrad <adconrad@0c3.net>2012-01-10 02:16:57 -0700
committerAdam Conrad <adconrad@0c3.net>2012-01-10 02:16:57 -0700
commitd2fd8c8ff72f82db473d4431213032249eee41c3 (patch)
tree09ca458ca8652cd56656769cd64e7dca2d5add14
parent645183375243ce4b7bd1b6fd2f4b9f925d6cbbc2 (diff)
Merge changes from Ubuntu 0.8.16~exp5ubuntu14.2 upload
-rw-r--r--debian/apt.cron.daily5
-rw-r--r--debian/changelog9
2 files changed, 9 insertions, 5 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index efc61362c..8016687c9 100644
--- 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
- 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)"
diff --git a/debian/changelog b/debian/changelog
index e64ee6026..c49c56bca 100644
--- 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
-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
+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: