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

[jelmer at alioth.debian.org]

tags 547280 pending
thanks

Author: jelmer
Date: 2010-01-01 17:17:14 +0000 (Fri, 01 Jan 2010)
New Revision: 3199

Added:
   trunk/samba4/debian/dfsg-clean.sh
Modified:
   trunk/samba4/debian/build-orig.sh
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4.install
Log:
Build against system Heimdal and remove the copy of Heimdal from the 
Samba 4 source tree, since it contains non-free IETF RFC/I-D. Closes: #547280

Modified: trunk/samba4/debian/build-orig.sh
===================================================================
--- trunk/samba4/debian/build-orig.sh	2010-01-01 17:17:13 UTC (rev 3198)
+++ trunk/samba4/debian/build-orig.sh	2010-01-01 17:17:14 UTC (rev 3199)
@@ -11,10 +11,9 @@
 git clone --depth 1 -l $GIT_URL samba4-$version
 
 rm -rf "samba4-$version/source3"
+`dirname $0`/dfsg-clean.sh "samba4-$version"
 
 rm -rf "samba4-$version/.git"
-rm -f samba4-$version/source4/ldap_server/devdocs/rfc????.txt \
-      samba4-$version/source4/heimdal/lib/wind/rfc????.txt
 rm -rf samba4-$version/README \
        samba4-$version/Manifest \
        samba4-$version/Read-Manifest-Now \

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2010-01-01 17:17:13 UTC (rev 3198)
+++ trunk/samba4/debian/changelog	2010-01-01 17:17:14 UTC (rev 3199)
@@ -1,15 +1,15 @@
-samba4 (4.0.0~alpha8+git20090912-2) UNRELEASED; urgency=low
+samba4 (4.0.0~alpha8+git20100101.dfsg1-1) UNRELEASED; urgency=low
 
   [ Christian Perrier ]
   * Change "Provides:" in init script to avoid conflicting Provides
     with samba. Closes: #547209
 
   [ Jelmer Vernooij ]
-  * Clean up non-free IETF RFC/I-D when building snapshots as is done for
-    releases. Closes: #547280
   * Depend on specific version of libldb. Closes: #562389
+  * Build against system Heimdal and remove the copy of Heimdal from the 
+    Samba 4 source tree, since it contains non-free IETF RFC/I-D. Closes: #547280
 
- -- Jelmer Vernooij <jelmer at debian.org>  Thu, 31 Dec 2009 19:58:32 +0100
+ -- Jelmer Vernooij <jelmer at debian.org>  Fri, 01 Jan 2010 15:17:07 +0100
 
 samba4 (4.0.0~alpha8+git20090912-1) unstable; urgency=low
 

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2010-01-01 17:17:13 UTC (rev 3198)
+++ trunk/samba4/debian/control	2010-01-01 17:17:14 UTC (rev 3199)
@@ -5,7 +5,7 @@
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Steinar H. Gunderson <sesse at debian.org>, Jelmer Vernooij <jelmer at debian.org>
 Homepage: http://www.samba.org/
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.5~), libtalloc-dev (>= 1.4.0~), libtevent-dev (>= 0.9.6~), perl-modules, python-dev, python-central (>= 0.5.6), libpopt-dev, pkg-config, samba-common (>= 2:3.4.0~pre2), libldb-dev (>= 1:0.9.6~git20090912), python-ldb, python-tdb, zlib1g-dev (>= 1:1.2.3)
+Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.5~), libtalloc-dev (>= 1.4.0~), libtevent-dev (>= 0.9.6~), perl-modules, python-dev, python-central (>= 0.5.6), libpopt-dev, pkg-config, samba-common (>= 2:3.4.0~pre2), libldb-dev (>= 1:0.9.6~git20090912), python-ldb, python-tdb, zlib1g-dev (>= 1:1.2.3), heimdal-multidev (>= 1.3), lib
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/branches/samba4
 XS-Python-Version: current
 DM-Upload-Allowed: yes

Added: trunk/samba4/debian/dfsg-clean.sh
===================================================================
--- trunk/samba4/debian/dfsg-clean.sh	                        (rev 0)
+++ trunk/samba4/debian/dfsg-clean.sh	2010-01-01 17:17:14 UTC (rev 3199)
@@ -0,0 +1,18 @@
+#!/bin/sh
+# DFSG-Clean a Samba 4 source tarball
+
+srcdir="$1"
+
+if [ -z "$srcdir" ]; then
+	srcdir="."
+fi
+
+if [ ! -d "$srcdir/source4" ]; then
+	echo "Usage: $0 SRCDIR"
+	exit 1
+fi
+
+rm -rf "$srcdir/source4/heimdal"
+rm -f "$srcdir/source4/ldap_server/devdocs/rfc????.txt"
+
+exit 0


Property changes on: trunk/samba4/debian/dfsg-clean.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2010-01-01 17:17:13 UTC (rev 3198)
+++ trunk/samba4/debian/rules	2010-01-01 17:17:14 UTC (rev 3199)
@@ -4,8 +4,8 @@
 SOURCEPATH=./source4
 DESTDIR = $(CURDIR)/debian/tmp
 
-CFLAGS = -Wall -O0
-LDFLAGS = -Wl,--as-needed
+CFLAGS = -Wall -O0 -I/usr/include/heimdal
+LDFLAGS = -Wl,--as-needed -L/usr/lib/heimdal
 
 PYVERS=$(shell pyversions -vr)
 
@@ -30,6 +30,7 @@
 		--enable-external-libtalloc=yes \
 		--enable-external-libtevent=yes \
 		--enable-external-libldb=yes \
+		--enable-external-heimdal=yes \
 		#--enable-dso
 	touch $@
 

Modified: trunk/samba4/debian/samba4.install
===================================================================
--- trunk/samba4/debian/samba4.install	2010-01-01 17:17:13 UTC (rev 3198)
+++ trunk/samba4/debian/samba4.install	2010-01-01 17:17:14 UTC (rev 3199)
@@ -1,4 +1,6 @@
 usr/sbin/samba
+usr/sbin/provision
+usr/sbin/upgradeprovision
 usr/bin/smbstatus.samba4
 usr/bin/nsstest
 usr/lib/samba