From: Michael Vogt <mvo@debian.org>
Date: Mon, 14 Feb 2011 11:05:35 +0000 (+0100)
Subject: merged from lp:~donkult/apt/sid
X-Git-Tag: 0.8.11.2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1fc07a44e8191e00fc1566bfc15e8b370da77330?hp=-c

merged from lp:~donkult/apt/sid
---

1fc07a44e8191e00fc1566bfc15e8b370da77330
diff --combined debian/changelog
index bc7092bb0,5efc99233..ff0c94119
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,23 +1,34 @@@
 +apt (0.8.12) UNRELEASED; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged lp:~evfool/apt/fix641673:
 +    - String-fix in the source and the translations for the grammatical 
 +      mistake reported in bug LP: #641673, thanks to Robert Roth
 +  * merged lp:~evfool/apt/fix418552:
 +    - Grammar fix for bug LP: #418552, thanks to Robert Roth
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 10 Feb 2011 17:51:16 +0100
 +
+ apt (0.8.11.2) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * cmdline/apt-get.cc:
+     - add --install-suggests option (Closes: #473089)
+   * apt-pkg/depcache.cc:
+     - mark a package which was requested to be installed on commandline
+       always as manual regardless if it is already marked or not as the
+       marker could be lost later by the removal of rdepends (Closes: #612557)
+   * methods/rred.cc:
+     - read patch into MMap only if we work on uncompressed patches
+     - update size of dynamic MMap as we write in from the outside
+   * apt-pkg/contrib/mmap.cc:
+     - do not try to free the mapping if its is unset
+   * apt-pkg/contrib/fileutl.cc:
+     - reorder the loaded filesize bytes for big endian (Closes: #612986)
+       Thanks to Jörg Sommer for the detailed analyse!
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 13 Feb 2011 12:15:59 +0100
+ 
  apt (0.8.11.1) unstable; urgency=low
  
    [ Stefan Lippers-Hollmann ]
diff --combined test/integration/framework
index 121678d4b,11d9a9659..7e1d25e61
--- a/test/integration/framework
+++ b/test/integration/framework
@@@ -79,6 -79,7 +79,7 @@@ aptcache() { runapt apt-cache $*; 
  aptget() { runapt apt-get $*; }
  aptftparchive() { runapt apt-ftparchive $*; }
  aptkey() { runapt apt-key $*; }
+ aptmark() { runapt apt-mark $*; }
  dpkg() {
  	$(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
  }
@@@ -592,12 -593,12 +593,12 @@@ testequalor2() 
  }
  
  testshowvirtual() {
 -	local VIRTUAL="N: Can't select versions from package '$1' as it purely virtual"
 +	local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual"
  	local PACKAGE="$1"
  	shift
  	while [ -n "$1" ]; do
  		VIRTUAL="${VIRTUAL}
 -N: Can't select versions from package '$1' as it purely virtual"
 +N: Can't select versions from package '$1' as it is purely virtual"
  		PACKAGE="${PACKAGE} $1"
  		shift
  	done
@@@ -647,3 -648,16 +648,16 @@@ testdpkgnotinstalled() 
  	fi
  	msgpass
  }
+ 
+ testmarkedauto() {
+ 	local COMPAREFILE=$(mktemp)
+ 	addtrap "rm $COMPAREFILE;"
+ 	if [ -n "$1" ]; then
+ 		msgtest 'Test for correctly marked as auto-installed' "$*"
+ 		while [ -n "$1" ]; do echo "$1"; shift; done | sort > $COMPAREFILE
+ 	else
+ 		msgtest 'Test for correctly marked as auto-installed' 'no package'
+ 		echo > $COMPAREFILE
+ 	fi
+ 	aptmark showauto 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
+ }