summaryrefslogtreecommitdiff
path: root/test/integration/framework
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-17 08:03:41 +0200
committerMichael Vogt <mvo@debian.org>2013-10-17 08:03:41 +0200
commite8022b09e73ee89d3b748e1c8dba82abba5b37f3 (patch)
tree2bc51615c21c16040dbb31ebf873bdd2a29565d0 /test/integration/framework
parent5e9458e285af11c7fa4308add10d250e3546c8bf (diff)
parentc420fe0096985234e861aaafc2b9908b6259a1bb (diff)
Merge branch 'debian/sid' into feature/install-progress-refactor
Conflicts: apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'test/integration/framework')
-rw-r--r--test/integration/framework6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework
index d899bb574..28ccb4d9f 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,12 @@ 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
+
(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