From 5ed56f934dd204cc3a1d757ccf5eac23f8374736 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 14 Sep 2010 18:57:46 +0200
Subject: * apt-pkg/policy.cc:   - support 100-pinning in Release file with
 ButAutomaticUpgrades     as requested by the backports crew (Closes: #596097)
 * apt-pkg/deb/deblistparser.cc:   - overrule NotAutomatic in case of
 ButAutomaticUpgrades

---
 test/integration/framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/integration/framework')

diff --git a/test/integration/framework b/test/integration/framework
index 8a5973d4b..59d2f0e85 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -211,7 +211,7 @@ buildpackage() {
 	fi
 	local BUILT="$(dpkg-buildpackage -uc -us -a$ARCH 2> /dev/null)"
 	local PKGS="$( echo "$BUILT" | grep '^dpkg-deb: building package' | cut -d'/' -f 2 | sed -e "s#'\.##")"
-	local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._-]*$')"
+	local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')"
 	cd - > /dev/null
 	for PKG in $PKGS; do
 		echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist
-- 
cgit v1.2.3


From 01a6e24cd1b601df2f20190b6118c4616e7fedf2 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 29 Sep 2010 19:55:04 +0200
Subject: * apt-pkg/depcache.cc:   - do not check endpointer packages instead
 of only those which prevented     NeverAutoRemove settings from having an
 effect (Closes: #598452)

---
 test/integration/framework | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'test/integration/framework')

diff --git a/test/integration/framework b/test/integration/framework
index 59d2f0e85..c09afcbad 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -499,3 +499,27 @@ testnopackage() {
 	fi
 	msgpass
 }
+
+testdpkginstalled() {
+	msgtest "Test for correctly installed package(s) with" "dpkg -l $*"
+	local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^i]' | wc -l)"
+	if [ "$PKGS" != 0 ]; then
+		echo $PKGS
+		dpkg -l $* | grep '^[a-z]'
+		msgfail
+		return 1
+	fi
+	msgpass
+}
+
+testdpkgnoninstalled() {
+	msgtest "Test for correctly non-installed package(s) with" "dpkg -l $*"
+	local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^u]' | wc -l)"
+	if [ "$PKGS" != 0 ]; then
+		echo
+		dpkg -l $* | grep '^[a-z]'
+		msgfail
+		return 1
+	fi
+	msgpass
+}
-- 
cgit v1.2.3


From 4b2a4ab8abb9f9b6ce262882480eee945a041d14 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Oct 2010 12:23:25 +0200
Subject: merge fix for testrun on amd64

---
 test/integration/framework | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/integration/framework')

diff --git a/test/integration/framework b/test/integration/framework
index d832bedbe..95fce1247 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -64,6 +64,8 @@ runapt() {
 	msgdebug "Executing: ${CCMD}$*${CDEBUG} "
 	if [ -f ./aptconfig.conf ]; then
 		APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
+        elif [ -f ../aptconfig.conf ]; then
+                APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
 	else
 		LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
 	fi
-- 
cgit v1.2.3


From 94eb3bee531ae1f3042eb8378e383b34dd083851 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Wed, 13 Oct 2010 15:30:47 +0200
Subject: test/integration/framework: set proper dir::state::status

---
 test/integration/framework | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/integration/framework')

diff --git a/test/integration/framework b/test/integration/framework
index e2c5234e2..2422f0886 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -113,6 +113,7 @@ setupenvironment() {
 	cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
 	ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
 	echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
+	echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
 	echo "Debug::NoLocking \"true\";" >> aptconfig.conf
 	echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
 	echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf
-- 
cgit v1.2.3