[Pkg-samba-maint] r1165 - trunk
Peter Eisentraut
petere at costa.debian.org
Mon Oct 2 22:19:47 UTC 2006
Author: petere
Date: 2006-10-02 22:19:46 +0000 (Mon, 02 Oct 2006)
New Revision: 1165
Modified:
trunk/changelog
trunk/control
trunk/control.in
trunk/python-samba.lintian
trunk/rules
Log:
* Use python-central to manage installation of python-samba.
Closes: #386499. (patch by Patrick Winnertz)
* Use upstream makefile to install Python module.
* Build-Depend on python-dev instead of python-all-dev.
Modified: trunk/changelog
===================================================================
--- trunk/changelog 2006-10-01 08:26:43 UTC (rev 1164)
+++ trunk/changelog 2006-10-02 22:19:46 UTC (rev 1165)
@@ -23,6 +23,10 @@
* Make samba-common owner of /var/{cache,log,run}/samba, let samba and
winbind only delete files they know they're exclusive owners of.
Closes: #370718.
+ * Use python-central to manage installation of python-samba.
+ Closes: #386499. (patch by Patrick Winnertz)
+ * Use upstream makefile to install Python module.
+ * Build-Depend on python-dev instead of python-all-dev.
[ Christian Perrier ]
* Add LSB info to the init script
Modified: trunk/control
===================================================================
--- trunk/control 2006-10-01 08:26:43 UTC (rev 1164)
+++ trunk/control 2006-10-02 22:19:46 UTC (rev 1165)
@@ -3,8 +3,9 @@
Priority: optional
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Eisentraut <petere at debian.org>
-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-dev, 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
Modified: trunk/control.in
===================================================================
--- trunk/control.in 2006-10-01 08:26:43 UTC (rev 1164)
+++ trunk/control.in 2006-10-02 22:19:46 UTC (rev 1165)
@@ -3,8 +3,9 @@
Priority: optional
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [@libacl@], 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) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, python-dev, 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
Modified: trunk/python-samba.lintian
===================================================================
--- trunk/python-samba.lintian 2006-10-01 08:26:43 UTC (rev 1164)
+++ trunk/python-samba.lintian 2006-10-02 22:19:46 UTC (rev 1165)
@@ -2,5 +2,4 @@
# files that begin with #! should be executable scripts; this is a file that
# should not be executable, and there's nothing wrong with having the
# !/usr/bin/python line in it, so the warning should just be ignored.
-python-samba: script-not-executable ./usr/lib/python2.3/site-packages/samba/printerdata.py
-python-samba: script-not-executable ./usr/lib/python2.4/site-packages/samba/printerdata.py
+python-samba: script-not-executable ./usr/share/pycentral/python-samba/site-packages/samba/printerdata.py
Modified: trunk/rules
===================================================================
--- trunk/rules 2006-10-01 08:26:43 UTC (rev 1164)
+++ trunk/rules 2006-10-02 22:19:46 UTC (rev 1165)
@@ -123,10 +123,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
- $(MAKE) -C source install DESTDIR=$(DESTDIR)
+ $(MAKE) -C source install python_install DESTDIR=$(DESTDIR)
mv $(DESTDIR)/usr/lib/samba/libsmbclient.so $(DESTDIR)/usr/lib/samba/libsmbclient.so.0.1
ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/samba/libsmbclient.so.0
@@ -168,10 +167,6 @@
cp debian/samba.pamd $(DESTDIR)/etc/pam.d/samba
install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
- # 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/
-
dh_movefiles
# Build architecture-independent files here.
@@ -219,6 +214,7 @@
DH_OPTIONS= dh_strip -psamba -psmbclient --dbg-package=samba-dbg
DH_OPTIONS= dh_strip -Nsamba -Nsmbclient
dh_link
+ DH_OPTIONS= dh_pycentral -ppython-samba
dh_python
dh_compress
dh_fixperms
More information about the Pkg-samba-maint
mailing list