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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-03-05 19:47:58 +0000 (Thu, 05 Mar 2009)
New Revision: 2635

Modified:
   trunk/samba4/debian/control
   trunk/samba4/debian/python-ldb-samba4.install
   trunk/samba4/debian/python-samba.install
   trunk/samba4/debian/rules
Log:
Prepare for python2.6.

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2009-03-04 21:57:38 UTC (rev 2634)
+++ trunk/samba4/debian/control	2009-03-05 19:47:58 UTC (rev 2635)
@@ -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.0
-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.0), libtalloc-dev, libtevent-dev (>> 0.9.3~), perl-modules, python2.5-dev, python-central (>= 0.5.6), quilt, libpopt-dev, pkg-config
+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.0), libtalloc-dev, libtevent-dev (>> 0.9.3~), perl-modules, python-dev, python-central (>= 0.5.6), quilt, libpopt-dev, pkg-config
 Build-Conflicts: libldb-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/branches/samba4
 XS-Python-Version: current

Modified: trunk/samba4/debian/python-ldb-samba4.install
===================================================================
--- trunk/samba4/debian/python-ldb-samba4.install	2009-03-04 21:57:38 UTC (rev 2634)
+++ trunk/samba4/debian/python-ldb-samba4.install	2009-03-05 19:47:58 UTC (rev 2635)
@@ -1 +1 @@
-usr/lib/python*/site-packages/ldb.so
+usr/lib/python*/*-packages/ldb.so

Modified: trunk/samba4/debian/python-samba.install
===================================================================
--- trunk/samba4/debian/python-samba.install	2009-03-04 21:57:38 UTC (rev 2634)
+++ trunk/samba4/debian/python-samba.install	2009-03-05 19:47:58 UTC (rev 2635)
@@ -1,2 +1,2 @@
-usr/lib/python*/site-packages/samba
-usr/lib/python*/site-packages/tevent.so
+usr/lib/python*/*-packages/samba
+usr/lib/python*/*-packages/tevent.so

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2009-03-04 21:57:38 UTC (rev 2634)
+++ trunk/samba4/debian/rules	2009-03-05 19:47:58 UTC (rev 2635)
@@ -94,9 +94,9 @@
 	rm -f $(DESTDIR)/usr/lib/libnss_winbind.so
 	rm -f $(DESTDIR)/usr/lib/pkgconfig/nss_winbind.pc
 	rm -f $(DESTDIR)/usr/share/man/man3/talloc.3
-	rm -f $(DESTDIR)/usr/lib/python*/site-packages/tdb.so
-	rm -f $(DESTDIR)/usr/lib/python*/site-packages/uuid.so
-	rm -rf $(DESTDIR)/usr/lib/python*/site-packages/subunit*
+	rm -f $(DESTDIR)/usr/lib/python*/*-packages/tdb.so
+	rm -f $(DESTDIR)/usr/lib/python*/*-packages/uuid.so
+	rm -rf $(DESTDIR)/usr/lib/python*/*-packages/subunit*
 	rm -rf $(DESTDIR)/usr/lib/python*/lib/subunit
 	rm -f $(DESTDIR)/usr/bin/tdb*
 	rm -f $(DESTDIR)/usr/bin/autoidl