Merge remote-tracking branch 'mvo/feature/add-upgrade-mode-test' into debian/sid

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 7d8c9b4e054aa9163ef59ca129a51725601d6c49..b4d812d26f80baed5b10408382b1b2218bc9ee8c 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1511,7 +1511,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       signal(SIGHUP,old_SIGHUP);
 
       // reset scroll area
-      SetupTerminalScrollArea(d->nr_terminal_rows);
+      SetupTerminalScrollArea(d->nr_terminal_rows + 1);
       if(d->fancy_progress_output)
       {
          // override the progress line (sledgehammer)

diff --git a/debian/changelog b/debian/changelog
index ec98a8080aded2151b0478254d43873bbfd9c4e7..287db9b281d3c162c110180d951544296fbc4ba0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,8 +38,9 @@ apt (0.9.12) UNRELEASED; urgency=low
   * debian/apt.postinst: use --compare-versions lt instead of lt-nl, 
     to ensure the apt-auto-removal file is correctly create, 
     thanks to Ben Hutchings
+  * update Uploaders to match recent uploaders better
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 08 Oct 2013 20:38:55 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 08 Oct 2013 20:38:55 +0200
 
 apt (0.9.11.4) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 3c5d14fe80d8fb246356afef7786459bca2d4543..673fba47732a2512811e0bfd8f3faaa9d19decbb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: apt
 Section: admin
 Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
-Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
- Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
+Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>, 
  Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.9.4
 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,