[Pkg-doc-linux-devel] r245 - trunk/doc-linux/debian

[djpig at alioth.debian.org]

Author: djpig
Date: 2007-08-15 20:56:27 +0000 (Wed, 15 Aug 2007)
New Revision: 245

Modified:
   trunk/doc-linux/debian/prepare-builddir
Log:
Teach prepare-builddir how to prepare a build dir in case the
newest version is no new upstream version (i.e. Debian revision != 1)


Modified: trunk/doc-linux/debian/prepare-builddir
===================================================================
--- trunk/doc-linux/debian/prepare-builddir	2007-08-15 20:14:12 UTC (rev 244)
+++ trunk/doc-linux/debian/prepare-builddir	2007-08-15 20:56:27 UTC (rev 245)
@@ -11,7 +11,7 @@
 
 set -e
 
-echo -n check if we\'re in the right directory...
+echo -n "check if we're in the right directory..."
 if [ -f debian/rules ]; then
     echo done
 else
@@ -42,11 +42,19 @@
 debian/make-links doc-linux
 echo done
 
-echo -n reading upstream versions...
-upstreamversion=`dpkg-parsechangelog | grep ^Version: | perl -pe "s/^Version: //; s/-[^-]+$//;"`
+echo -n reading versions...
+upstreamversion=`dpkg-parsechangelog | grep ^Version: | perl -pe 's/^Version: //; s/-[^-]+$//;'`
+debianversion=`dpkg-parsechangelog | grep ^Version: | perl -pe 's/^Version: //; s/^.*-([^-]+)$/$1/;'`
 tarballversion=`ls -1 --color=never HOWTO/Linux-HOWTOs-*.tar.bz2 | tail -n 1 | perl -pe "s/HOWTO\/Linux-HOWTOs-(\d{8})\.tar\.bz2$/\1/;" `
-echo $upstreamversion $tarballversion
+echo Upstream: $upstreamversion $tarballversion
+echo Debian: $debianversion
 
+isnewupstream=yes
+if test "$debianversion" != 1; then
+    echo assuming this is no new upstream version
+    isnewupstream=no
+fi  
+
 for pkg in $packages; do
 
     echo -n check for existing build directory for $pkg...
@@ -61,12 +69,16 @@
 
 done
 
-echo -n split tarballs...[text]...
-debian/split-package HOWTO/Linux-HOWTOs-$tarballversion.tar.bz2
-echo -n [html]...
-debian/split-package HOWTO/Linux-html-HOWTOs-$tarballversion.tar.bz2
-echo done
+if test "$isnewupstream" = yes; then
 
+    echo -n split tarballs...[text]...
+    debian/split-package HOWTO/Linux-HOWTOs-$tarballversion.tar.bz2
+    echo -n [html]...
+    debian/split-package HOWTO/Linux-html-HOWTOs-$tarballversion.tar.bz2
+    echo done
+
+fi
+
 for pkg in $packages; do
 
     echo    \*\*\*
@@ -79,39 +91,70 @@
 	free=free
     fi
 
-    echo -n create build directory...
-    mkdir ../$pkg-$upstreamversion
-    echo done
+    if test "$isnewupstream" = no; then
 
+	echo retrieve orig.tar
+	(cd .. && apt-get source $pkg)
+
+	echo -n check for existing build directory for $pkg...
+	if test -e ../$pkg-$upstreamversion; then
+	    echo "exists, good"
+	else
+	    echo apt-get source did not retrieve the right source
+	    echo please fix your setup or prepare the directory manually
+	    exit 1
+	fi
+
+	echo -n delete old debian/ directory...
+	rm -fr ../$pkg-$upstreamversion/debian
+	echo done
+
+    else
+
+	echo -n create build directory...
+	mkdir ../$pkg-$upstreamversion
+	echo done
+
+    fi
+
     echo -n export debian/ directory...
     svn export debian/ ../$pkg-$upstreamversion/debian
     echo done
 
-    echo -n copy FAQ and HOWTOs...
     cd ../$pkg-$upstreamversion
-    mkdir HOWTO
-    if test "$free" = "free"; then
-	echo -n "FAQ "
-	cp -a ../doc-linux/FAQ .
-	cp -a ../doc-linux/HOWTO/extra HOWTO/
-    fi
+
+    if test "$isnewupstream" = yes; then
+
+	echo -n copy FAQ and HOWTOs...
+	mkdir HOWTO
+	if test "$free" = "free"; then
+	    echo -n "FAQ "
+	    cp -a ../doc-linux/FAQ .
+	    cp -a ../doc-linux/HOWTO/extra HOWTO/
+	fi
 # the following two should be just symlinks
-    echo -n "HOWTOs "
-    cp -a ../doc-linux/HOWTO/Linux-HOWTOs.tar.bz2 HOWTO/
-    cp -a ../doc-linux/HOWTO/Linux-html-HOWTOs.tar.bz2 HOWTO/
-    cp -a ../doc-linux/HOWTO/$free-Linux-HOWTOs-$tarballversion.tar.bz2 HOWTO/Linux-HOWTOs-$tarballversion.tar.bz2
-    cp -a ../doc-linux/HOWTO/$free-Linux-html-HOWTOs-$tarballversion.tar.bz2 HOWTO/Linux-html-HOWTOs-$tarballversion.tar.bz2
-    echo done
+	echo -n "HOWTOs "
+	cp -a ../doc-linux/HOWTO/Linux-HOWTOs.tar.bz2 HOWTO/
+	cp -a ../doc-linux/HOWTO/Linux-html-HOWTOs.tar.bz2 HOWTO/
+	cp -a ../doc-linux/HOWTO/$free-Linux-HOWTOs-$tarballversion.tar.bz2 HOWTO/Linux-HOWTOs-$tarballversion.tar.bz2
+	cp -a ../doc-linux/HOWTO/$free-Linux-html-HOWTOs-$tarballversion.tar.bz2 HOWTO/Linux-html-HOWTOs-$tarballversion.tar.bz2
+	echo done
 
+    fi
+
     echo -n "copy control files (2nd time)..."
     debian/make-links $pkg
     debian/make-copyright $free debian/$pkg.copyright.head > debian/copyright
     echo done
 
-    echo make orig.tar.gz...
-    fakeroot debian/rules -s orig
-    echo make orig.tar.gz...done
+    if test "$isnewupstream" = yes; then
 
+	echo make orig.tar.gz...
+	fakeroot debian/rules -s orig
+	echo make orig.tar.gz...done
+
+    fi
+
     cd ../doc-linux
     echo    \*\*\* 
     echo directory ../$pkg-$upstreamversion is now ready for building