[Pbuilder-maint] pbuilder CVS update: pbuildd/scripts/cb autoconf
bison bzip2 bzip2.diff cdbs cdbs.diff debconf debhelper
debhelper.diff file file.diff gettext html2text
intltool-debian libextutils-cbuilder-perl
libextutils-parsexs-perl libtool ncurses pkg-config
po-debconf po-debconf.diff quilt quilt.diff xorg-x11
xorg-x11.diff zlib
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Wed Apr 26 08:34:32 UTC 2006
User: schepler
Date: 06/04/26 08:34:31
Modified: scripts/cb autoconf bison bzip2 bzip2.diff cdbs cdbs.diff
debconf debhelper debhelper.diff file file.diff
gettext html2text intltool-debian
libextutils-cbuilder-perl libextutils-parsexs-perl
libtool ncurses pkg-config po-debconf quilt
quilt.diff zlib
Added: scripts/cb po-debconf.diff
Removed: scripts/cb xorg-x11 xorg-x11.diff
Log:
* Fix scripts/cb-functions for new su syntax. This also requires
changes to all scripts in scripts/cb; I have done this for a few
of the first ones to be executed, and more will follow as I come
to them in my local pbuildd run.
* Update a few scripts (cdbs, debhelper) for newer uploaded versions.
* Remove xorg-x11 script because of modular X.Org upload, woohoo!
This script was always a major pain to maintain.
* Adjust bzip2 and bison (for gawk) to build earlier, so we can
remove the cruft in the ncurses script forcing the installation of quilt
before its binary dependencies were available.
* Improve file script so we can remove the large libtool.copy from
file.diff.
Revision Changes Path
1.2 +1 -1 pbuildd/scripts/cb/autoconf
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/autoconf?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/autoconf?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/autoconf.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: autoconf
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/autoconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autoconf 3 Apr 2006 09:01:32 -0000 1.1
+++ autoconf 26 Apr 2006 08:34:31 -0000 1.2
@@ -7,7 +7,7 @@
inst_pkgs texinfo debhelper m4
inst_src autoconf
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/autoconf/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/autoconf/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +2 -2 pbuildd/scripts/cb/bison
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/bison?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/bison?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/bison.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: bison
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/bison,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bison 3 Apr 2006 09:01:32 -0000 1.1
+++ bison 26 Apr 2006 08:34:31 -0000 1.2
@@ -4,10 +4,10 @@
. /var/cache/pbuildd/scripts/cb-functions
-inst_pkgs debhelper texinfo gettext m4
+inst_pkgs debhelper gettext m4 autotools-dev
inst_src bison
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/bison/*/; touch doc/bison.dvi doc/bison.ps; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/bison/*/; $SUTOUSER \"touch doc/bison.dvi doc/bison.ps; dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +2 -2 pbuildd/scripts/cb/bzip2
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/bzip2?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/bzip2?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/bzip2.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: bzip2
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/bzip2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzip2 3 Apr 2006 09:01:32 -0000 1.1
+++ bzip2 26 Apr 2006 08:34:31 -0000 1.2
@@ -4,10 +4,10 @@
. /var/cache/pbuildd/scripts/cb-functions
-inst_pkgs texinfo
+inst_pkgs
inst_src bzip2
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/bzip2/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/bzip2/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +36 -2 pbuildd/scripts/cb/bzip2.diff
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/bzip2.diff?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/bzip2.diff?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/bzip2.diff.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: bzip2.diff
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/bzip2.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzip2.diff 3 Apr 2006 09:01:32 -0000 1.1
+++ bzip2.diff 26 Apr 2006 08:34:31 -0000 1.2
@@ -1,6 +1,20 @@
+diff -urN bzip2-1.0.3.old/debian/postinst-run bzip2-1.0.3/debian/postinst-run
+--- bzip2-1.0.3.old/debian/postinst-run 2006-04-24 16:03:23.000000000 +0000
++++ bzip2-1.0.3/debian/postinst-run 2006-04-24 16:04:47.000000000 +0000
+@@ -11,10 +11,6 @@
+ fi
+ fi
+
+-# Info
+-install-info --quiet --section "General Commands" "General Commands" \
+- /usr/share/info/bzip2.info
+-
+ # FHS
+ #pkg=bzip2
+ #if [ "$1" = "configure" ]; then
diff -urN bzip2-1.0.3.old/debian/rules bzip2-1.0.3/debian/rules
---- bzip2-1.0.3.old/debian/rules 2006-02-17 14:18:03.000000000 +0000
-+++ bzip2-1.0.3/debian/rules 2006-02-17 14:17:05.000000000 +0000
+--- bzip2-1.0.3.old/debian/rules 2006-04-24 16:03:23.000000000 +0000
++++ bzip2-1.0.3/debian/rules 2006-04-24 16:03:45.000000000 +0000
@@ -28,14 +28,6 @@
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/-[0-9.]*$$//')
@@ -16,3 +30,23 @@
#ifneq (,$(findstring /$(DEB_HOST_ARCH)/,/amd64/ppc64/))
# build32-stamp := build32-stamp
#endif
+@@ -48,7 +40,6 @@
+ ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" test
+ endif
+- makeinfo -o bzip2.info manual.texi
+ cat debian/copyright.in LICENSE > debian/copyright
+ touch build-stamp
+
+@@ -143,11 +134,6 @@
+ ln -s bzip2.1.gz $$i.1.gz; \
+ done )
+
+- # Info
+- install -d debian/tmp-run/usr/share/info
+- cp bzip2.info* debian/tmp-run/usr/share/info/
+- gzip -v9 debian/tmp-run/usr/share/info/*
+-
+ # Other docs in lib package
+ install -d debian/tmp-run/usr/share/doc/bzip2
+ cp *.ps *.html *.texi debian/tmp-run/usr/share/doc/bzip2
1.2 +1 -1 pbuildd/scripts/cb/cdbs
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/cdbs?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/cdbs?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/cdbs.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: cdbs
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/cdbs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdbs 3 Apr 2006 09:01:32 -0000 1.1
+++ cdbs 26 Apr 2006 08:34:31 -0000 1.2
@@ -8,7 +8,7 @@
inst_pkgs debhelper
inst_src cdbs
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/cdbs/*/; DEB_BUILD_OPTIONS=nocheck $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/cdbs/*/; DEB_BUILD_OPTIONS=nocheck $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +25 -27 pbuildd/scripts/cb/cdbs.diff
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/cdbs.diff?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/cdbs.diff?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/cdbs.diff.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: cdbs.diff
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/cdbs.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdbs.diff 3 Apr 2006 09:01:32 -0000 1.1
+++ cdbs.diff 26 Apr 2006 08:34:31 -0000 1.2
@@ -1,29 +1,27 @@
-diff -urN cdbs-0.4.32.old/debian/docs cdbs-0.4.32/debian/docs
---- cdbs-0.4.32.old/debian/docs 2005-07-05 12:34:39.000000000 -0700
-+++ cdbs-0.4.32/debian/docs 2005-07-11 12:52:31.000000000 -0700
-@@ -1,4 +0,0 @@
--guide/cdbs-doc.xhtml
--guide/cdbs-doc.pdf
--guide/cdbs-doc.ps
--guide/cdbs-doc.txt
-diff -urN cdbs-0.4.32.old/debian/rules cdbs-0.4.32/debian/rules
---- cdbs-0.4.32.old/debian/rules 2005-07-09 07:56:34.000000000 -0700
-+++ cdbs-0.4.32/debian/rules 2005-07-11 12:51:00.000000000 -0700
-@@ -27,7 +27,7 @@
- DEB_ARCH_PACKAGES :=
- DEB_PACKAGES := $(DEB_INDEP_PACKAGES)
- DEB_ALL_PACKAGES := $(DEB_PACKAGES)
--DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes
-+#DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes
- include 1/rules/buildvars.mk.in
- include 1/rules/debhelper.mk.in
- include 1/class/autotools.mk.in
-@@ -39,7 +39,7 @@
- DEB_COMPRESS_EXCLUDE := .xhtml
+diff -urN cdbs-0.4.38.old/debian/docs cdbs-0.4.38/debian/docs
+--- cdbs-0.4.38.old/debian/docs 2006-03-16 00:43:44.000000000 +0100
++++ cdbs-0.4.38/debian/docs 1970-01-01 01:00:00.000000000 +0100
+@@ -1,2 +0,0 @@
+-doc/cdbs-doc.html
+-doc/cdbs-doc.pdf
+diff -urN cdbs-0.4.38.old/doc/Makefile cdbs-0.4.38/doc/Makefile
+--- cdbs-0.4.38.old/doc/Makefile 2006-03-27 21:05:23.000000000 +0200
++++ cdbs-0.4.38/doc/Makefile 2006-04-14 16:52:48.000000000 +0200
+@@ -1,4 +1,4 @@
+-all: html pdf
++all:
- build/cdbs::
-- make -C guide
-+ -make -C guide
+ xmllint-stamp-%: %.xml
+ xmllint --xinclude --postvalid --noblanks --noout $<
+diff -urN cdbs-0.4.38.old/Makefile.in cdbs-0.4.38/Makefile.in
+--- cdbs-0.4.38.old/Makefile.in 2006-03-16 14:01:48.000000000 +0100
++++ cdbs-0.4.38/Makefile.in 2006-04-14 16:53:11.000000000 +0200
+@@ -622,7 +622,7 @@
+ mv $@.tmp $@
- clean::
- make -C guide dist-clean
+ %.png: %.dot
+- dot -Tpng -o $@ $^
++ touch $@
+
+ doc/depgraph.dot: doc/gen-dotty.pl $(all_mk_files)
+ $(PERL) $^ >$@
1.2 +4 -19 pbuildd/scripts/cb/debconf
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/debconf?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/debconf?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/debconf.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: debconf
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/debconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- debconf 3 Apr 2006 09:01:32 -0000 1.1
+++ debconf 26 Apr 2006 08:34:31 -0000 1.2
@@ -1,29 +1,14 @@
#! /bin/sh -e
-# For debconf -> debhelper ->b debconf circular dependency.
-# Also get rid of python, etc build-depends temporarily.
-
-test -d /var/cache/pbuildd/partial/d/debhelper || test -d /var/cache/pbuildd/pool/d/debhelper
+# For debconf -> libqt-perl -> ... -> libx11 -> libxdmcp ->
+# x11proto-core-dev ->b x11-common ->b debconf.
. /var/cache/pbuildd/scripts/cb-functions
-inst_pkgs gettext po-debconf
-if test -d /var/cache/pbuildd/partial/d/debhelper; then
- $CHROOTEXEC dpkg -i --force-depends /var/cache/pbuildd/partial/d/debhelper/debhelper_*.deb
-else
- $CHROOTEXEC dpkg -i --force-depends /var/cache/pbuildd/pool/d/debhelper/debhelper_*.deb
-fi
-
+inst_pkgs debhelper po-debconf po4a perl gettext
inst_src debconf
-if ! $CHROOTEXEC /bin/bash -e <<EOF
- cd /tmp/debconf/*/
- $SUTOUSER $FAKEROOT debian/rules clean
- $SUTOUSER touch doc/introduction.html doc/introduction.txt
- $SUTOUSER touch doc/tutorial.html doc/tutorial.txt
- $SUTOUSER dpkg-buildpackage -d -nc -us $DEBBUILDOPTS
-EOF
-then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/debconf/*; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +1 -1 pbuildd/scripts/cb/debhelper
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/debhelper?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/debhelper?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/debhelper.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: debhelper
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/debhelper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- debhelper 3 Apr 2006 09:01:32 -0000 1.1
+++ debhelper 26 Apr 2006 08:34:31 -0000 1.2
@@ -7,7 +7,7 @@
inst_pkgs
inst_src debhelper
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/debhelper/*; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/debhelper/*; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +7 -7 pbuildd/scripts/cb/debhelper.diff
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/debhelper.diff?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/debhelper.diff?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/debhelper.diff.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: debhelper.diff
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/debhelper.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- debhelper.diff 3 Apr 2006 09:01:32 -0000 1.1
+++ debhelper.diff 26 Apr 2006 08:34:31 -0000 1.2
@@ -1,6 +1,6 @@
-diff -urN debhelper-5.0.22.old/debian/rules debhelper-5.0.22/debian/rules
---- debhelper-5.0.22.old/debian/rules 2006-01-18 22:12:08.000000000 +0100
-+++ debhelper-5.0.22/debian/rules 2006-02-13 11:03:37.000000000 +0100
+diff -urN debhelper-5.0.32.old/debian/rules debhelper-5.0.32/debian/rules
+--- debhelper-5.0.32.old/debian/rules 2006-04-17 22:02:47.000000000 +0200
++++ debhelper-5.0.32/debian/rules 2006-04-21 20:50:49.000000000 +0200
@@ -46,18 +46,6 @@
cat debhelper.pod | \
$(MAKEMANLIST) `find . -maxdepth 1 -type f -perm +100 -name "dh_*" | sort` | \
@@ -24,7 +24,7 @@
./run dh_testdir
./run dh_testroot
./run dh_clean *.1 *.7 *-stamp Debian/Debhelper/Dh_Version.pm
-- po4a --rm-translations man/po4a/po4a.cfg
-
- test: version test-stamp
- test-stamp:
+- po4a --rm-translations --rm-backups man/po4a/po4a.cfg
+ for lang in $(LANGS); do \
+ if [ -e man/$$lang ]; then rmdir man/$$lang; fi; \
+ done;
1.2 +4 -3 pbuildd/scripts/cb/file
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/file?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/file?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/file.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: file
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/file,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file 3 Apr 2006 09:01:32 -0000 1.1
+++ file 26 Apr 2006 08:34:31 -0000 1.2
@@ -7,7 +7,7 @@
. /var/cache/pbuildd/scripts/cb-functions
-inst_pkgs autotools-dev
+inst_pkgs
if test -d /var/cache/pbuildd/partial/d/debhelper; then
$CHROOTEXEC dpkg -i --force-depends /var/cache/pbuildd/partial/d/debhelper/debhelper_*.deb
else
@@ -18,15 +18,16 @@
if ! $CHROOTEXEC /bin/bash -e <<EOF
cd /tmp/file/*/
- $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS
+ $SUTOUSER "dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"
dpkg -i ../file_*.deb ../libmagic1_*.deb
# Build again to get correct binary dependencies
- $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS
+ $SUTOUSER "dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"
EOF
then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
+rm -f "$BUILDPLACE"/tmp/file/python*.deb
pkgs_done file
1.2 +21 -7917 pbuildd/scripts/cb/file.diff
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/file.diff?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/file.diff?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/file.diff.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: file.diff
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/file.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file.diff 3 Apr 2006 09:01:32 -0000 1.1
+++ file.diff 26 Apr 2006 08:34:31 -0000 1.2
@@ -1,6 +1,6 @@
-diff -urN file-4.15.old/debian/rules file-4.15/debian/rules
---- file-4.15.old/debian/rules 2005-12-16 22:44:04.000000000 +0100
-+++ file-4.15/debian/rules 2005-12-16 22:47:29.000000000 +0100
+diff -urN file-4.17.old/debian/rules file-4.17/debian/rules
+--- file-4.17.old/debian/rules 2006-04-21 22:37:19.000000000 +0000
++++ file-4.17/debian/rules 2006-04-21 22:39:34.000000000 +0000
@@ -9,8 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -10,25 +10,34 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
-@@ -46,7 +44,7 @@
+@@ -39,16 +37,10 @@
+ build-stamp:
+ dh_testdir
+
+- mv config.sub config.sub.upstream && ln -s /usr/share/misc/config.sub
+- mv config.guess config.guess.upstream && ln -s /usr/share/misc/config.guess
+ ./configure $(CONFFLAGS) --prefix=/usr \
+ '--datadir=$${prefix}/share' '--mandir=$${prefix}/share/man' \
--enable-fsect-man5
- rm config.sub && mv config.sub.upstream config.sub
- rm config.guess && mv config.guess.upstream config.guess
+- rm config.sub && mv config.sub.upstream config.sub
+- rm config.guess && mv config.guess.upstream config.guess
- mv libtool libtool.upstream && cp /usr/bin/libtool libtool
-+ mv libtool libtool.upstream && cp libtool.copy libtool && chmod a+x libtool
make
- rm libtool && mv libtool.upstream libtool
+- rm libtool && mv libtool.upstream libtool
touch build-stamp
-@@ -75,7 +73,7 @@
+
+ build-stamp-%:
+@@ -75,9 +67,7 @@
dh_installdirs
# Add here commands to install the package into debian/tmp.
- mv libtool libtool.upstream && cp /usr/bin/libtool libtool
-+ mv libtool libtool.upstream && cp libtool.copy libtool && chmod a+x libtool
$(MAKE) prefix=`pwd`/debian/tmp/usr install
- rm libtool && mv libtool.upstream libtool
+- rm libtool && mv libtool.upstream libtool
install -m644 -p -D magic/magic.local debian/tmp/etc/magic
-@@ -122,7 +120,6 @@
+
+ install -m644 -D debian/bug.presubj debian/file/usr/share/bug/file/presubj
+@@ -122,7 +112,6 @@
dh_compress
dh_fixperms
# dh_perl
@@ -36,7908 +45,3 @@
dh_makeshlibs
dh_installdeb
dh_shlibdeps -Llibmagic1 -ldebian/libmagic1/usr/lib
-diff -urN file-4.15.old/libtool.copy file-4.15/libtool.copy
---- file-4.15.old/libtool.copy 1970-01-01 01:00:00.000000000 +0100
-+++ file-4.15/libtool.copy 2005-12-16 22:44:31.000000000 +0100
-@@ -0,0 +1,7901 @@
-+#! /bin/sh
-+
-+# libtoolT - Provide generalized library-building support services.
-+# Generated automatically by (GNU libtool 1.5.0a (1.1220.2.35 2003/11/12 18:51:58))
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Libtool:
-+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A sed program that does not truncate output.
-+SED="/bin/sed"
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="/bin/sed -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+# The names of the tagged configurations supported by this script.
-+available_tags=" CXX F77 GCJ BINCC BINCXX"
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host frobnitz:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL="/bin/sh"
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=yes
-+
-+# Whether or not to build static libraries.
-+build_old_libs=yes
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=no
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=no
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=yes
-+
-+# The host system.
-+host_alias=
-+host=i386-pc-linux-gnu
-+
-+# An echo program that does not interpret backslashes.
-+echo="echo"
-+
-+# The archiver.
-+AR="ar"
-+AR_FLAGS="cru"
-+
-+# A C compiler.
-+LTCC="gcc"
-+
-+# A language-specific compiler.
-+CC="gcc"
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=yes
-+
-+# An ERE matcher.
-+EGREP="grep -E"
-+
-+# The linker used to build libraries.
-+LD="/usr/bin/ld"
-+
-+# Whether we need hard or soft links.
-+LN_S="ln -s"
-+
-+# A BSD-compatible nm program.
-+NM="/usr/bin/nm -B"
-+
-+# A symbol stripping program
-+STRIP="strip"
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=file
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="dlltool"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="objdump"
-+
-+# Used on cygwin: assembler.
-+AS="as"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=.libs
-+
-+# How to create reloadable object files.
-+reload_flag=" -r"
-+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-+
-+# How to pass a linker flag through the compiler.
-+wl="-Wl,"
-+
-+# Object file suffix (normally "o").
-+objext="o"
-+
-+# Old archive suffix (normally "a").
-+libext="a"
-+
-+# Shared library suffix (normally ".so").
-+shrext='.so'
-+
-+# Executable file suffix (normally "").
-+exeext=""
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=" -fPIC -DPIC"
-+pic_mode=default
-+
-+# What is the maximum length of a command?
-+max_cmd_len=32768
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o="yes"
-+
-+# Must we lock files when doing compilation ?
-+need_locks="no"
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=no
-+
-+# Do we need a version for libraries?
-+need_version=no
-+
-+# Whether dlopen is supported.
-+dlopen_support=yes
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=yes
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=yes
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag="-static"
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=" -fno-builtin"
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec="\${wl}--export-dynamic"
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=""
-+
-+# Library versioning type.
-+version_type=linux
-+
-+# Format of library name prefix.
-+libname_spec="lib\$name"
-+
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec="\${libname}\${release}\${shared_ext}\$major"
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB="ranlib"
-+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-+old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
-+old_postuninstall_cmds=""
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=""
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=""
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-+archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
-+cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
-+\$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
-+ \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
-+postinstall_cmds=""
-+postuninstall_cmds=""
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=""
-+module_expsym_cmds=""
-+
-+# Commands to strip libraries.
-+old_striplib="strip --strip-debug"
-+striplib="strip --strip-unneeded"
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=""
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=""
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=""
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=""
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=""
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method="pass_all"
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd="\$MAGIC_CMD"
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=""
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=""
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=""
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
-+
-+# This is the shared library runtime path variable.
-+runpath_var=LD_RUN_PATH
-+
-+# This is the shared library path variable.
-+shlibpath_var=LD_LIBRARY_PATH
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=no
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=immediate
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=yes
-+
-+# Flag to hardcode $libdir into a binary during linking.
-+# This must work even if $libdir does not exist.
-+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-+
-+# If ld is used when linking, flag to hardcode $libdir into
-+# a binary during linking. This must work even if $libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=""
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=""
-+
-+# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=no
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=no
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=unsupported
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=no
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=unknown
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec="/lib/ /usr/lib/ /usr/X11R6/lib/ /usr/local/lib/"
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib"
-+
-+# Fix the shell variable $srcfile for the compiler.
-+fix_srcfile_path=""
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=no
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=""
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+
-+# Symbols that must always be exported.
-+include_expsyms=""
-+
-+# ### END LIBTOOL CONFIG
-+
-+# ltmain.sh - Provide generalized library-building support services.
-+# NOTE: Changing this file will not affect anything until you rerun configure.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-+# Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Check that we have a working $echo.
-+if test "X$1" = X--no-reexec; then
-+ # Discard the --no-reexec flag, and continue.
-+ shift
-+elif test "X$1" = X--fallback-echo; then
-+ # Avoid inline document here, it may be left over
-+ :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+ # Yippee, $echo works!
-+ :
-+else
-+ # Restart under the correct shell, and then maybe $echo will work.
-+ exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+ # used as fallback echo
-+ shift
-+ cat <<EOF
-+$*
-+EOF
-+ exit 0
-+fi
-+
-+# The name of this program.
-+progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-+modename="$progname"
-+
-+# Constants.
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION=1.5.0a
-+TIMESTAMP=" (1.1220.2.35 2003/11/12 18:51:58) Debian$Rev: 159 $"
-+
-+default_mode=
-+help="Try \`$progname --help' for more information."
-+magic="%%%MAGIC variable%%%"
-+mkdir="mkdir"
-+mv="mv -f"
-+rm="rm -f"
-+
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed="${SED}"' -e 1s/^X//'
-+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-+# test EBCDIC or ASCII
-+case `echo A|tr A '\301'` in
-+ A) # EBCDIC based system
-+ SP2NL="tr '\100' '\n'"
-+ NL2SP="tr '\r\n' '\100\100'"
-+ ;;
-+ *) # Assume ASCII based system
-+ SP2NL="tr '\040' '\012'"
-+ NL2SP="tr '\015\012' '\040\040'"
-+ ;;
-+esac
-+
-+# NLS nuisances.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+# We save the old values to restore during execute mode.
Reached max line limit 500!
1.2 +1 -1 pbuildd/scripts/cb/gettext
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/gettext?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/gettext?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/gettext.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: gettext
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/gettext,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gettext 3 Apr 2006 09:01:32 -0000 1.1
+++ gettext 26 Apr 2006 08:34:31 -0000 1.2
@@ -8,7 +8,7 @@
inst_pkgs
inst_src gettext
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/gettext/*; $SUTOUSER dpkg-buildpackage -d -B -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/gettext/*; $SUTOUSER \"dpkg-buildpackage -d -B -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +1 -1 pbuildd/scripts/cb/html2text
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/html2text?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/html2text?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/html2text.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: html2text
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/html2text,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- html2text 3 Apr 2006 09:01:32 -0000 1.1
+++ html2text 26 Apr 2006 08:34:31 -0000 1.2
@@ -15,7 +15,7 @@
inst_src html2text
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/html2text/*; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/html2text/*; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +1 -1 pbuildd/scripts/cb/intltool-debian
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/intltool-debian?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/intltool-debian?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/intltool-debian.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: intltool-debian
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/intltool-debian,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intltool-debian 3 Apr 2006 09:01:32 -0000 1.1
+++ intltool-debian 26 Apr 2006 08:34:31 -0000 1.2
@@ -16,7 +16,7 @@
inst_src intltool-debian
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/intltool-debian/*; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/intltool-debian/*; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +1 -1 pbuildd/scripts/cb/libextutils-cbuilder-perl
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/libextutils-cbuilder-perl?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/libextutils-cbuilder-perl?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/libextutils-cbuilder-perl.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: libextutils-cbuilder-perl
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/libextutils-cbuilder-perl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libextutils-cbuilder-perl 3 Apr 2006 09:01:32 -0000 1.1
+++ libextutils-cbuilder-perl 26 Apr 2006 08:34:31 -0000 1.2
@@ -14,7 +14,7 @@
inst_src libextutils-cbuilder-perl
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/libextutils-cbuilder-perl/*; $SUTOUSER dpkg-buildpackage -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/libextutils-cbuilder-perl/*; $SUTOUSER \"dpkg-buildpackage -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +1 -1 pbuildd/scripts/cb/libextutils-parsexs-perl
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/libextutils-parsexs-perl?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/libextutils-parsexs-perl?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/libextutils-parsexs-perl.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: libextutils-parsexs-perl
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/libextutils-parsexs-perl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libextutils-parsexs-perl 3 Apr 2006 09:01:32 -0000 1.1
+++ libextutils-parsexs-perl 26 Apr 2006 08:34:31 -0000 1.2
@@ -13,7 +13,7 @@
inst_src libextutils-parsexs-perl
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/libextutils-parsexs-perl/*; $SUTOUSER dpkg-buildpackage -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/libextutils-parsexs-perl/*; $SUTOUSER \"dpkg-buildpackage -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +1 -1 pbuildd/scripts/cb/libtool
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/libtool?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/libtool?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/libtool.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: libtool
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/libtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtool 3 Apr 2006 09:01:32 -0000 1.1
+++ libtool 26 Apr 2006 08:34:31 -0000 1.2
@@ -8,7 +8,7 @@
autotools-dev dpatch
inst_src libtool
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/libtool/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/libtool/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +2 -11 pbuildd/scripts/cb/ncurses
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/ncurses?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/ncurses?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/ncurses.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: ncurses
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/ncurses,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncurses 3 Apr 2006 09:01:32 -0000 1.1
+++ ncurses 26 Apr 2006 08:34:31 -0000 1.2
@@ -1,20 +1,11 @@
#! /bin/sh -e
# For ncurses -> gpm -> texinfo -> ncurses circular dependency.
-# Also handle some involving quilt's binary dependencies, and
-# put off building 64-bit libs until later.
-
-test -d /var/cache/pbuildd/pool/q/quilt || test -d /var/cache/pbuildd/partial/q/quilt
+# Also put off building 64-bit libs until later.
. /var/cache/pbuildd/scripts/cb-functions
-inst_pkgs debhelper patch diffstat gettext
-if test -d /var/cache/pbuildd/partial/q/quilt; then
- $CHROOTEXEC dpkg -i --force-depends /var/cache/pbuildd/partial/q/quilt/quilt_*.deb
-else
- $CHROOTEXEC dpkg -i --force-depends /var/cache/pbuildd/pool/q/quilt/quilt_*.deb
-fi
-$CHROOTEXEC ln -sf mawk /usr/bin/gawk
+inst_pkgs debhelper patch diffstat gettext quilt
inst_src ncurses
if ! $CHROOTEXEC /bin/bash -c "cd /tmp/ncurses/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
1.2 +1 -1 pbuildd/scripts/cb/pkg-config
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/pkg-config?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/pkg-config?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/pkg-config.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: pkg-config
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/pkg-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkg-config 3 Apr 2006 09:01:32 -0000 1.1
+++ pkg-config 26 Apr 2006 08:34:31 -0000 1.2
@@ -7,7 +7,7 @@
inst_pkgs debhelper
inst_src pkg-config
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/pkg-config/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/pkg-config/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +1 -1 pbuildd/scripts/cb/po-debconf
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/po-debconf?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/po-debconf?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/po-debconf.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: po-debconf
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/po-debconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- po-debconf 3 Apr 2006 09:01:32 -0000 1.1
+++ po-debconf 26 Apr 2006 08:34:31 -0000 1.2
@@ -15,7 +15,7 @@
inst_src po-debconf
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/po-debconf/*; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/po-debconf/*; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +2 -2 pbuildd/scripts/cb/quilt
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/quilt?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/quilt?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/quilt.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: quilt
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/quilt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quilt 3 Apr 2006 09:01:32 -0000 1.1
+++ quilt 26 Apr 2006 08:34:31 -0000 1.2
@@ -5,10 +5,10 @@
. /var/cache/pbuildd/scripts/cb-functions
-inst_pkgs cdbs debhelper gettext
+inst_pkgs cdbs debhelper gettext gawk diffstat
inst_src quilt
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/quilt/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/quilt/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.2 +10 -14 pbuildd/scripts/cb/quilt.diff
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/quilt.diff?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/quilt.diff?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/quilt.diff.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: quilt.diff
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/quilt.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quilt.diff 3 Apr 2006 09:01:32 -0000 1.1
+++ quilt.diff 26 Apr 2006 08:34:31 -0000 1.2
@@ -1,17 +1,17 @@
-diff -urN quilt-0.42.old/debian/quilt.install quilt-0.42/debian/quilt.install
---- quilt-0.42.old/debian/quilt.install 2005-08-10 10:35:32.000000000 +0200
-+++ quilt-0.42/debian/quilt.install 2005-09-23 09:43:06.000000000 +0200
-@@ -8,6 +8,3 @@
- ../quilt.debbuild.mk usr/share/quilt
+diff -urN quilt-0.44.old/debian/quilt.install quilt-0.44/debian/quilt.install
+--- quilt-0.44.old/debian/quilt.install 2006-04-14 17:16:53.000000000 +0200
++++ quilt-0.44/debian/quilt.install 2006-04-14 17:17:59.000000000 +0200
+@@ -9,6 +9,4 @@
../quilt.make usr/share/quilt
../patchsys-quilt.mk /usr/share/cdbs/1/rules/
--
+
-../../doc/quilt.html usr/share/doc/quilt
-../../doc/quilt.txt usr/share/doc/quilt
-diff -urN quilt-0.42.old/debian/rules quilt-0.42/debian/rules
---- quilt-0.42.old/debian/rules 2005-08-10 10:36:02.000000000 +0200
-+++ quilt-0.42/debian/rules 2005-09-23 09:40:12.000000000 +0200
-@@ -23,10 +23,10 @@
+ ../../quilt.quiltrc usr/share/doc/quilt
+diff -urN quilt-0.44.old/debian/rules quilt-0.44/debian/rules
+--- quilt-0.44.old/debian/rules 2006-04-14 17:16:53.000000000 +0200
++++ quilt-0.44/debian/rules 2006-04-14 17:20:40.000000000 +0200
+@@ -19,10 +19,6 @@
# distribute a text version of the doc for fool souls
common-build-arch::
mkdir doc/tmp || true
@@ -19,10 +19,6 @@
- cp doc/tmp/main.html doc/quilt.html
- LC_ALL=C perl -e '$$/ = undef; $$f=<>; $$f =~ s|<A[^>]*?HREF="[^"]*#[^"]*">(.*?)</A>|$$1|msg; print $$f;' < doc/tmp/main.html > doc/tmp/tmp.html
- LC_ALL=C lynx doc/tmp/tmp.html -dump > doc/quilt.txt
-+# cd doc/tmp; LC_ALL=C hevea ../main.tex ; LC_ALL=C hevea ../main.tex; LC_ALL=C hevea ../main.tex
-+# cp doc/tmp/main.html doc/quilt.html
-+# LC_ALL=C perl -e '$$/ = undef; $$f=<>; $$f =~ s|<A[^>]*?HREF="[^"]*#[^"]*">(.*?)</A>|$$1|msg; print $$f;' < doc/tmp/main.html > doc/tmp/tmp.html
-+# LC_ALL=C lynx doc/tmp/tmp.html -dump > doc/quilt.txt
clean::
rm -rf doc/quilt.txt doc/quilt.html doc/tmp
1.2 +1 -1 pbuildd/scripts/cb/zlib
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/zlib?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/zlib?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/zlib.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: zlib
===================================================================
RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/zlib,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zlib 3 Apr 2006 09:01:33 -0000 1.1
+++ zlib 26 Apr 2006 08:34:31 -0000 1.2
@@ -7,7 +7,7 @@
inst_pkgs debhelper dbs
inst_src zlib
-if ! $CHROOTEXEC /bin/bash -c "cd /tmp/zlib/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
+if ! $CHROOTEXEC /bin/bash -c "cd /tmp/zlib/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
echo "pbuilder: Failed autobuilding of package" >&2
exit 1
fi
1.1 pbuildd/scripts/cb/po-debconf.diff
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/po-debconf.diff?annotate=1.1&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/po-debconf.diff?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=
-----------------------------------
Index: po-debconf.diff
===================================================================
diff -urN po-debconf-1.0.old/debian/rules po-debconf-1.0/debian/rules
--- po-debconf-1.0.old/debian/rules 2006-02-13 23:14:06.000000000 +0100
+++ po-debconf-1.0/debian/rules 2006-04-14 15:26:05.000000000 +0200
@@ -29,7 +29,6 @@
install -m 0755 debconf-updatepo po2debconf debconf-gettextize $(CURDIR)/debian/po-debconf/usr/bin/
install -m 0755 podebconf-display-po podebconf-report-po $(CURDIR)/debian/po-debconf/usr/bin/
install -m 0644 encodings pot-header $(CURDIR)/debian/po-debconf/usr/share/po-debconf
- dh_installman doc/en/*.[1-7] doc/fr/*.fr.[1-7] doc/ru/*.ru.[1-7]
dh_installchangelogs
dh_compress
dh_link
diff -urN po-debconf-1.0.old/doc/Makefile po-debconf-1.0/doc/Makefile
--- po-debconf-1.0.old/doc/Makefile 2006-03-11 16:07:55.000000000 +0100
+++ po-debconf-1.0/doc/Makefile 2006-04-14 15:26:54.000000000 +0200
@@ -5,6 +5,9 @@
po2debconf.1 podebconf-display-po.1 podebconf-report-po.1 \
po-debconf.7
+do-nothing:
+ @echo Skipping po4a runs
+
default:
po4a -v --rm-backups po4a/po-debconf.cfg
for l in en fr ru; do \
@@ -20,6 +23,5 @@
done
clean:
- po4a --rm-translations --rm-backups po4a/po-debconf.cfg
-rm -f en/*.? fr/*.? ru/*.?
More information about the Pbuilder-maint
mailing list