aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2005-06-03 17:56:10 +0000
committerdancer <dancer>2005-06-03 17:56:10 +0000
commitb2e9d6d5057c7a493e7c7b369681277988d5655c (patch)
tree88a46989c5ffd0b41fb3c8c8daa987f6ec57af3e
parentcce89abc554fe35c1692f728311f1f48ec5d93b0 (diff)
downloadpbuilder-b2e9d6d5057c7a493e7c7b369681277988d5655c.tar
pbuilder-b2e9d6d5057c7a493e7c7b369681277988d5655c.tar.gz
+2005-06-04 Junichi Uekawa <dancer@debian.org>
+ + * debian/pbuilder-test/01_pbuilder_create: use sarge. + + * examples/B92test-pkg: fix after testing so that it works. + + * debian/pbuilder-test/03_pbuilder_build: fix typo. + 2005-06-03 Junichi Uekawa <dancer@debian.org>
-rw-r--r--ChangeLog8
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/pbuilder-test/01_pbuilder_create2
-rwxr-xr-xdebian/pbuilder-test/03_pbuilder_build2
-rw-r--r--examples/B92test-pkg7
5 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4723b59..883e6a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-04 Junichi Uekawa <dancer@debian.org>
+
+ * debian/pbuilder-test/01_pbuilder_create: use sarge.
+
+ * examples/B92test-pkg: fix after testing so that it works.
+
+ * debian/pbuilder-test/03_pbuilder_build: fix typo.
+
2005-06-03 Junichi Uekawa <dancer@debian.org>
* testsuite/run-test-experimental.sh: created a testsuite.
diff --git a/debian/changelog b/debian/changelog
index 2a36ba8..bc2b326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ pbuilder (0.128) UNRELEASED; urgency=low
- add debian/pbuilder-test/ directory to test pbuilder itself.
* Documentation/pbuilder-doc.xml:
- add reference on directory structure on pbuilder.
- - add note on pbuilder-test
+ - Add note on pbuilder-test
* Support '--distribution experimental'.
"pbuilder: Please add support for experimental", thanks to
Emanuele Rocca (Closes: #308813).
diff --git a/debian/pbuilder-test/01_pbuilder_create b/debian/pbuilder-test/01_pbuilder_create
index b88d640..987ac5d 100755
--- a/debian/pbuilder-test/01_pbuilder_create
+++ b/debian/pbuilder-test/01_pbuilder_create
@@ -1,3 +1,3 @@
#!/bin/bash
-pbuilder create --distribution woody
+pbuilder create --distribution sarge
diff --git a/debian/pbuilder-test/03_pbuilder_build b/debian/pbuilder-test/03_pbuilder_build
index 1114420..80119bf 100755
--- a/debian/pbuilder-test/03_pbuilder_build
+++ b/debian/pbuilder-test/03_pbuilder_build
@@ -3,7 +3,7 @@
mkdir /tmp/test-work
cd /tmp/test-work
cp /etc/apt/sources.list{,-}
-sed 's/#deb-src/deb-src' < /etc/apt/sources.list- > /etc/apt/sources.list
+sed 's/#deb-src/deb-src/' < /etc/apt/sources.list- > /etc/apt/sources.list
apt-get update
apt-get source dsh
pbuilder build dsh*dsc
diff --git a/examples/B92test-pkg b/examples/B92test-pkg
index 220adb4..5a5dee2 100644
--- a/examples/B92test-pkg
+++ b/examples/B92test-pkg
@@ -3,7 +3,14 @@
# 2005 Junichi Uekawa
set -e
+echo "Installing the prerequisites"
+for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do
+ apt-get install -y "$PKG"
+ apt-get remove -y "$PKG"
+done
+
dpkg -i /tmp/buildd/*.deb
+
chmod a+x /tmp/buildd/*/debian/pbuilder-test/*
SUCCESS=0
COUNT=0