[Pkg-samba-maint] r3129 - trunk/ctdb/debian

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2009-12-01 22:11:20 +0000 (Tue, 01 Dec 2009)
New Revision: 3129

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/uupdate-wrapper
Log:
debian/uupdate-wrapper can now pull master branch with:
    ./debian/uupdate-wrapper --version master

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-11-30 08:07:08 UTC (rev 3128)
+++ trunk/ctdb/debian/changelog	2009-12-01 22:11:20 UTC (rev 3129)
@@ -4,6 +4,8 @@
     - removed 50-fix-bashism.diff: patch integrated 
     - Updated ctdb.init (Commit 058e21d96c3c02759833fd5ddfe7b43e6a5f5740
       "From Rusty")
+  * debian/uupdate-wrapper can now pull master branch with:
+    ./debian/uupdate-wrapper --version master
 
  -- Mathieu Parent <sathieu at debian.org>  Wed, 11 Nov 2009 22:41:43 +0100
 

Modified: trunk/ctdb/debian/uupdate-wrapper
===================================================================
--- trunk/ctdb/debian/uupdate-wrapper	2009-11-30 08:07:08 UTC (rev 3128)
+++ trunk/ctdb/debian/uupdate-wrapper	2009-12-01 22:11:20 UTC (rev 3129)
@@ -1,12 +1,18 @@
 #!/bin/sh
 
-version=$2
 file=$3
+if [ $2 = 'master' ]; then
+	version=1+git`date +'%Y%m%d'`
+	git_version=$2
+else
+	version=$2
+	git_version=ctdb-$version
+	#remove git log (only used by uscan)
+	rm -f $file
+fi
 
-#remove git log (only used by uscan)
-rm $file
 #pull source from git
-git clone git://git.samba.org/sahlberg/ctdb.git;h=ctdb-$version
+git clone git://git.samba.org/sahlberg/ctdb.git;h=$git_version
 mv ctdb ctdb-$version.orig
 #clean source
 rm -rf ctdb-$version.orig/.git