From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 7 Sep 2010 14:24:35 +0000 (+0200)
Subject: merged from the debian-sid branch
X-Git-Tag: 0.9.13.exp1ubuntu1~263
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f1fe904373897893ac7a656f90ad20405871093d?hp=--cc

merged from the debian-sid branch
---

f1fe904373897893ac7a656f90ad20405871093d
diff --cc debian/changelog
index 1c24a6b29,47b1eefae..08115765c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,20 @@@
- apt (0.8.2ubuntu1) maverick; urgency=low
++apt (0.8.3ubuntu1) maverick; urgency=low
 +
 +  * merged fixes from debian-sid
 +  * debian/rules:
 +    - put ubuntu-archive.gpg back into the package (LP: #620576)
 +  * apt-pkg/init.cc:
 +    - ignore ".distUpgrade" and ".save" files in sources.list.d
 +      (LP: #631770)
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Sep 2010 09:27:24 +0200
++
+ apt (0.8.3) unstable; urgency=low
+ 
+   [ Manpages translations ]
+   * Japanese (KURASAWA Nozomu). Closes: #595862
+ 
+   [ Michael Vogt ]
    * apt-pkg/indexcopy.cc:
      - only use trusted.gpg.d directory if it exists
      - do not replace /dev/null when running in APT::CDROM::NoAct