[Pkg-samba-maint] r1871 - trunk/talloc/debian

[ctrlsoft-guest at alioth.debian.org]

Author: ctrlsoft-guest
Date: 2008-05-19 23:47:42 +0000 (Mon, 19 May 2008)
New Revision: 1871

Modified:
   trunk/talloc/debian/build-orig.sh
   trunk/talloc/debian/changelog
   trunk/talloc/debian/rules
Log:
Update for building snapshots from git and build new snapshot.

Modified: trunk/talloc/debian/build-orig.sh
===================================================================
--- trunk/talloc/debian/build-orig.sh	2008-05-19 23:35:57 UTC (rev 1870)
+++ trunk/talloc/debian/build-orig.sh	2008-05-19 23:47:42 UTC (rev 1871)
@@ -1,18 +1,24 @@
-#!/bin/sh
-# Build a source tarball for talloc
+#!/bin/bash
+REFSPEC=$1
+GIT_URL=$2
+shift 2
 
-samba_repos=svn://svn.samba.org/samba
+if [ -z "$GIT_URL" ]; then
+	GIT_URL=git://git.samba.org/samba.git
+fi
+
+TALLOCTMP=$TMPDIR/$RANDOM.talloc.git
 version=$( dpkg-parsechangelog -l`dirname $0`/changelog | sed -n 's/^Version: \(.*:\|\)//p' | sed 's/-[0-9.]\+$//' )
-
-if echo $version | grep svn > /dev/null; then
-	# SVN Snapshot
-	revno=`echo $version | sed 's/^[0-9.]\+~svn//'`
-	svn export -r$revno $samba_repos/branches/SAMBA_4_0/source/lib/talloc talloc-$version
-	svn export -r$revno $samba_repos/branches/SAMBA_4_0/source/lib/replace talloc-$version/libreplace
-else
-	# Release
-	svn export $samba_repos/tags/TALLOC_`echo $version | sed 's/\./_/g'` talloc-$version
+git clone --depth 1 -l $GIT_URL $TALLOCTMP
+if [ ! -z "$REFSPEC" ]; then
+	pushd $TALLOCTMP
+	git checkout $REFSPEC
+	popd
 fi
 
-cd talloc-$version && ./autogen.sh && cd ..
-tar cvz talloc-$version > talloc_$version.orig.tar.gz
+mv $TALLOCTMP/source/lib/talloc "talloc-$version"
+mv $TALLOCTMP/source/lib/replace "talloc-$version/libreplace"
+rm -rf $TALLOCTMP
+pushd "talloc-$version" && ./autogen.sh && popd
+tar cvz "talloc-$version" > "talloc_$version.orig.tar.gz"
+rm -rf "talloc-$version"

Modified: trunk/talloc/debian/changelog
===================================================================
--- trunk/talloc/debian/changelog	2008-05-19 23:35:57 UTC (rev 1870)
+++ trunk/talloc/debian/changelog	2008-05-19 23:47:42 UTC (rev 1871)
@@ -1,3 +1,9 @@
+talloc (1.2.0~git20080520-1) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Tue, 20 May 2008 01:40:13 +0200
+
 talloc (1.1.0~svn26291-1) unstable; urgency=low
 
   * Support building twice in a row. (Closes: #442741)

Modified: trunk/talloc/debian/rules
===================================================================
--- trunk/talloc/debian/rules	2008-05-19 23:35:57 UTC (rev 1870)
+++ trunk/talloc/debian/rules	2008-05-19 23:47:42 UTC (rev 1871)
@@ -35,6 +35,9 @@
 endif
 	touch build-stamp
 
+get-orig-source:
+	./debian/build-orig.sh
+
 clean:	clean-patched unpatch
 
 clean-patched: