[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: cvs



Joerg Friedrich schrieb am Samstag, 13. April 2002 um 11:22:33 +0200:
> Chris Halls schrieb am Freitag, 12. April 2002 um 23:15:48 +0200:
> > 1. Download the debian directory.  I think you did that already.
> > 
> > 4. Tar this up (sorry, it's annoying and needs looking at, I know)
> > 
> >     TARDIR=oo_stable1_cvs`date +%Y%m%d`_src
> >     ln -s oo_cvs $TARDIR
> >     tar -hzcf $TARDIR.tar.gz $TARDIR
> > 
> > 5. move/copy the tarfile so that you have this directory structure:
> > 
> >     $BUILDROOT/debian (contains files from nidd's CVS)
> >     $BUILDROOT/upstream/archives/$(YOUR_TARFILE)
> > 
> > 6. edit debian/scripts/vars and change TAR_DIR and SOURCE_TREE dates.
> > 
> > 7. build the package (debuild or whatever)
> > 
> > 
> > Sorry that this is so awkward - up until we had anoncvs no-one except Jan &
> > I really cared, so it didn't get looked at.  We'll have to work out
> > something better soon.  One suggestion was to use cp -al like this:
> > 
> > < Jeff_> take a look at kernel-sources. Herbert Xu uses hard-links. 
> > < Jeff_> maybe just have the sources unpacked in upstream/archives and
> > 	 instead of extracting the tarball do a 
> > 	 cp -al upstream/archives/oo_stable1_cvs20020408_src build-tree/
> 
> Hi!
> Just explaining:
> 
> My approach is this:
> 
> First my filesystem-layout:
> cvs/oo_src
> cvs/oo-deb
> openoffice/
> openoffice/upstream/archive
> 	  
> Procedure:
> 1. cvs-checkout
> 2. # cp -la cvs/oo_src \

          ^^^ typo! this should be 'cp -a' otherwise the cvs-dir gets
	  modified while applying debian-patches


>      openoffice/upstream/archive/oo_stable1_cvs`date +%Y%m%d`_src
>    # cp -al cvs/oo-deb/debian openoffice/debian
> 3. edit openoffice/debian/scripts/vars and change TAR_DIR and SOURCE_TREE dates.
> 4. change openoffice/debian/scripts/source.unpack (quick'n'dirty-hack,
>    but works. diff below)
> 5. # script -f build.log
>    # dpkg-buildpackage -b
> 
> 
> Annotations: 
> 
> 1. everything must be on the same partition, cp -al (hard links)
> 2. my patch is just a 'how it might work'
> 
> --- cvs/oo-deb/debian/scripts/source.unpack	Wed Mar 20 16:21:51 2002
> +++ openoffice.org-0.641d.cvs20020408/debian/scripts/source.unpack	Fri Apr 12 22:51:56 2002
> @@ -5,7 +5,7 @@
>  
>  mkdir -p $STAMP_DIR/$SRC_TAR_DIR $SOURCE_DIR
>  if [ ! -z "$SRC_TAR_DIR" -a -d "$SRC_TAR_DIR" ];then
> -	files=$(find $SRC_TAR_DIR -type f|sort)
> +	files=$(find $SRC_TAR_DIR -type d -maxdepth 1 -mindepth 1|sort)
>  else
>  	VER=$(dpkg-parsechangelog 2>&1|egrep ^Version|cut -d " " -f 2|cut -d "-" -f 1)
>  	SRC=$(dpkg-parsechangelog 2>&1|egrep ^Source|cut -d " " -f 2-)
> @@ -15,7 +15,8 @@
>  	stampfile=$STAMP_DIR/$SRC_TAR_DIR/`basename $f`
>  	if [ ! -e $stampfile ];then
>  		START $f
> -		if extract_tar ${SOURCE_DIR:-.} $f > $stampfile.log;then
> +#		if extract_tar ${SOURCE_DIR:-.} $f > $stampfile.log;then
> +		if cp -al $f ${SOURCE_DIR:-.} > $stampfile.log;then
>  			if [ x$SOURCE_DIR = x ];then
>  				mkdir -p $STAMP_DIR/upstream/files/tarballs
>  				cp $stampfile.log $STAMP_DIR/upstream/files/tarballs/`basename $f`.list
> 
> -- 
> Heute ist nicht alle Tage, ich komm' wieder, keine Frage!!!
> 
>    Joerg
> 
> As long as the answer is right, who cares if the question is wrong?
> 
> 
> -- 
> To UNSUBSCRIBE, email to debian-openoffice-request@lists.debian.org
> with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

-- 
Heute ist nicht alle Tage, ich komm' wieder, keine Frage!!!

   Joerg

I can give you my word, but I know what it's worth and you don't.
		-- Nero Wolfe, "Over My Dead Body"


-- 
To UNSUBSCRIBE, email to debian-openoffice-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org



Reply to: