[Pkg-samba-maint] r1102 - in trunk: . patches
Peter Eisentraut
petere at costa.debian.org
Thu Aug 3 23:43:20 UTC 2006
Author: petere
Date: 2006-08-03 23:43:19 +0000 (Thu, 03 Aug 2006)
New Revision: 1102
Added:
trunk/patches/python-examples.patch
trunk/pycompat
trunk/python-samba.examples
trunk/python-samba.files
trunk/python-samba.lintian
Removed:
trunk/python2.3-samba.examples
trunk/python2.3-samba.files
trunk/python2.3-samba.lintian
Modified:
trunk/changelog
trunk/control
trunk/control.in
trunk/patches/series
trunk/rules
Log:
* Python transition preparations: renamed package to python-samba,
removed hardcoded references to Python version 2.3. Closes: #380939
Modified: trunk/changelog
===================================================================
--- trunk/changelog 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/changelog 2006-08-03 23:43:19 UTC (rev 1102)
@@ -59,6 +59,8 @@
* Made winbind init script more careful about returning proper exit code
* Added winbindd_priv group as owner of winbindd_privileged directory.
Closes: #307257
+ * Python transition preparations: renamed package to python-samba,
+ removed hardcoded references to Python version 2.3. Closes: #380939
-- Christian Perrier <bubulle at debian.org> Sun, 23 Jul 2006 18:50:35 +0200
Modified: trunk/control
===================================================================
--- trunk/control 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/control 2006-08-03 23:43:19 UTC (rev 1102)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Eloy A. Paris <peloy at debian.org>
Uploaders: 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>
-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
Modified: trunk/control.in
===================================================================
--- trunk/control.in 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/control.in 2006-08-03 23:43:19 UTC (rev 1102)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Eloy A. Paris <peloy at debian.org>
Uploaders: 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>
-Build-Depends: debhelper (>= 5), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [@libacl@], 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) [@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)
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
Added: trunk/patches/python-examples.patch
===================================================================
--- trunk/patches/python-examples.patch 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/patches/python-examples.patch 2006-08-03 23:43:19 UTC (rev 1102)
@@ -0,0 +1,20 @@
+Index: samba-3.0.23a/source/python/examples/tdbpack/tdbtimetrial.py
+===================================================================
+--- samba-3.0.23a.orig/source/python/examples/tdbpack/tdbtimetrial.py 2006-08-04 01:21:48.000000000 +0200
++++ samba-3.0.23a/source/python/examples/tdbpack/tdbtimetrial.py 2006-08-04 01:21:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.2
++#! /usr/bin/python
+
+ def run_trial():
+ # import tdbutil
+Index: samba-3.0.23a/source/python/examples/tdbpack/test_tdbpack.py
+===================================================================
+--- samba-3.0.23a.orig/source/python/examples/tdbpack/test_tdbpack.py 2006-08-04 01:21:56.000000000 +0200
++++ samba-3.0.23a/source/python/examples/tdbpack/test_tdbpack.py 2006-08-04 01:22:00.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python2.2
++#! /usr/bin/env python
+
+ __doc__ = """test case for samba.tdbpack functions
+
Modified: trunk/patches/series
===================================================================
--- trunk/patches/series 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/patches/series 2006-08-03 23:43:19 UTC (rev 1102)
@@ -18,3 +18,4 @@
VERSION.patch
adapt_machine_creation_script.patch
autoconf.patch
+python-examples.patch
Added: trunk/pycompat
===================================================================
--- trunk/pycompat 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/pycompat 2006-08-03 23:43:19 UTC (rev 1102)
@@ -0,0 +1 @@
+2
Copied: trunk/python-samba.examples (from rev 1101, trunk/python2.3-samba.examples)
Copied: trunk/python-samba.files (from rev 1101, trunk/python2.3-samba.files)
===================================================================
--- trunk/python2.3-samba.files 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/python-samba.files 2006-08-03 23:43:19 UTC (rev 1102)
@@ -0,0 +1 @@
+usr/lib/python*/site-packages/
Copied: trunk/python-samba.lintian (from rev 1101, trunk/python2.3-samba.lintian)
===================================================================
--- trunk/python2.3-samba.lintian 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/python-samba.lintian 2006-08-03 23:43:19 UTC (rev 1102)
@@ -0,0 +1,6 @@
+# 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
+python-samba: script-not-executable ./usr/lib/python2.4/site-packages/samba/printerdata.py
Deleted: trunk/python2.3-samba.examples
===================================================================
--- trunk/python2.3-samba.examples 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/python2.3-samba.examples 2006-08-03 23:43:19 UTC (rev 1102)
@@ -1 +0,0 @@
-source/python/examples/*
Deleted: trunk/python2.3-samba.files
===================================================================
--- trunk/python2.3-samba.files 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/python2.3-samba.files 2006-08-03 23:43:19 UTC (rev 1102)
@@ -1 +0,0 @@
-usr/lib/python2.3/site-packages/
Deleted: trunk/python2.3-samba.lintian
===================================================================
--- trunk/python2.3-samba.lintian 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/python2.3-samba.lintian 2006-08-03 23:43:19 UTC (rev 1102)
@@ -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
Modified: trunk/rules
===================================================================
--- trunk/rules 2006-08-02 05:36:14 UTC (rev 1101)
+++ trunk/rules 2006-08-03 23:43:19 UTC (rev 1102)
@@ -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
More information about the Pkg-samba-maint
mailing list