[Pkg-samba-maint] r1876 - trunk/samba4/debian

[ctrlsoft-guest at alioth.debian.org]

Author: ctrlsoft-guest
Date: 2008-05-20 01:04:12 +0000 (Tue, 20 May 2008)
New Revision: 1876

Modified:
   trunk/samba4/debian/build-orig.sh
   trunk/samba4/debian/changelog
   trunk/samba4/debian/rules
Log:
Add build orig script from git, new snapshot.

Modified: trunk/samba4/debian/build-orig.sh
===================================================================
--- trunk/samba4/debian/build-orig.sh	2008-05-20 01:00:30 UTC (rev 1875)
+++ trunk/samba4/debian/build-orig.sh	2008-05-20 01:04:12 UTC (rev 1876)
@@ -1,17 +1,25 @@
-#!/bin/sh
-# Build a source tarball for Samba 4
+#!/bin/bash
+REFSPEC=$1
+GIT_URL=$2
+shift 2
 
-samba_repos=svn://svn.samba.org/samba/
-version=$( dpkg-parsechangelog -l`dirname $0`/changelog | sed -n 's/^Version: \(.*:\|\)//p' | sed 's/-[0-9.]\+$//' )
+if [ -z "$GIT_URL" ]; then
+	GIT_URL=git://git.samba.org/samba.git
+fi
 
-if echo $version | grep svn > /dev/null; then
-	# SVN Snapshot
-	revno=`echo $version | sed 's/^.\+~svn//'`
-	svn export -r$revno $samba_repos/branches/SAMBA_4_0 samba-$version
-else
-	# Release
-	svn export $samba_repos/tags/release-`echo $version | sed 's/\./-/g'` samba-$version
+if [ -z "$REFSPEC" ]; then
+	REFSPEC=origin/v4-0-test
 fi
 
-cd samba-$version/source && ./autogen.sh && cd ../..
-tar cvz samba-$version > samba_$version.orig.tar.gz
+version=$( dpkg-parsechangelog -l`dirname $0`/changelog | sed -n 's/^Version: \(.*:\|\)//p' | sed 's/-[0-9.]\+$//' )
+git clone --depth 1 -l $GIT_URL samba4-$version
+if [ ! -z "$REFSPEC" ]; then
+	pushd $SAMBATMP
+	git checkout $REFSPEC
+	popd
+fi
+
+pushd "samba4-$version/source" && ./autogen.sh && popd
+rm -rf "samba4-$version/.git"
+tar cvz "samba4-$version" > "samba4_$version.orig.tar.gz"
+rm -rf "samba4-$version"

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2008-05-20 01:00:30 UTC (rev 1875)
+++ trunk/samba4/debian/changelog	2008-05-20 01:04:12 UTC (rev 1876)
@@ -1,3 +1,9 @@
+samba4 (4.0.0~alpha4~20080520-1) experimental; urgency=low
+
+  * New upstream snapshot. 
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Tue, 20 May 2008 02:44:57 +0200
+
 samba4 (4.0.0~alpha4~20080510-1) experimental; urgency=low
 
   * New upstream snapshot. (Closes: #478328)
@@ -2,3 +8,3 @@
 
- -- Jelmer Vernooij <jelmer at samba.org>  Thu, 08 May 2008 14:27:09 +0200
+ -- Jelmer Vernooij <jelmer at samba.org>  Tue, 20 May 2008 02:44:55 +0200
 

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2008-05-20 01:00:30 UTC (rev 1875)
+++ trunk/samba4/debian/rules	2008-05-20 01:04:12 UTC (rev 1876)
@@ -74,6 +74,9 @@
 	rmdir $(CURDIR)/debian/tmp/usr/lib/torture
 	dh_install --sourcedir=debian/tmp --list-missing --fail-missing
 
+get-orig-source:
+	./debian/build-orig.sh
+
 binary-arch: build install
 	dh_installdocs -a debian/README.building NEWS
 	dh_installchangelogs -a