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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-06-18 21:06:13 +0000 (Fri, 18 Jun 2010)
New Revision: 3523

Modified:
   trunk/samba4/debian/control
   trunk/samba4/debian/libgensec0.install
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4-dev.install
Log:
Fix header locations, gensec, build replace library statically.

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2010-06-18 21:06:12 UTC (rev 3522)
+++ trunk/samba4/debian/control	2010-06-18 21:06:13 UTC (rev 3523)
@@ -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.4
-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, libtdb-dev (>= 1.2.1~), libtalloc-dev (>= 2.0.0~), libtevent-dev (>= 0.9.8~), 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.4~)
+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, libtdb-dev (>= 1.2.1~), libtalloc-dev (>= 2.0.0~), libtevent-dev (>= 0.9.8~), 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.10~git20090912), python-ldb, python-tdb, zlib1g-dev (>= 1:1.2.3), heimdal-multidev (>= 1.4~), python-dnspython
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba4/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/samba4
 XS-Python-Version: current
@@ -16,7 +16,7 @@
 Recommends: samba-ldb-tools
 Suggests: bind9 (>= 1:9.5.1), phpldapadmin
 Conflicts: samba-tools, samba (<< 2:3.3.0~rc2-5)
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common-bin (=${binary:Version}), python, python-samba, ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common-bin (=${binary:Version}), python, python-samba, ${python:Depends}, python-dnspython
 XB-Python-Version: ${python:Versions}
 Description: SMB/CIFS file, print and logon server (version 4)
  The Samba software suite is a collection of programs that

Modified: trunk/samba4/debian/libgensec0.install
===================================================================
--- trunk/samba4/debian/libgensec0.install	2010-06-18 21:06:12 UTC (rev 3522)
+++ trunk/samba4/debian/libgensec0.install	2010-06-18 21:06:13 UTC (rev 3523)
@@ -1,2 +1 @@
-usr/lib/libgensec.so.0.*
-#usr/lib/samba/gensec/*.so
+usr/lib/libgensec.so.0*

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2010-06-18 21:06:12 UTC (rev 3522)
+++ trunk/samba4/debian/rules	2010-06-18 21:06:13 UTC (rev 3523)
@@ -26,7 +26,8 @@
 		--with-piddir=/var/run \
 		--disable-rpath \
 		--disable-rpath-install \
-		--bundled-libraries=NONE
+		--bundled-libraries=NONE \
+		--builtin-libraries=replace
 	touch $@
 
 build: build-stamp

Modified: trunk/samba4/debian/samba4-dev.install
===================================================================
--- trunk/samba4/debian/samba4-dev.install	2010-06-18 21:06:12 UTC (rev 3522)
+++ trunk/samba4/debian/samba4-dev.install	2010-06-18 21:06:13 UTC (rev 3523)
@@ -39,4 +39,4 @@
 usr/include/samba-4.0/core/error.h
 usr/include/samba-4.0/gen_ndr/server_id.h
 usr/include/samba-4.0/util/tevent_unix.h
-usr/include/samba-4.0/tevent_ntstatus.h
+usr/include/samba-4.0/util/tevent_ntstatus.h