[Pkg-samba-maint] r1505 - in trunk/samba/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sat Sep 1 07:47:08 UTC 2007
Author: bubulle
Date: 2007-09-01 07:47:07 +0000 (Sat, 01 Sep 2007)
New Revision: 1505
Removed:
trunk/samba/debian/patches/python-build.patch
trunk/samba/debian/patches/python-examples.patch
trunk/samba/debian/pycompat
trunk/samba/debian/python-samba.examples
trunk/samba/debian/python-samba.files
trunk/samba/debian/python-samba.lintian
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/control
trunk/samba/debian/control.in
trunk/samba/debian/patches/series
trunk/samba/debian/rules
Log:
Drop the python-samba package
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/changelog 2007-09-01 07:47:07 UTC (rev 1505)
@@ -10,7 +10,7 @@
Closes: #155345
[ Christian Perrier ]
- * Fix the Python build with upstream's SVN r24635
+ * Drop the (upstream unmaintained) python bindings (python-samba package)
* swat: turn the dependency on samba-doc to a Recommends:
Thanks to Peter Eisentraut for dealing with that issue and bringing it
back. Closes: #391742
Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/control 2007-09-01 07:47:07 UTC (rev 1505)
@@ -3,10 +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) [alpha amd64 arm armeb armel hppa i386 ia64 lpia 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)
+Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
Build-Conflicts: libfam-dev
Standards-Version: 3.7.2
-XS-Python-Version: current
Package: samba
Architecture: any
@@ -39,7 +38,6 @@
libsmbclient-dev - libsmbclient shared libraries
winbind - Service to resolve user and group information from Windows NT
servers
- 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
@@ -193,22 +191,6 @@
Windows NT server. The service can also provide authentication
services via an associated PAM module.
-Package: python-samba
-Section: python
-Priority: optional
-Architecture: any
-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/python-samba/examples for a couple of examples.
-
Package: samba-dbg
Section: devel
Priority: extra
Modified: trunk/samba/debian/control.in
===================================================================
--- trunk/samba/debian/control.in 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/control.in 2007-09-01 07:47:07 UTC (rev 1505)
@@ -3,10 +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-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)
+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, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
Build-Conflicts: libfam-dev
Standards-Version: 3.7.2
-XS-Python-Version: current
Package: samba
Architecture: any
@@ -39,7 +38,6 @@
libsmbclient-dev - libsmbclient shared libraries
winbind - Service to resolve user and group information from Windows NT
servers
- 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
@@ -192,22 +190,6 @@
Windows NT server. The service can also provide authentication
services via an associated PAM module.
-Package: python-samba
-Section: python
-Priority: optional
-Architecture: any
-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/python-samba/examples for a couple of examples.
-
Package: samba-dbg
Section: devel
Priority: extra
Deleted: trunk/samba/debian/patches/python-build.patch
===================================================================
--- trunk/samba/debian/patches/python-build.patch 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/patches/python-build.patch 2007-09-01 07:47:07 UTC (rev 1505)
@@ -1,17 +0,0 @@
-Goal: Fix Python build for 3.0.25c
-
-Status wrt upstream: Fixed in SVN
-
-Index: samba-3.0.25c/source/python/py_smb.c
-===================================================================
---- samba-3.0.25c.orig/source/python/py_smb.c
-+++ samba-3.0.25c/source/python/py_smb.c
-@@ -48,7 +48,7 @@
-
- ZERO_STRUCT(ip);
-
-- if (!cli_connect(cli, server, &ip))
-+ if (!NT_STATUS_IS_OK(cli_connect(cli, server, &ip)))
- return NULL;
-
- return new_cli_state_object(cli);
Deleted: trunk/samba/debian/patches/python-examples.patch
===================================================================
--- trunk/samba/debian/patches/python-examples.patch 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/patches/python-examples.patch 2007-09-01 07:47:07 UTC (rev 1505)
@@ -1,28 +0,0 @@
-Goal: Do not hardcode the Python version in examples
-
-Fixes: #380939?
-
-Status wrt upstream: Forwarded upstream, will be in 3.0.26
-
-Note: Probably other vendors would benefit from examples not hardcoding the Python version
-
-Index: samba-3.0.25c/source/python/examples/tdbpack/tdbtimetrial.py
-===================================================================
---- samba-3.0.25c.orig/source/python/examples/tdbpack/tdbtimetrial.py 2007-08-26 12:07:15.098370040 +0200
-+++ samba-3.0.25c/source/python/examples/tdbpack/tdbtimetrial.py 2007-08-26 13:09:07.419457523 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2.2
-+#! /usr/bin/python
-
- def run_trial():
- # import tdbutil
-Index: samba-3.0.25c/source/python/examples/tdbpack/test_tdbpack.py
-===================================================================
---- samba-3.0.25c.orig/source/python/examples/tdbpack/test_tdbpack.py 2007-08-26 12:07:15.098370040 +0200
-+++ samba-3.0.25c/source/python/examples/tdbpack/test_tdbpack.py 2007-08-26 13:09:07.419457523 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python2.2
-+#! /usr/bin/env python
-
- __doc__ = """test case for samba.tdbpack functions
-
Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/patches/series 2007-09-01 07:47:07 UTC (rev 1505)
@@ -15,10 +15,8 @@
VERSION.patch
adapt_machine_creation_script.patch
autoconf.patch
-python-examples.patch
missing_userspace_bugzilla999.patch
linux-cifs-user-perms.patch
cifs-umount-trailing-slashes.patch
cifs-umount-same-user.patch
smbpasswd-syslog.patch
-python-build.patch
Deleted: trunk/samba/debian/pycompat
===================================================================
--- trunk/samba/debian/pycompat 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/pycompat 2007-09-01 07:47:07 UTC (rev 1505)
@@ -1 +0,0 @@
-2
Deleted: trunk/samba/debian/python-samba.examples
===================================================================
--- trunk/samba/debian/python-samba.examples 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/python-samba.examples 2007-09-01 07:47:07 UTC (rev 1505)
@@ -1 +0,0 @@
-source/python/examples/*
Deleted: trunk/samba/debian/python-samba.files
===================================================================
--- trunk/samba/debian/python-samba.files 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/python-samba.files 2007-09-01 07:47:07 UTC (rev 1505)
@@ -1 +0,0 @@
-usr/lib/python*/site-packages/
Deleted: trunk/samba/debian/python-samba.lintian
===================================================================
--- trunk/samba/debian/python-samba.lintian 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/python-samba.lintian 2007-09-01 07:47:07 UTC (rev 1505)
@@ -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.
-python-samba: script-not-executable ./usr/share/pycentral/python-samba/site-packages/samba/printerdata.py
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2007-08-26 13:10:36 UTC (rev 1504)
+++ trunk/samba/debian/rules 2007-09-01 07:47:07 UTC (rev 1505)
@@ -51,8 +51,7 @@
--with-shared-modules=idmap_rid,idmap_ad \
--with-automount \
--with-ldap \
- --with-ads \
- --with-python=python
+ --with-ads
ifeq ($(DEB_HOST_ARCH_OS),linux)
conf_args += \
@@ -90,7 +89,7 @@
dh_testdir
$(MAKE) -C source headers
- $(MAKE) -C source all nsswitch/libnss_wins.so python_ext
+ $(MAKE) -C source all nsswitch/libnss_wins.so
touch build-stamp
@@ -130,7 +129,7 @@
mkdir -p $(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \
$(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d
- $(MAKE) -C source install python_install DESTDIR=$(DESTDIR)
+ $(MAKE) -C source 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
@@ -209,7 +208,7 @@
DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19"
DH_OPTIONS= dh_installinit -pwinbind
dh_installcron
- for pkg in python-samba samba smbfs winbind; do \
+ for pkg in samba smbfs winbind; do \
install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
done
dh_installchangelogs -Nlibpam-smbpass
@@ -217,8 +216,6 @@
DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common --dbg-package=samba-dbg
DH_OPTIONS= dh_strip -Nsamba -Nsmbclient -Nwinbind -Nsamba-common
dh_link
- DH_OPTIONS= dh_pycentral -ppython-samba
- dh_python
dh_compress
dh_fixperms
More information about the Pkg-samba-maint
mailing list