* merged from apt--mvo

2 files changed, 29 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index 15d92b9ce..09454d1cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,28 @@
-apt (0.7.2ubuntu9) unstable; urgency=low
+apt (0.7.4ubuntu1) UNRELEASED; urgency=low
 
-  [Otavio Salvador]
-  * Simplified HttpMethod::Fetch on http.cc removing Tail variable;
-  * Fix pipeline handling on http.cc (closes: #413324)
-  * Fix building to properly support binNMUs. Thanks to Daniel Schepler
-    <schepler@math.unipd.it> by the patch (closes: #359634)
-  * Fix example for Install-{Recommends,Suggests} options on
-    configure-index example file. Thanks to Peter Eisentraut
-    <peter_e@gmx.net> by the patch (closes: #432223)
-  * 
+  [ Otavio Salvador ]
+  * Applied patch from Guillem Jover <guillem.jover@nokia.com> to use
+    dpkg-architecture to get the host architecture (closes: #407187)
 
- --
+  [ Michael Vogt ]
+  * apt-pkg/depcache.cc:
+    - support a list of sections for:
+      APT::Install-Recommends-Sections
+      APT::Never-MarkAuto-Sections
 
-apt (0.7.2ubuntu8) gutsy; urgency=low
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Jul 2007 10:42:29 +0200
 
-  [Michael Vogt]
+apt (0.7.4) unstable; urgency=low
+
+  [ Michael Vogt ]
   * cmdline/apt-get.cc:
     - fix in the task-install code regexp (thanks to Adam Conrad and
-      Colin Watson). This should bring the livecd build back into
-      shape
-  [Otavio Salvador]
+      Colin Watson)
+    - support task removal too: apt-get remove taskname^
+      (thanks to Matt Zimmerman reporting this problem)
+
+  [ Otavio Salvador ]
+  * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
   * Fix compilation warnings:
     - apt-pkg/contrib/configuration.cc: wrong argument type;
     - apt-pkg/deb/dpkgpm.cc: wrong signess;
@@ -29,7 +32,15 @@ apt (0.7.2ubuntu8) gutsy; urgency=low
       - unused variable;
       - changed SetupProxy() method to void;
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Jul 2007 23:20:15 +0100
+  [ Christian Perrier ]
+  * Basque translation update. Closes: ##423766
+  * Unfuzzy formerly complete translations
+  * French translation update
+  * Re-generate PO(T) files
+  * Spanish translation update
+  * Swedish translation update
+
+ -- Otavio Salvador <otavio@debian.org>  Tue, 24 Jul 2007 09:55:50 -0300
 
 apt (0.7.2ubuntu7) gutsy; urgency=low
 
@@ -3138,4 +3149,3 @@ apt (0.0.1) unstable; urgency=low
   * Initial Release.
 
  -- Scott K. Ellis <scott@debian.org>  Tue, 31 Mar 1998 12:49:28 -0500
-
diff --git a/debian/control b/debian/control
index e2ab8ec4e..1c6d2f490 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: important
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
-Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
+Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>
 Standards-Version: 3.7.2.2
 Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5)
 Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)