merged with the unstable upload

1 files changed, 46 insertions, 51 deletions

diff --git a/debian/changelog b/debian/changelog
index 6960dad02..ceb75182d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,31 +1,10 @@
-apt (0.8.15) UNRELEASED; urgency=low
+apt (0.8.16~exp1) UNRELEASED; urgency=low
 
-  [ Christian Perrier ]
-  * Catalan translation update (Jordi Mallach). Closes: #630657
-
-  [ Michael Vogt ]
-  * debian/control:
-    - modernize package description (closes: #624618)
+  * merged with the debian/unstable upload
 
  -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2011 10:38:02 +0100
 
-apt (0.8.15~exp3) experimental; urgency=low
-
-  * debian/control:
-    - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and 
-     libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214)
-    - use depends for the ${shlibs:Depends} to make the breaks work
-
- -- Michael Vogt <mvo@debian.org>  Fri, 17 Jun 2011 21:51:41 +0200
-
-apt (0.8.15~exp2) experimental; urgency=low
-
-  * debian/control:
-    - fix incorrect Replaces (closes: #630204) for libapt-inst1.2
-
- -- Michael Vogt <mvo@debian.org>  Wed, 15 Jun 2011 16:51:14 +0200
-
-apt (0.8.15~exp1) experimental; urgency=low
+apt (0.8.15) unstable; urgency=low
 
   [ Julian Andres Klode ]
   * apt-pkg/depcache.cc:
@@ -45,6 +24,7 @@ apt (0.8.15~exp1) experimental; urgency=low
   * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
   * Italian translation update (Milo Casagrande). Closes: #627834
   * German documentation translation update (Chris Leick). Closes: #629949
+  * Catalan translation update (Jordi Mallach). Closes: #630657
 
   [ David Kalnischkies ]
   * fix a bunch of cppcheck warnings/errors based on a patch by
@@ -61,6 +41,8 @@ apt (0.8.15~exp1) experimental; urgency=low
     - let VisitRProvides report if the calls were successful
   * apt-pkg/deb/dpkgpm.cc:
     - replace obsolete usleep with nanosleep
+    - remove invalid pkgcache.bin and rebuild it if possible
+    - log reinstall commands in history.log
   * debian/apt{,-utils}.symbols:
     - update both experimental symbol-files to reflect 0.8.14 state
   * debian/rules:
@@ -101,6 +83,14 @@ apt (0.8.15~exp1) experimental; urgency=low
   * apt-pkg/packagemanager.cc:
     - ensure for Multi-Arch:same packages that they are unpacked in
       lock step even in immediate configuration (Closes: #618288)
+  * apt-pkg/init.cc:
+    - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer!
+  * cmdline/apt-config.cc:
+    - show Acquire::Languages and APT::Architectures settings
+      in 'dump' (Closes: 626739)
+  * apt-pkg/orderlist.cc:
+    - ensure that an old version of a package with a provides can
+      never satisfy a dependency of a newer version of this package
 
   [ Michael Vogt ]
   * methods/mirror.cc:
@@ -108,12 +98,38 @@ apt (0.8.15~exp1) experimental; urgency=low
     - ignore non http urls in the mirrors
     - append the dist (e.g. sid, wheezy) as a query string when
       asking for a suitable mirror 
+  * apt-pkg/deb/deblistparser.cc:
+    - include all known languages when building the apt cache
+      (LP: #794907)
+  * apt-pkg/deb/debindexfile.cc:
+    - remove some no longer valid checks for "TranslationsAvailable()"
+
+  [ Kenneth Solbø Andersen ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - set permissions of term.log to root.adm and 644 (LP: #404724)
+  
+  [ Chris Leick ]
+  * various typo and syntax corrections in doc/*.xml
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2011 18:00:48 +0200
+
+apt (0.8.15~exp3) experimental; urgency=low
+
   * debian/control:
-    - add libapt-pkg4.10 and libapt-inst1.2 library packages
+    - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and 
+     libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214)
+    - use depends for the ${shlibs:Depends} to make the breaks work
 
- -- Michael Vogt <mvo@debian.org>  Fri, 10 Jun 2011 15:32:07 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri, 17 Jun 2011 21:51:41 +0200
+
+apt (0.8.15~exp2) experimental; urgency=low
+
+  * debian/control:
+    - fix incorrect Replaces (closes: #630204) for libapt-inst1.2
 
-apt (0.8.14.2) UNRELEASED; urgency=low
+ -- Michael Vogt <mvo@debian.org>  Wed, 15 Jun 2011 16:51:14 +0200
+
+apt (0.8.15~exp1) experimental; urgency=low
 
   [ Julian Andres Klode ]
   * apt-pkg/depcache.cc:
@@ -133,7 +149,6 @@ apt (0.8.14.2) UNRELEASED; urgency=low
   * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
   * Italian translation update (Milo Casagrande). Closes: #627834
   * German documentation translation update (Chris Leick). Closes: #629949
-  * Catalan translation update (Jordi Mallach). Closes: #630657
 
   [ David Kalnischkies ]
   * fix a bunch of cppcheck warnings/errors based on a patch by
@@ -150,8 +165,6 @@ apt (0.8.14.2) UNRELEASED; urgency=low
     - let VisitRProvides report if the calls were successful
   * apt-pkg/deb/dpkgpm.cc:
     - replace obsolete usleep with nanosleep
-    - remove invalid pkgcache.bin and rebuild it if possible
-    - log reinstall commands in history.log
   * debian/apt{,-utils}.symbols:
     - update both experimental symbol-files to reflect 0.8.14 state
   * debian/rules:
@@ -192,14 +205,6 @@ apt (0.8.14.2) UNRELEASED; urgency=low
   * apt-pkg/packagemanager.cc:
     - ensure for Multi-Arch:same packages that they are unpacked in
       lock step even in immediate configuration (Closes: #618288)
-  * apt-pkg/init.cc:
-    - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer!
-  * cmdline/apt-config.cc:
-    - show Acquire::Languages and APT::Architectures settings
-      in 'dump' (Closes: 626739)
-  * apt-pkg/orderlist.cc:
-    - ensure that an old version of a package with a provides can
-      never satisfy a dependency of a newer version of this package
 
   [ Michael Vogt ]
   * methods/mirror.cc:
@@ -207,20 +212,10 @@ apt (0.8.14.2) UNRELEASED; urgency=low
     - ignore non http urls in the mirrors
     - append the dist (e.g. sid, wheezy) as a query string when
       asking for a suitable mirror 
-  * apt-pkg/deb/deblistparser.cc:
-    - include all known languages when building the apt cache
-      (LP: #794907)
-  * apt-pkg/deb/debindexfile.cc:
-    - remove some no longer valid checks for "TranslationsAvailable()"
-
-  [ Kenneth Solbø Andersen ]
-  * apt-pkg/deb/dpkgpm.cc:
-    - set permissions of term.log to root.adm and 644 (LP: #404724)
-  
-  [ Chris Leick ]
-  * various typo and syntax corrections in doc/*.xml
+  * debian/control:
+    - add libapt-pkg4.10 and libapt-inst1.2 library packages
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 28 May 2011 10:54:23 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri, 10 Jun 2011 15:32:07 +0200
 
 apt (0.8.14.1) unstable; urgency=low