From 42c1513b712818823e0a136c949f0d93c46907d7 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Tue, 15 Oct 2013 18:07:44 +0200
Subject: tests, do not send pkgname with arch via the status-fd

---
 test/integration/framework | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'test/integration/framework')

diff --git a/test/integration/framework b/test/integration/framework
index d899bb574..0f57d0259 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -335,6 +335,7 @@ buildsimplenativepackage() {
 
 	local SECTION="${7:-others}"
 	local PRIORITY="${8:-optional}"
+        local FILE_TREE="$9"
 	local DISTSECTION
 	if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
 		DISTSECTION="main"
@@ -391,9 +392,16 @@ Package: $NAME" >> ${BUILDDIR}/debian/control
 		mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
 		cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}
 		cp ${BUILDDIR}/${NAME} ${BUILDDIR}/debian/tmp/usr/bin/${NAME}-${arch}
+                if [ -n "$FILE_TREE" ]; then
+                    cp -ar "$FILE_TREE" ${BUILDDIR}/debian/tmp
+                fi
+                if [ -n "$POSTINST" ]; then
+                    echo "$POSTINST" > ${BUILDDIR}/debian/tmp/DEBIAN/postinst
+                    chmod +x  ${BUILDDIR}/debian/tmp/DEBIAN/postinst
+                fi
+
 		(cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$arch)
 		(cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
-
 		dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. 2> /dev/null > /dev/null
 		echo "pool/${NAME}_${VERSION}_${arch}.deb" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist
 	done
-- 
cgit v1.2.3


From 7ff4de5b121928a8e800bc31cbc6aa74d11dd47c Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Tue, 15 Oct 2013 18:09:09 +0200
Subject: remove POSTINST from framework, file tree can be used for this

---
 test/integration/framework | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'test/integration/framework')

diff --git a/test/integration/framework b/test/integration/framework
index 0f57d0259..28ccb4d9f 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -395,10 +395,6 @@ Package: $NAME" >> ${BUILDDIR}/debian/control
                 if [ -n "$FILE_TREE" ]; then
                     cp -ar "$FILE_TREE" ${BUILDDIR}/debian/tmp
                 fi
-                if [ -n "$POSTINST" ]; then
-                    echo "$POSTINST" > ${BUILDDIR}/debian/tmp/DEBIAN/postinst
-                    chmod +x  ${BUILDDIR}/debian/tmp/DEBIAN/postinst
-                fi
 
 		(cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$arch)
 		(cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
-- 
cgit v1.2.3