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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-05-30 23:55:17 +0000 (Sun, 30 May 2010)
New Revision: 3505

Modified:
   trunk/samba4/debian/build-orig.sh
   trunk/samba4/debian/changelog
   trunk/samba4/debian/rules
Log:
More work on the waf build.

Modified: trunk/samba4/debian/build-orig.sh
===================================================================
--- trunk/samba4/debian/build-orig.sh	2010-05-30 17:05:57 UTC (rev 3504)
+++ trunk/samba4/debian/build-orig.sh	2010-05-30 23:55:17 UTC (rev 3505)
@@ -21,6 +21,6 @@
 rm samba-4*.tar.gz
 mv samba-4* "samba4-$version"
 ../../`dirname $0`/dfsg-clean.sh "samba4-$version"
-tar cj "samba4-$version" > ../../samba4_$version.orig.tar.bz2
+tar cz "samba4-$version" > ../../samba4_$version.orig.tar.gz
 popd
 rm -rf "samba4-upstream-$version"

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2010-05-30 17:05:57 UTC (rev 3504)
+++ trunk/samba4/debian/changelog	2010-05-30 23:55:17 UTC (rev 3505)
@@ -1,4 +1,4 @@
-samba4 (4.0.0~alpha12+git20100228.dfsg1-1) UNRELEASED; urgency=low
+samba4 (4.0.0~alpha13+git20100531.dfsg1-1) experimental; urgency=low
 
   [ Jelmer Vernooij ]
   * New upstream snapshot.

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2010-05-30 17:05:57 UTC (rev 3504)
+++ trunk/samba4/debian/rules	2010-05-30 23:55:17 UTC (rev 3505)
@@ -4,11 +4,13 @@
 SOURCEPATH=./source4
 DESTDIR = $(CURDIR)/debian/tmp
 
-CFLAGS = -Wall -O0 -I/usr/include/heimdal
-LDFLAGS = -Wl,--as-needed -L/usr/lib/heimdal
+CFLAGS = -Wall -O0 
+LDFLAGS = -Wl,--as-needed 
 
 PYVERS=$(shell pyversions -vr)
 
+WAF = ../buildtools/bin/waf
+
 # turn DEB_BUILD_OPTIONS='foo,bar' into DEB_BUILD_OPT_FOO and DEB_BUILD_OPT_BAR
 d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS"|sed 's/[^-[:alnum:]]/ /g'|tr a-z A-Z)
 $(foreach o, $(d_b_o), $(eval DEB_BUILD_OPT_$o := 1))
@@ -16,7 +18,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	cd $(SOURCEPATH) && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ../buildtools/bin/waf configure --enable-fhs \
+	cd $(SOURCEPATH) && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(WAF) configure --enable-fhs \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
@@ -24,14 +26,14 @@
 		--with-piddir=/var/run \
 		--disable-rpath \
 		--disable-rpath-install \
-		--bundled-libraries="!talloc,!tdb,!tevent,!heimdal" \
-		#--enable-dso
+		--bundled-libraries=NONE \
+		#--enable-dso 
 	touch $@
 
 build: build-stamp
 build-stamp: configure
 	dh_testdir
-	cd $(SOURCEPATH) && ../buildtools/waf
+	cd $(SOURCEPATH) && $(WAF)
 	touch $@
 
 clean:
@@ -39,7 +41,7 @@
 	dh_testroot
 	dh_clean
 	$(RM) $(DESTDIR)
-	-cd $(SOURCEPATH) && ../buildtools/bin/waf clean
+	-cd $(SOURCEPATH) && $(WAF) clean
 	find . -name "*.pyc" | xargs rm -f
 	rm -rf buildtools/bin/.waf-*
 	$(RM) build-stamp configure-stamp
@@ -59,7 +61,7 @@
 	dh_installdirs
 	mkdir -p $(DESTDIR)/usr/share/man/man1
 	mkdir -p $(DESTDIR)/etc/samba
-	cd $(SOURCEPATH) && DESTDIR="$(DESTDIR) ../buildtools/waf install
+	cd $(SOURCEPATH) && DESTDIR="$(DESTDIR)" $(WAF) install
 	#$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(DESTDIR)
 	dh_testdir
 	dh_testroot