[Pbuilder-maint] pbuilder CVS update: pbuildd/scripts cb-functions

[pbuilder CVS Commit]

  User: schepler
  Date: 06/04/26 08:34:28

  Modified:    scripts  cb-functions
  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       +7 -4      pbuildd/scripts/cb-functions
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb-functions?annotate=1.2&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuildd/scripts/cb-functions?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-functions.diff?r1=1.2&r2=1.1&cvsroot=
  
  -----------------------------------
  
  Index: cb-functions
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuildd/scripts/cb-functions,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cb-functions	3 Apr 2006 09:01:31 -0000	1.1
  +++ cb-functions	26 Apr 2006 08:34:27 -0000	1.2
  @@ -13,14 +13,14 @@
       trap umountproc_cleanbuildplace exit
   
       if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then
  -	SUTOUSER="su $BUILDUSERNAME -- "
  +	SUTOUSER="su $BUILDUSERNAME -c "
   	DEBBUILDOPTS="$DEBBUILDOPTS -rfakeroot"
   	EXTRAPACKAGES="${EXTRAPACKAGES} fakeroot"
   	FAKEROOT="fakeroot"
   	echo "I: using fakeroot in build."
       else
   	# run the build in root
  -	SUTOUSER=""
  +	SUTOUSER="sh -c "
   	BUILDUSERID=0
   	BUILDUSERNAME=root
   	FAKEROOT=""
  @@ -58,10 +58,13 @@
   	    sect=build
   	fi
   	copydsc $sect/$dir/$p/*.dsc "$BUILDPLACE/tmp/$p"
  -	$CHROOTEXEC /bin/bash -c "cd /tmp/$p; chown $BUILDUSERNAME:$BUILDUSERNAME * .; $SUTOUSER dpkg-source -x *.dsc"
  +	$CHROOTEXEC /bin/bash -c "cd /tmp/$p; chown $BUILDUSERNAME:$BUILDUSERNAME * .; $SUTOUSER \"dpkg-source -x *.dsc\""
   	if [ -f scripts/cb/$p.diff ]; then
   	    cp scripts/cb/$p.diff "$BUILDPLACE/tmp"
  -	    $CHROOTEXEC /bin/bash -c "cd /tmp/$p/*/; chown $BUILDUSERNAME:$BUILDUSERNAME /tmp/$p.diff; $SUTOUSER patch -p1 </tmp/$p.diff"
  +	    $CHROOTEXEC /bin/bash -c "cd /tmp/$p/*/; chown $BUILDUSERNAME:$BUILDUSERNAME /tmp/$p.diff; $SUTOUSER \"patch -p1 </tmp/$p.diff\""
  +	fi
  +	if [ -x hooks/A50pb_ver ]; then
  +	    $CHROOTEXEC /bin/bash -c "cd /tmp/$p/; /var/cache/pbuildd/hooks/A50pb_ver --use-curdir"
   	fi
       done
   }