diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | debian/TODO | 5 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | examples/E50-initscripts-2.86.ds1-7.workaround.sh | 16 | ||||
| -rw-r--r-- | examples/E50-libc2.3.2.ds1-11-workaround | 2 |
6 files changed, 56 insertions, 6 deletions
@@ -1,3 +1,25 @@ +2005-12-21 Junichi Uekawa <dancer@debian.org> + + * testsuite/run-regression.sh: add results display. + + * testsuite/run-test.sh: add results display + + * testsuite/run-test-uml.sh: add results display. + + * testsuite/run-regression.sh: run tests in numerical order of bug reports. + + * testsuite/regression/344089-workaround-check.sh: create a regression test + + * testsuite/run-test.sh: use + /usr/share/doc/pbuilder/examples/344089 for hookdir. + + * Makefile: no longer install libc6 workaround which is outdated, + and install the initscripts workaround to + /usr/share/doc/pbuilder/examples/344089 + + * examples/E50-initscripts-2.86.ds1-7.workaround.sh: add a + workaround for #344089, and #262627 + 2005-12-19 Junichi Uekawa <dancer@debian.org> * pdebuild-internal: export HOME with a decent value. @@ -86,9 +86,11 @@ install: $(INSTALL_EXECUTABLE) examples/execute_paramtest.sh $(DESTDIR)/usr/share/doc/pbuilder/examples $(INSTALL_EXECUTABLE) examples/pbuilder-distribution.sh $(DESTDIR)/usr/share/doc/pbuilder/examples - # install workaround for libc6 -- 2004-03-13 - $(INSTALL_DIRECTORY) $(DESTDIR)/usr/share/doc/pbuilder/examples/libc6workaround - $(INSTALL_EXECUTABLE) examples/E50-libc2.3.2.ds1-11-workaround $(DESTDIR)/usr/share/doc/pbuilder/examples/libc6workaround + # install workaround for initscripts -- 2005-12-21 + $(INSTALL_DIRECTORY) $(DESTDIR)/usr/share/doc/pbuilder/examples/344089 + $(INSTALL_EXECUTABLE) examples/E50-initscripts-2.86.ds1-7.workaround.sh $(DESTDIR)/usr/share/doc/pbuilder/examples/344089 + + cd pbuildd; make install DESTDIR=$(DESTDIR) cd Documentation; make install DESTDIR=$(DESTDIR) diff --git a/debian/TODO b/debian/TODO index 4b5bd71..501bc1d 100644 --- a/debian/TODO +++ b/debian/TODO @@ -11,6 +11,11 @@ I think I just need to add hacks to copy stuff. pbuilder support for signatures will hopefully come + - support readlink -e usage instead of readlink -f. + +This is too trivial, but anyway. Debian 3.1 does not support +'readlink -e'. + * xvfb:x11-common - debian-bug: 337541: fixed in 0.138 /etc/init.d/x11-common needs to be ran; policy-rc.d is now patched. diff --git a/debian/changelog b/debian/changelog index f25e36d..983e4c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ pbuilder (0.143) UNRELEASED; urgency=low [Junichi Uekawa] - * - - -- Junichi Uekawa <dancer@debian.org> Mon, 19 Dec 2005 23:42:10 +0900 + * remove libc6 workaround from examples directory, since the problem is + already fixed, and install workaround for initscripts 2.86.ds1-7. + Also add a workaround for a running inetd after upgrade. + Use --hookdir /usr/share/doc/pbuilder/examples/344089 for the timebeing. + + -- Junichi Uekawa <dancer@debian.org> Wed, 21 Dec 2005 19:47:04 +0900 pbuilder (0.142) unstable; urgency=low diff --git a/examples/E50-initscripts-2.86.ds1-7.workaround.sh b/examples/E50-initscripts-2.86.ds1-7.workaround.sh new file mode 100644 index 0000000..195ecf3 --- /dev/null +++ b/examples/E50-initscripts-2.86.ds1-7.workaround.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# work around initscripts postinst which mounts /sys etc. +# Bug: #344089 + +set +e + +umount /sys +umount /run +umount /proc/bus/usb +umount /dev/shm + +# inetd seems to be dually started after upgrade, kill it. +# Bug: #262627 +kill -9 $(cat /var/run/inetd.pid) + +exit 0 diff --git a/examples/E50-libc2.3.2.ds1-11-workaround b/examples/E50-libc2.3.2.ds1-11-workaround index 350e79a..ff4d9f8 100644 --- a/examples/E50-libc2.3.2.ds1-11-workaround +++ b/examples/E50-libc2.3.2.ds1-11-workaround @@ -1,5 +1,7 @@ #!/bin/sh # work around libc6 postinst which mounts /sys etc. +# Bug#230008 + set +e umount /sys umount /proc/bus/usb |