[Pbuilder-maint] pbuilder CVS update: pbuildd/scripts/cb db4.3 db4.4 noweb noweb.diff python-defaults tetex-bin tetex-bin.diff

pbuilder CVS Commit pbuilder-maint at lists.alioth.debian.org
Fri Apr 28 08:13:32 UTC 2006


  User: schepler
  Date: 06/04/28 08:13:32

  Modified:    scripts/cb db4.3 db4.4 python-defaults tetex-bin
                        tetex-bin.diff
  Added:       scripts/cb noweb noweb.diff
  Log:
  * More syntax fixes.
  * New cb script for noweb.
  * Update the "reason needed" header for db4.3.
  
  Revision  Changes    Path
  1.2       +3 -2      pbuildd/scripts/cb/db4.3
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/db4.3?annotate=1.2&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/db4.3?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/db4.3.diff?r1=1.2&r2=1.1&cvsroot=
  
  -----------------------------------
  
  Index: db4.3
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/db4.3,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- db4.3	3 Apr 2006 09:01:32 -0000	1.1
  +++ db4.3	28 Apr 2006 08:13:32 -0000	1.2
  @@ -1,13 +1,14 @@
   #! /bin/sh -e
   
  -# For db4.3 -> fastjar -> ... -> perl-doc -> db4.3 circular dependency
  +# For db4.3 -> java-gcj-compat -> gcj-4.0 -> autogen -> libxml2 ->
  +#  python2.3 -> db4.3.
   
   . /var/cache/pbuildd/scripts/cb-functions
   
   inst_pkgs tcl8.4-dev procps
   inst_src db4.3
   
  -if ! $CHROOTEXEC /bin/bash -c "cd /tmp/db4.3/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
  +if ! $CHROOTEXEC /bin/bash -c "cd /tmp/db4.3/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
       echo "pbuilder: Failed autobuilding of package" >&2
       exit 1
   fi
  
  
  
  1.2       +4 -2      pbuildd/scripts/cb/db4.4
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/db4.4?annotate=1.2&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/db4.4?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/db4.4.diff?r1=1.2&r2=1.1&cvsroot=
  
  -----------------------------------
  
  Index: db4.4
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/db4.4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- db4.4	3 Apr 2006 09:01:32 -0000	1.1
  +++ db4.4	28 Apr 2006 08:13:32 -0000	1.2
  @@ -1,13 +1,15 @@
   #! /bin/sh -e
   
  -# For db4.4 -> fastjar -> ... -> perl-doc -> db4.4 circular dependency
  +# For db4.4 -> java-gcj-compat-dev -> gcj-4.0 -> autogen -> libxml2 ->
  +#  python-defaults -> libhtml-tree-perl -> libhtml-parser-perl ->
  +#  libtest-pod-perl -> libpod-simple-perl -> perl-doc -> db4.4.
   
   . /var/cache/pbuildd/scripts/cb-functions
   
   inst_pkgs tcl8.4-dev procps
   inst_src db4.4
   
  -if ! $CHROOTEXEC /bin/bash -c "cd /tmp/db4.4/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
  +if ! $CHROOTEXEC /bin/bash -c "cd /tmp/db4.4/*/; $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/python-defaults
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/python-defaults?annotate=1.2&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/python-defaults?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/python-defaults.diff?r1=1.2&r2=1.1&cvsroot=
  
  -----------------------------------
  
  Index: python-defaults
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/python-defaults,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- python-defaults	3 Apr 2006 09:01:32 -0000	1.1
  +++ python-defaults	28 Apr 2006 08:13:32 -0000	1.2
  @@ -7,7 +7,7 @@
   inst_pkgs debhelper libhtml-tree-perl debiandoc-sgml
   inst_src python-defaults
   
  -if ! $CHROOTEXEC /bin/bash -c "cd /tmp/python-defaults/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
  +if ! $CHROOTEXEC /bin/bash -c "cd /tmp/python-defaults/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
       echo "pbuilder: Failed autobuilding of package" >&2
       exit 1
   fi
  
  
  
  1.2       +4 -4      pbuildd/scripts/cb/tetex-bin
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/tetex-bin?annotate=1.2&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/tetex-bin?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/tetex-bin.diff?r1=1.2&r2=1.1&cvsroot=
  
  -----------------------------------
  
  Index: tetex-bin
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/tetex-bin,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tetex-bin	3 Apr 2006 09:01:32 -0000	1.1
  +++ tetex-bin	28 Apr 2006 08:13:32 -0000	1.2
  @@ -1,16 +1,16 @@
   #! /bin/sh -e
   
  -# For tetex-bin -> poppler -> gtk+2.0 -> libxrandr -> tetex-bin
  -# circular dependency
  +# For tetex-bin -> poppler -> gnome-pkg-tools -> xmlto -> libxslt ->
  +#  libgcrypt11 -> tetex-bin.
   
   . /var/cache/pbuildd/scripts/cb-functions
   
  -inst_pkgs debhelper ed libpng12-dev zlib1g-dev libxaw8-dev flex bison \
  +inst_pkgs debhelper ed libpng12-dev zlib1g-dev libxaw7-dev flex bison \
       tetex-base libt1-dev po-debconf autotools-dev libpaper-dev texinfo \
       eperl debiandoc-sgml quilt libjpeg62-dev
   inst_src tetex-bin
   
  -if ! $CHROOTEXEC /bin/bash -c "cd /tmp/tetex-bin/*/; $SUTOUSER dpkg-buildpackage -d -uc -us $DEBBUILDOPTS"; then
  +if ! $CHROOTEXEC /bin/bash -c "cd /tmp/tetex-bin/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
       echo "pbuilder: Failed autobuilding of package" >&2
       exit 1
   fi
  
  
  
  1.2       +7 -6      pbuildd/scripts/cb/tetex-bin.diff
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/tetex-bin.diff?annotate=1.2&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/tetex-bin.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/tetex-bin.diff.diff?r1=1.2&r2=1.1&cvsroot=
  
  -----------------------------------
  
  Index: tetex-bin.diff
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb/tetex-bin.diff,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tetex-bin.diff	3 Apr 2006 09:01:32 -0000	1.1
  +++ tetex-bin.diff	28 Apr 2006 08:13:32 -0000	1.2
  @@ -1,15 +1,16 @@
   diff -urN tetex-bin-3.0.old/debian/patches/series tetex-bin-3.0/debian/patches/series
  ---- tetex-bin-3.0.old/debian/patches/series	2006-01-04 10:50:46.000000000 +0100
  -+++ tetex-bin-3.0/debian/patches/series	2006-01-04 10:51:40.000000000 +0100
  -@@ -8,4 +8,3 @@
  +--- tetex-bin-3.0.old/debian/patches/series	2006-04-15 10:04:19.000000000 +0200
  ++++ tetex-bin-3.0/debian/patches/series	2006-04-15 10:04:48.000000000 +0200
  +@@ -7,5 +7,4 @@
    patch-libtool 
    patch-deb 
    patch-lintian
   -patch-poppler
  + patch-tmp
   diff -urN tetex-bin-3.0.old/debian/rules.in tetex-bin-3.0/debian/rules.in
  ---- tetex-bin-3.0.old/debian/rules.in	2006-01-04 10:50:47.000000000 +0100
  -+++ tetex-bin-3.0/debian/rules.in	2006-01-04 10:52:40.000000000 +0100
  -@@ -219,9 +219,6 @@
  +--- tetex-bin-3.0.old/debian/rules.in	2006-04-15 10:04:19.000000000 +0200
  ++++ tetex-bin-3.0/debian/rules.in	2006-04-15 10:05:05.000000000 +0200
  +@@ -223,9 +223,6 @@
    	$(check-svn)
    	dh_testdir
    
  
  
  
  1.1                  pbuildd/scripts/cb/noweb
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/noweb?annotate=1.1&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/noweb?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=
  
  -----------------------------------
  
  Index: noweb
  ===================================================================
  #! /bin/sh -e
  
  # For noweb -> tetex-base -> eperl -> libperl-dev -> netbase ->b ifupdown
  #   -> noweb circular dependency
  
  . /var/cache/pbuildd/scripts/cb-functions
  
  test -d /var/cache/pbuildd/pool/i/icon
  
  inst_pkgs debhelper libx11-dev dbs icont iconx
  inst_src noweb
  
  if ! $CHROOTEXEC /bin/bash -c "cd /tmp/noweb/*/; $SUTOUSER \"dpkg-buildpackage -d -uc -us $DEBBUILDOPTS\""; then
      echo "pbuilder: Failed autobuilding of package" >&2
      exit 1
  fi
  
  pkgs_done noweb
  
  
  
  1.1                  pbuildd/scripts/cb/noweb.diff
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/noweb.diff?annotate=1.1&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb/noweb.diff?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=
  
  -----------------------------------
  
  Index: noweb.diff
  ===================================================================
  diff -urN noweb-2.10c.old/debian/rules noweb-2.10c/debian/rules
  --- noweb-2.10c.old/debian/rules	2005-12-17 16:35:12.000000000 +0100
  +++ noweb-2.10c/debian/rules	2005-12-17 16:36:23.000000000 +0100
  @@ -91,7 +91,7 @@
   	  ../icon/htmltoc >guide.html
   	touch $(STAMP_DIR)/build-indep-stamp
   
  -build: build-arch build-indep
  +build: build-arch
   
   clean:
   	dh_testdir
  @@ -126,10 +126,7 @@
   binary-arch: build install
   	dh_testdir -a
   	dh_testroot -a
  -	dh_installdocs -a $(BUILD_TREE)/src/README $(BUILD_TREE)/src/FAQ \
  -	  $(BUILD_TREE)/src/xdoc/guide.html $(BUILD_TREE)/src/xdoc/guide.ps \
  -	  $(BUILD_TREE)/src/xdoc/guide.dvi \
  -	  $(BUILD_TREE)/src/xdoc/onepage.ps $(BUILD_TREE)/src/xdoc/onepage.dvi
  +	dh_installdocs -a $(BUILD_TREE)/src/README $(BUILD_TREE)/src/FAQ
   	dh_installexamples -a $(BUILD_TREE)/examples/*
   	dh_installemacsen -a
   	dh_installman -a
  
  
  



More information about the Pbuilder-maint mailing list