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

[ctrlsoft-guest at alioth.debian.org]

Author: ctrlsoft-guest
Date: 2008-09-30 20:53:28 +0000 (Tue, 30 Sep 2008)
New Revision: 2166

Modified:
   trunk/samba4/debian/build-orig.sh
   trunk/samba4/debian/changelog
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4-common.install
   trunk/samba4/debian/samba4.install
Log:
Package new upstream snapshot.


Modified: trunk/samba4/debian/build-orig.sh
===================================================================
--- trunk/samba4/debian/build-orig.sh	2008-09-29 14:03:58 UTC (rev 2165)
+++ trunk/samba4/debian/build-orig.sh	2008-09-30 20:53:28 UTC (rev 2166)
@@ -7,19 +7,12 @@
 	GIT_URL=git://git.samba.org/samba.git
 fi
 
-if [ -z "$REFSPEC" ]; then
-	REFSPEC=origin/v4-0-test
-fi
-
 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 samba4-$version
-	git checkout $REFSPEC || exit 1
-	popd
-fi
 
-pushd "samba4-$version/source" && ./autogen.sh && popd
+rm -rf "samba4-$version/source3"
+
+pushd "samba4-$version/source4" && ./autogen.sh && popd
 rm -rf "samba4-$version/.git"
-tar cvz "samba4-$version" > "samba4_$version.orig.tar.gz"
+tar cz "samba4-$version" > "samba4_$version.orig.tar.gz"
 rm -rf "samba4-$version"

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2008-09-29 14:03:58 UTC (rev 2165)
+++ trunk/samba4/debian/changelog	2008-09-30 20:53:28 UTC (rev 2166)
@@ -1,3 +1,9 @@
+samba4 (4.0.0~alpha5+20080930-1) experimental; urgency=low
+
+  * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Tue, 30 Sep 2008 16:19:22 +0200
+
 samba4 (4.0.0~alpha5+20080825-1) experimental; urgency=low
 
   * Add watch file.

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2008-09-29 14:03:58 UTC (rev 2165)
+++ trunk/samba4/debian/rules	2008-09-30 20:53:28 UTC (rev 2166)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # By Jelmer Vernooij <jelmer at samba.org>
 
-SOURCEPATH=./source
+SOURCEPATH=./source4
 
 PYVERS=$(shell pyversions -vr)
 
@@ -14,7 +14,7 @@
 configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
-	cd $(SOURCEPATH) && ./configure --with-fhs \
+	cd $(SOURCEPATH) && ./configure --enable-fhs \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
@@ -23,7 +23,6 @@
 		--with-syslog \
 		--with-readline \
 		--with-ldap \
-		--with-fhs \
 		#--enable-dso
 	touch $@
 
@@ -39,7 +38,7 @@
 	dh_testroot
 	dh_clean
 	$(RM) debian/tmp
-	[ ! -f source/mkconfig.mk ] || $(MAKE) -C $(SOURCEPATH) clean
+	[ ! -f $(SOURCEPATH)/mkconfig.mk ] || $(MAKE) -C $(SOURCEPATH) clean
 	$(RM) build-stamp configure-stamp
 
 binary-indep: build install
@@ -71,9 +70,9 @@
 	rm -f $(CURDIR)/debian/tmp/usr/bin/subunitrun
 	rm -f $(CURDIR)/debian/tmp/usr/bin/winreg
 	rm -f $(CURDIR)/debian/tmp/usr/bin/samba3dump
-	rm -f $(CURDIR)/debian/tmp/usr/bin/epdump.py
+	rm -f $(CURDIR)/debian/tmp/usr/bin/epdump
 	rm -f $(CURDIR)/debian/tmp/usr/bin/winreg.py
-	rm -f $(CURDIR)/debian/tmp/usr/bin/minschema.py
+	rm -f $(CURDIR)/debian/tmp/usr/bin/minschema
 	rm -f $(CURDIR)/debian/tmp/usr/bin/rpcclient
 	# No need to do development using nss_winbind
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libnss_winbind.so
@@ -85,7 +84,7 @@
 	rm -f $(CURDIR)/debian/tmp/usr/lib/python*/site-packages/uuid.so
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/python*/site-packages/subunit
 	rm -f $(CURDIR)/debian/tmp/usr/bin/tdb*
-	rm -f $(CURDIR)/debian/tmp/usr/bin/autoidl.py
+	rm -f $(CURDIR)/debian/tmp/usr/bin/autoidl
 	rm -f $(CURDIR)/debian/tmp/usr/lib/pkgconfig/events.pc
 	rm -f $(CURDIR)/debian/tmp/usr/bin/mymachinepw
 	dh_install --sourcedir=debian/tmp --list-missing --fail-missing
@@ -94,7 +93,7 @@
 	./debian/build-orig.sh
 
 binary-arch: build install
-	dh_installdocs -a debian/README.building NEWS
+	dh_installdocs -a debian/README.building $(SOURCEPATH)/NEWS
 	dh_installchangelogs -a
 	dh_strip -a
 	dh_perl -a

Modified: trunk/samba4/debian/samba4-common.install
===================================================================
--- trunk/samba4/debian/samba4-common.install	2008-09-29 14:03:58 UTC (rev 2165)
+++ trunk/samba4/debian/samba4-common.install	2008-09-30 20:53:28 UTC (rev 2166)
@@ -1,5 +1,4 @@
 etc/samba/gdbcommands
 usr/bin/testparm
 usr/share/samba/*.dat
-usr/share/samba/js
 usr/share/samba/panic-action

Modified: trunk/samba4/debian/samba4.install
===================================================================
--- trunk/samba4/debian/samba4.install	2008-09-29 14:03:58 UTC (rev 2165)
+++ trunk/samba4/debian/samba4.install	2008-09-30 20:53:28 UTC (rev 2166)
@@ -1,6 +1,6 @@
-usr/sbin/smbd
+usr/sbin/samba
 usr/bin/smbstatus
 usr/bin/nsstest
 usr/lib/samba
 usr/share/samba/setup
-usr/share/man/man8/smbd.8
+usr/share/man/man8/samba.8