aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2002-12-13 15:19:23 +0000
committerdancer <dancer>2002-12-13 15:19:23 +0000
commitb910f228f4f5b45ea4203342a5b6f5077bd4d019 (patch)
treef3630231cb11913b224ff7a529a7971c6d8d33ae
parent691e978bfb9e1d8498b82acc319bb18f57c3d532 (diff)
downloadpbuilder-b910f228f4f5b45ea4203342a5b6f5077bd4d019.tar
pbuilder-b910f228f4f5b45ea4203342a5b6f5077bd4d019.tar.gz
0.53
-rw-r--r--ChangeLog15
-rw-r--r--Makefile2
-rw-r--r--README6
-rw-r--r--debian/changelog10
-rw-r--r--debian/control2
-rw-r--r--examples/B91dpkg-i26
-rw-r--r--examples/C10shell4
-rw-r--r--examples/D10tmp4
8 files changed, 63 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f3fbe0..e73f4cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2002-12-13 Junichi Uekawa <dancer@debian.org>
+
+ * examples/D10tmp: fix error in script.
+
+ * examples/C10shell: example of shell invocation.
+
+ * Makefile (install): install dpkg-i example.
+
+ * examples/B91dpkg-i: add new file to demonstrate using script to
+ automatically install packages.
+
+ * README: update the readme file for a change, since
+ Andrew Stribblehill <a.d.stribblehill@durham.ac.uk> noticed a
+ mistake.
+
2002-12-12 Junichi Uekawa <dancer@debian.org>
* pbuilder-buildpackage (PACKAGENAME): add banner for logfile.
diff --git a/Makefile b/Makefile
index c5b946f..a1b1d08 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,8 @@ install:
$(INSTALL_FILE) pbuilder-uml.conf $(DESTDIR)/etc/pbuilder
$(INSTALL_FILE) pbuilder-uml.conf $(DESTDIR)/usr/share/pbuilder
$(INSTALL_EXECUTABLE) examples/B90linda $(DESTDIR)/usr/share/doc/pbuilder/examples
+ $(INSTALL_EXECUTABLE) examples/B91dpkg-i $(DESTDIR)/usr/share/doc/pbuilder/examples
+ $(INSTALL_EXECUTABLE) examples/C10shell $(DESTDIR)/usr/share/doc/pbuilder/examples
$(INSTALL_EXECUTABLE) examples/D10tmp $(DESTDIR)/usr/share/doc/pbuilder/examples
diff --git a/README b/README
index 92bc53a..0a0b58e 100644
--- a/README
+++ b/README
@@ -2,10 +2,10 @@
pbuilder - a personal builder.
Welcome to pbuilder, you will see some documentations.
-See README.Debian for some useful info,
-AUTHORS, for the list of people who have been working on this.
+See README.Debian for some useful info.
+AUTHORS and THANKS, for the list of people who have been working on this.
-The man page pbuilder.1 and pbuilderrc.5 should give some
+The man pages pbuilder.8, pbuilderrc.5, and pdebuild.1 should give some
info on how to use pbuilder.
diff --git a/debian/changelog b/debian/changelog
index 16ee65c..e78b7c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pbuilder (0.53) unstable; urgency=low
+
+ * update README, to fix mistakes in text. (closes: #172905)
+ * Standards-version: 3.5.8.
+ * add an example of running dpkg -i after successful build,
+ and running bash when unsuccessful.
+ * fix D10tmp script.
+
+ -- Junichi Uekawa <dancer@debian.org> Fri, 13 Dec 2002 21:53:14 +0900
+
pbuilder (0.52) unstable; urgency=low
* Clarify pbuilder.8 documentation on the timing of hook "A".
diff --git a/debian/control b/debian/control
index 1350072..a11bc0d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: extra
Maintainer: Junichi Uekawa <dancer@debian.org>
Build-Depends: debhelper (>= 4.1.0)
-Standards-Version: 3.5.7
+Standards-Version: 3.5.8
Package: pbuilder
Architecture: all
diff --git a/examples/B91dpkg-i b/examples/B91dpkg-i
new file mode 100644
index 0000000..1085559
--- /dev/null
+++ b/examples/B91dpkg-i
@@ -0,0 +1,26 @@
+#!/bin/bash
+# try to install the resulting debs.
+
+echo "Trying to install resulting packages and test upgrades"
+set -ex
+
+
+PKGNAMES=$(ls -1 /tmp/buildd *.deb | sed 's/_.*$//' )
+
+# install-remove check
+dpkg -i /tmp/buildd/*.deb
+dpkg --remove $PKGNAMES
+
+# install-purge check
+dpkg -i /tmp/buildd/*.deb
+dpkg --purge $PKGNAMES
+
+# upgrade-remove check
+apt-get install $PKGNAMES || true
+dpkg -i /tmp/buildd/*.deb
+dpkg --remove $PKGNAMES
+
+# upgrade-purge check
+apt-get install $PKGNAMES || true
+dpkg -i /tmp/buildd/*.deb
+dpkg --purge $PKGNAMES
diff --git a/examples/C10shell b/examples/C10shell
new file mode 100644
index 0000000..c1c4655
--- /dev/null
+++ b/examples/C10shell
@@ -0,0 +1,4 @@
+#!/bin/bash
+# invoke shell if build fails.
+
+/bin/bash </dev/tty > /dev/tty
diff --git a/examples/D10tmp b/examples/D10tmp
index b522a84..cd0594e 100644
--- a/examples/D10tmp
+++ b/examples/D10tmp
@@ -1,6 +1,6 @@
#!/bin/bash
#create $TMP and $TMPDIR
-[ -n "$TMP" -a ! -d "$TMP" ] && mkdir "$TMP"
-[ -n "$TMPDIR" -a ! -d "$TMPDIR" ] && mkdir "$TMPDIR"
+[ -n "$TMP" -a ! -d "$TMP" ] && mkdir "$TMP" || true
+[ -n "$TMPDIR" -a ! -d "$TMPDIR" ] && mkdir "$TMPDIR" || true