Here's a patch which, if it were tested, could help the
python(2.3)-samba package across the transition. I renamed the package
and put in the substitution variables as suggested by the wiki page,
and I removed all references to "2.3" from the rules file.
I did not bother with setting things up for supporting multiple python
versions or byte compilation, but we did not have that before either.
Please comment and test.
diff -uNr ../../pkg-samba/trunk/control debian/control
--- ../../pkg-samba/trunk/control 2006-08-01 13:37:44.000000000 +0200
+++ debian/control 2006-08-01 17:39:47.000000000 +0200
@@ -3,7 +3,7 @@
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]>
-Build-Depends: debhelper (>= 5), 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, python2.3-dev, 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)
Standards-Version: 3.7.2
Package: samba
@@ -33,7 +33,7 @@
libsmbclient - Shared library that allows applications to talk to SMB/CIFS servers
libsmbclient-dev - libsmbclient shared libraries
winbind: Service to resolve user and group information from Windows NT servers
- python2.3-samba: Python bindings that allow access to various aspects of Samba
+ python-samba: Python bindings that allow access to various aspects of Samba
.
It is possible to install a subset of these packages depending on
your particular needs. For example, to access other SMB/CIFS servers you
@@ -182,17 +182,21 @@
Windows NT server. The service can also provide authentication
services via an associated PAM module.
-Package: python2.3-samba
+Package: python-samba
Section: python
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, python2.3
+Depends: ${shlibs:Depends}, ${python:Depends}
+Replaces: python2.3-samba (<< 3.0.23a-1)
+Conflicts: python2.3-samba (<< 3.0.23a-1)
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
Description: Python bindings that allow access to various aspects of Samba
The Samba Python bindings allow you to access various aspects of Samba.
At the moment their status is "experimental" but they have been reported
to work well.
.
- See /usr/share/doc/python2.3-samba/examples for a couple of examples.
+ See /usr/share/doc/python-samba/examples for a couple of examples.
Package: samba-dbg
Section: devel
diff -uNr ../../pkg-samba/trunk/control.in debian/control.in
--- ../../pkg-samba/trunk/control.in 2006-08-01 13:37:44.000000000 +0200
+++ debian/control.in 2006-08-01 16:49:56.000000000 +0200
@@ -3,7 +3,7 @@
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]>
-Build-Depends: debhelper (>= 5), 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, python2.3-dev, 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)
Standards-Version: 3.7.2
Package: samba
@@ -33,7 +33,7 @@
libsmbclient - Shared library that allows applications to talk to SMB/CIFS servers
libsmbclient-dev - libsmbclient shared libraries
winbind: Service to resolve user and group information from Windows NT servers
- python2.3-samba: Python bindings that allow access to various aspects of Samba
+ python-samba: Python bindings that allow access to various aspects of Samba
.
It is possible to install a subset of these packages depending on
your particular needs. For example, to access other SMB/CIFS servers you
@@ -182,17 +182,21 @@
Windows NT server. The service can also provide authentication
services via an associated PAM module.
-Package: python2.3-samba
+Package: python-samba
Section: python
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, python2.3
+Depends: ${shlibs:Depends}, ${python:Depends}
+Replaces: python2.3-samba (<< 3.0.23a-1)
+Conflicts: python2.3-samba (<< 3.0.23a-1)
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
Description: Python bindings that allow access to various aspects of Samba
The Samba Python bindings allow you to access various aspects of Samba.
At the moment their status is "experimental" but they have been reported
to work well.
.
- See /usr/share/doc/python2.3-samba/examples for a couple of examples.
+ See /usr/share/doc/python-samba/examples for a couple of examples.
Package: samba-dbg
Section: devel
diff -uNr ../../pkg-samba/trunk/pycompat debian/pycompat
--- ../../pkg-samba/trunk/pycompat 1970-01-01 01:00:00.000000000 +0100
+++ debian/pycompat 2006-08-01 16:44:57.000000000 +0200
@@ -0,0 +1 @@
+2
diff -uNr ../../pkg-samba/trunk/python2.3-samba.examples debian/python2.3-samba.examples
--- ../../pkg-samba/trunk/python2.3-samba.examples 2006-01-22 02:01:53.000000000 +0100
+++ debian/python2.3-samba.examples 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-source/python/examples/*
diff -uNr ../../pkg-samba/trunk/python2.3-samba.files debian/python2.3-samba.files
--- ../../pkg-samba/trunk/python2.3-samba.files 2006-01-22 02:01:53.000000000 +0100
+++ debian/python2.3-samba.files 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/python2.3/site-packages/
diff -uNr ../../pkg-samba/trunk/python2.3-samba.lintian debian/python2.3-samba.lintian
--- ../../pkg-samba/trunk/python2.3-samba.lintian 2006-01-22 02:01:53.000000000 +0100
+++ debian/python2.3-samba.lintian 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-# Lintian looks for any text file beginning with #!. But not all
-# 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.
-python2.3-samba: script-not-executable ./usr/lib/python2.3/site-packages/samba/printerdata.py
diff -uNr ../../pkg-samba/trunk/python-samba.examples debian/python-samba.examples
--- ../../pkg-samba/trunk/python-samba.examples 1970-01-01 01:00:00.000000000 +0100
+++ debian/python-samba.examples 2006-01-22 02:01:53.000000000 +0100
@@ -0,0 +1 @@
+source/python/examples/*
diff -uNr ../../pkg-samba/trunk/python-samba.files debian/python-samba.files
--- ../../pkg-samba/trunk/python-samba.files 1970-01-01 01:00:00.000000000 +0100
+++ debian/python-samba.files 2006-08-01 17:21:40.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/python*/site-packages/
diff -uNr ../../pkg-samba/trunk/python-samba.lintian debian/python-samba.lintian
--- ../../pkg-samba/trunk/python-samba.lintian 1970-01-01 01:00:00.000000000 +0100
+++ debian/python-samba.lintian 2006-08-01 17:07:20.000000000 +0200
@@ -0,0 +1,5 @@
+# Lintian looks for any text file beginning with #!. But not all
+# 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
diff -uNr ../../pkg-samba/trunk/rules debian/rules
--- ../../pkg-samba/trunk/rules 2006-08-01 13:37:44.000000000 +0200
+++ debian/rules 2006-08-01 17:14:33.000000000 +0200
@@ -13,6 +13,8 @@
export DEB_BUILD_GNU_TYPE
export DEB_HOST_ARCH_OS
+pyversion := $(shell pyversions -vd)
+
CFLAGS = -g -Wall
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -53,7 +55,7 @@
--with-tdbsam \
--with-ldap \
--with-cifsmount \
- --with-python=python2.3
+ --with-python=python
ifeq ($(DEB_HOST_ARCH_OS),linux)
conf_args += \
@@ -122,7 +124,7 @@
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/python2.3/site-packages/samba
+ $(DESTDIR)/usr/lib/python$(pyversion)/site-packages/samba
$(MAKE) -C source install DESTDIR=$(DESTDIR)
@@ -167,13 +169,8 @@
install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
# Install the Python modules
- #
- # Hmmm... need to figure this out. We have lib.linux-i686-2.2
- # and lib.linux-i686-2.3 directories. Using only the stuff from
- # the 2.3 directory for now. peloy.-
- #cp source/build/lib.*/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/
- cp source/build/lib.*-*-2.3/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/samba/
- cp source/python/samba/* $(DESTDIR)/usr/lib/python2.3/site-packages/samba/
+ 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
@@ -214,7 +211,7 @@
DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19"
DH_OPTIONS= dh_installinit -pwinbind
dh_installcron
- for pkg in python2.3-samba samba smbfs winbind; do \
+ for pkg in python-samba samba smbfs winbind; do \
install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
done
dh_installchangelogs -Nlibpam-smbpass
@@ -222,6 +219,7 @@
DH_OPTIONS= dh_strip -psamba -psmbclient --dbg-package=samba-dbg
DH_OPTIONS= dh_strip -Nsamba -Nsmbclient
dh_link
+ dh_python
dh_compress
dh_fixperms
