Merge lp:~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201105042235 into lp:ubuntu/lucid-updates/apt

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid-updates/apt now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/apt/lucid-updates-201105042235. A merge should be performed if necessary.

[James Westby (james-w)]

Hi Michael,

Seems you had an uploaded lucid change for apt that was overwritten by the
backport of --arch.

Do you want to upload that fix too?

Thanks,

James

Unmerged revisions

110. By Michael Vogt on 2010-10-01

* debian/apt.cron.daily:
  - source /etc/default/locale (if available) so that the
    apt-get update cron job fetches the right translated package
    descriptions (LP: #652951)

109. By Michael Vogt on 2010-09-09

* ftparchive/writer.cc:
  - port changes from maverick to remove size limit for
    Files,Checksum-Sha1,Checksum-Sha256

108. By Michael Vogt on 2010-09-09

* ftparchive/writer.cc:
  - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
    available LP: #633967. Thanks to Colin Watson

107. By Michael Vogt on 2010-07-15

* apt-pkg/deb/dpkgpm.cc:
  - Fix segmentation fault when /var/log/apt ist missing. LP: #535509

106. By Michael Vogt on 2010-05-14

* debian/apt.postinst:
  - do not fail if getent returns nothing useful (LP: #579647)
    thanks to Jean-Baptiste Lallement

105. By Michael Vogt on 2010-05-05

[ Loïc Minier ]
* Use https:// in Vcs-Bzr URL.

[ Michael Vogt ]
* apt-pkg/deb/debrecords.cc:
  - fix max tag buffer size (LP: #545336, closes: #578959)
* apt-pkg/indexfile.cc:
  - If no "_" is found in the language code, try to find a "."
    This is required for languages like Esperanto that have no
    county associated with them (LP: #560956)
    Thanks to "Aisano" for the fix

=== modified file 'debian/apt.cron.daily'
--- debian/apt.cron.daily	2010-03-12 23:10:52 +0000
+++ debian/apt.cron.daily	2011-05-04 22:39:35 +0000
@@ -436,6 +436,13 @@
 # mirrors at the same time
 random_sleep
 
+# include default system language so that "apt-get update" will
+# fetch the right translated package descriptions
+if [ -r /etc/default/locale ]; then
+    . /etc/default/locale
+    export LANG LANGUAGE LC_MESSAGES LC_ALL
+fi
+
 # update package lists
 UPDATED=0
 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-16 20:56:11 +0000
+++ debian/changelog	2011-05-04 22:39:35 +0000
@@ -1,9 +1,21 @@
+<<<<<<< TREE
 apt (0.7.25.3ubuntu9.4) lucid-proposed; urgency=low
 
   * backported the apt-ftparchive --arch support (LP: #714970)
 
  -- Michael Vogt <[e-mail]>  Wed, 16 Feb 2011 20:56:11 +0100
 
+=======
+apt (0.7.25.3ubuntu9.4) UNRELEASED; urgency=low
+
+  * debian/apt.cron.daily:
+    - source /etc/default/locale (if available) so that the 
+      apt-get update cron job fetches the right translated package
+      descriptions (LP: #652951)
+
+ -- Michael Vogt <[e-mail]>  Fri, 01 Oct 2010 21:44:31 +0200
+
+>>>>>>> MERGE-SOURCE
 apt (0.7.25.3ubuntu9.3) lucid-proposed; urgency=low
 
   * ftparchive/writer.cc: