[Pkg-samba-maint] r3368 - in trunk: ctdb/debian ctdb-upstream

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2010-03-04 12:44:14 +0000 (Thu, 04 Mar 2010)
New Revision: 3368

Added:
   trunk/ctdb-upstream/ctdb_1.0.112-11.orig.tar.gz
Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/uupdate-wrapper
Log:
- New upstream release. 1.0.112 branch was recommended by Ronnie Sahlberg on IRC
- debian/uupdate-wrapper: allow commithashes and branches as versions?\197?\147




Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2010-03-03 21:40:52 UTC (rev 3367)
+++ trunk/ctdb/debian/changelog	2010-03-04 12:44:14 UTC (rev 3368)
@@ -1,3 +1,11 @@
+ctdb (1.0.112-11-1) UNRELEASED; urgency=low
+
+  * New upstream release. 1.0.112 branch was recommended by Ronnie Sahlberg on
+    IRC. 
+  * debian/uupdate-wrapper: allow commithashes and branches as versions 
+
+ -- Mathieu Parent <sathieu at debian.org>  Wed, 03 Mar 2010 12:32:39 +0100
+
 ctdb (1.0.111-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/ctdb/debian/uupdate-wrapper
===================================================================
--- trunk/ctdb/debian/uupdate-wrapper	2010-03-03 21:40:52 UTC (rev 3367)
+++ trunk/ctdb/debian/uupdate-wrapper	2010-03-04 12:44:14 UTC (rev 3368)
@@ -1,33 +1,43 @@
 #!/bin/sh
 
-file=$3
-if [ $2 = 'master' ]; then
-	version=0.0.0+git0
-	git_version=$2
-else
-	version=$2
-	git_version=ctdb-$version
+#$1 is --version
+version="$2"
+file="$3"
+
+if [ -f "$file" ]; then
 	#remove git log (only used by uscan)
-	rm -f $file
+	rm -fv "$file"
 fi
 
+if echo "$2" | grep -q '\.'; then
+	#version
+	git_version=ctdb-$version
+else
+	#commithash or branch
+	git_version="$version"
+	version=0.0.0+git0
+fi
+
 #pull source from git
-git clone git://git.samba.org/sahlberg/ctdb.git;h=$git_version
-if [ $2 = 'master' ]; then
+git clone git://git.samba.org/sahlberg/ctdb.git ctdb-tmp
+cd ctdb-tmp
+git checkout "$git_version"
+cd ..
+if echo "$2" |  grep -qv '\.'; then
 	#construct version with latest release+git0
-	version=`grep -A 1 '%changelog' ctdb/packaging/RPM/ctdb.spec.in | tail -n1 | sed 's/.* \([0-9\.]\+\)$/\1/'`+git0
+	version=`grep -A 1 '%changelog' ctdb-tmp/packaging/RPM/ctdb.spec.in | tail -n1 | sed 's/.* \([0-9\.-]\+\)$/\1/'`+git0
 fi
-mv ctdb ctdb-$version.orig
+mv ctdb-tmp "ctdb-$version.orig"
 #clean source
-rm -rf ctdb-$version.orig/.git
+rm -rf "ctdb-$version.orig/.git"
 #autogen
-cd ctdb-$version.orig
+cd "ctdb-$version.orig"
 ./autogen.sh
 cd ..
 #remove included popt
-rm -rf ctdb-$version.orig/lib/popt
+rm -rf "ctdb-$version.orig/lib/popt"
 #tar.gz
-tar cfz ctdb_$version.orig.tar.gz ctdb-$version.orig
+tar cfz "ctdb_$version.orig.tar.gz" "ctdb-$version.orig"
 #remove orig directory
-rm -rf ctdb-$version.orig
+rm -rf "ctdb-$version.orig"
 

Added: trunk/ctdb-upstream/ctdb_1.0.112-11.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/ctdb-upstream/ctdb_1.0.112-11.orig.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream