merge from the expermental2 branch

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index f6446ccbc8487f61bd97d819f05637d937e12028..7cfa37e523312c6d35a1367de0b0c166a343eed2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-apt (0.9.0~exp1) UNRELEASEDexperimental; urgency=low
+apt (0.9.0) unstable; urgency=low
+
+  * upload to debian/unstable
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 16 Apr 2012 15:53:17 +0200
+
+apt (0.9.0~exp1) experimental; urgency=low
 
   [ Michael Vogt ]
   * apt-pkg/packagemanager.cc:
@@ -6,9 +12,10 @@ apt (0.9.0~exp1) UNRELEASEDexperimental; urgency=low
     - add APT::pkgPackageManager::MaxLoopCount to ensure that the
       ordering code does not get into a endless loop when it flip-flops
       between two states
-  * prepare debian/unstable upload
   * update libapt-inst1.4 to libapt-inst1.5 because of the cleanup 
     performed
+  * prepare debian/unstable upload, if there are no issues with this
+    upload it will directly go into unstable as 0.9.0  
 
   [ David Kalnischkies ]
   * do not update po and pot files in the process of the build as this
@@ -90,7 +97,14 @@ apt (0.9.0~exp1) UNRELEASEDexperimental; urgency=low
       number of auto-removed packages both before and after the list
       of packages (Closes: #665833)
 
- -- Michael Vogt <mvo@debian.org>  Wed, 11 Apr 2012 17:53:39 +0200
+  [ Steve Langasek ]
+  * don't treat build-depends-indep as cross-build-dependencies; we should
+    always install the host arch versions.  LP: #968828.
+
+  [ Paolo Rotolo ]
+  * Fix string from automatic to automatically (LP: #967393).
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 12 Apr 2012 12:40:39 +0200
 
 apt (0.8.16~exp13) experimental; urgency=low
 
@@ -493,6 +507,16 @@ apt (0.8.16~exp1) experimental; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
 
+apt (0.8.15.11) UNRELEASED; urgency=low
+
+  * Fix typo in apt-get(8). Closes: #664833
+  * Replace "argument" by "paramètre" in French translation.
+    Merci, les Titeps!
+  * Drop hardcoded "en.html" suffix in apt-secure manpage.
+    Thanks to David Prevot.
+
+ -- Christian Perrier <bubulle@debian.org>  Tue, 27 Mar 2012 20:31:38 +0200
+
 apt (0.8.15.10) unstable; urgency=high
 
   [ David Kalnischkies ]