Hello,

Patrick is gone since some hours and Steve asked for adding the patch to
the BTS. Here it is.

-- 
Noèl Köthe <noel debian.org>
Debian GNU/Linux, www.debian.org
diff -Nru /tmp/2405iKuctO/samba-3.0.23c/debian/control /tmp/huC4iZhrtK/samba-3.0.23c/debian/control
--- /tmp/2405iKuctO/samba-3.0.23c/debian/control	2006-09-16 11:56:59.000000000 +0000
+++ /tmp/huC4iZhrtK/samba-3.0.23c/debian/control	2006-09-16 11:57:01.000000000 +0000
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Eloy A. Paris <[EMAIL PROTECTED]>
 Uploaders: Steve Langasek <[EMAIL PROTECTED]>, Christian Perrier <[EMAIL PROTECTED]>, Noèl Köthe <[EMAIL PROTECTED]>, Adam Conrad <[EMAIL PROTECTED]>, Peter Eisentraut <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, python-all-dev (>= 2.3.5-11), binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
+Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, python-all-dev (>= 2.3.5-11), binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), python-central ( >= 0.5 )
 Standards-Version: 3.7.2
+XS-Python-Version: current
 
 Package: samba
 Architecture: any
diff -Nru /tmp/2405iKuctO/samba-3.0.23c/debian/control.in /tmp/huC4iZhrtK/samba-3.0.23c/debian/control.in
--- /tmp/2405iKuctO/samba-3.0.23c/debian/control.in	2006-09-16 11:56:59.000000000 +0000
+++ /tmp/huC4iZhrtK/samba-3.0.23c/debian/control.in	2006-09-16 11:57:01.000000000 +0000
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Eloy A. Paris <[EMAIL PROTECTED]>
 Uploaders: Steve Langasek <[EMAIL PROTECTED]>, Christian Perrier <[EMAIL PROTECTED]>, Noèl Köthe <[EMAIL PROTECTED]>, Adam Conrad <[EMAIL PROTECTED]>, Peter Eisentraut <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [EMAIL PROTECTED]@], libkrb5-dev, libldap2-dev, po-debconf, python-all-dev (>= 2.3.5-11), binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
+Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [EMAIL PROTECTED]@], libkrb5-dev, libldap2-dev, po-debconf, python-all-dev (>= 2.3.5-11), binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), python-central ( >= 0.5 )
 Standards-Version: 3.7.2
+XS-Python-Version: current
 
 Package: samba
 Architecture: any
diff -Nru /tmp/2405iKuctO/samba-3.0.23c/debian/python-samba.files /tmp/huC4iZhrtK/samba-3.0.23c/debian/python-samba.files
--- /tmp/2405iKuctO/samba-3.0.23c/debian/python-samba.files	2006-09-16 11:56:59.000000000 +0000
+++ /tmp/huC4iZhrtK/samba-3.0.23c/debian/python-samba.files	2006-09-16 11:57:01.000000000 +0000
@@ -1 +1,2 @@
-usr/lib/python*/site-packages/
+usr/share/pycentral/python-samba/site-packages/samba
+usr/lib/python*/site-packages/samba
diff -Nru /tmp/2405iKuctO/samba-3.0.23c/debian/rules /tmp/huC4iZhrtK/samba-3.0.23c/debian/rules
--- /tmp/2405iKuctO/samba-3.0.23c/debian/rules	2006-09-16 11:56:59.000000000 +0000
+++ /tmp/huC4iZhrtK/samba-3.0.23c/debian/rules	2006-09-16 11:57:01.000000000 +0000
@@ -2,6 +2,7 @@
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
+export DH_PYCENTRAL=nomove
 
 # Set the host and build architectures for use with config.cache loading,
 # cross-building, etc.
@@ -123,8 +124,9 @@
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \
-	         $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d \
-	         $(DESTDIR)/usr/lib/python$(pyversion)/site-packages/samba
+		 $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d \
+		 $(DESTDIR)/usr/lib/python$(pyversion)/site-packages/samba \
+		 $(DESTDIR)/usr/share/pycentral/python-samba/site-packages/samba
 
 	$(MAKE) -C source install DESTDIR=$(DESTDIR)
 
@@ -170,7 +172,7 @@
 
 	# Install the Python modules
 	cp source/build/lib.*-*-$(pyversion)/samba/*.so $(DESTDIR)/usr/lib/python$(pyversion)/site-packages/samba/
-	cp source/python/samba/* $(DESTDIR)/usr/lib/python$(pyversion)/site-packages/samba/
+	cp source/python/samba/* $(DESTDIR)/usr/share/pycentral/python-samba/site-packages/samba/
 
 	dh_movefiles
 
@@ -219,6 +221,7 @@
 	DH_OPTIONS= dh_strip -psamba -psmbclient --dbg-package=samba-dbg
 	DH_OPTIONS= dh_strip -Nsamba -Nsmbclient
 	dh_link
+	dh_pycentral
 	dh_python
 	dh_compress
 	dh_fixperms

Attachment: signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil

Reply via email to