diff -u samba-3.0.11/debian/changelog samba-3.0.11/debian/changelog --- samba-3.0.11/debian/changelog +++ samba-3.0.11/debian/changelog @@ -1,3 +1,17 @@ +samba (3.0.11-0woody1) woody-backports; urgency=high + + * Recompiled for woody. + * Used python 2.1 instead of 2.3, changed it in debian/control and + debian/rules. + * Removed version from libcupsys2-dev and binutils build-dependencies. + * Removed version from libpam-runtime dependency. + * Removed type-handling stuff. + * Disabled acl support. + * Used pam.d file from 2.2.3a-12.3. + * Disabled samba-dbg package. + + -- Norbert Tretkowski Sat, 9 Apr 2005 13:54:25 +0200 + samba (3.0.11-1) unstable; urgency=high * New upstream version diff -u samba-3.0.11/debian/control samba-3.0.11/debian/control --- samba-3.0.11/debian/control +++ samba-3.0.11/debian/control @@ -3,12 +3,12 @@ Priority: optional Maintainer: Eloy A. Paris Uploaders: Steve Langasek -Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1) [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64 amd64], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1) +Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libkrb5-dev, libldap2-dev, po-debconf, python2.1-dev, binutils Standards-Version: 3.5.10 Package: samba Architecture: any -Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules +Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime, libpam-modules Replaces: samba-common (<= 2.0.5a-2) Suggests: samba-doc Description: a LanManager-like file and printer server for Unix @@ -32,7 +32,7 @@ libsmbclient - Shared library that allows applications to talk to SMB 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 + python2.1-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 servers you @@ -178,24 +178,11 @@ -Package: python2.3-samba +Package: python2.1-samba Section: python Priority: optional Architecture: any -Depends: ${shlibs:Depends}, python2.3 +Depends: ${shlibs:Depends}, python2.1 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. - -Package: samba-dbg -Section: devel -Architecture: any -Depends: samba (= ${Source-Version}) -Description: Samba debugging symbols - The Samba software suite is a collection of programs that - implements the SMB protocol for unix systems, allowing you to serve - files and printers to Windows, NT, OS/2 and DOS clients. This protocol - is sometimes also referred to as the LanManager or NetBIOS protocol. - . - This package contains debugging symbols for the programs included in - the samba and smbclient packages. + See /usr/share/doc/python2.1-samba/examples for a couple of examples. reverted: --- samba-3.0.11/debian/python2.3-samba.files +++ samba-3.0.11.orig/debian/python2.3-samba.files @@ -1 +0,0 @@ -usr/lib/python2.3/site-packages/ diff -u samba-3.0.11/debian/rules samba-3.0.11/debian/rules --- samba-3.0.11/debian/rules +++ samba-3.0.11/debian/rules @@ -67,12 +67,11 @@ --with-automount \ --with-tdbsam \ --with-ldap \ - --with-python=python2.3 + --with-python=python2.1 ifeq ($(DEB_HOST_GNU_SYSTEM),linux) conf_args += \ --with-smbmount \ - --with-acl-support \ --with-quotas mount_cifs = yes smbfs = yes @@ -138,9 +137,6 @@ source/bin/libsmbclient.a source/bin/mount.cifs \ source/include/stamp-h - sed -e "s/@libacl@/`type-handling any linux-gnu`/g" \ - < debian/control.in > debian/control - dh_clean install: DH_OPTIONS= @@ -154,7 +150,7 @@ $(DESTDIR)/lib/security $(DESTDIR)/sbin \ $(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/python2.1/site-packages/samba # Add here commands to install the package into debian/tmp. $(MAKE) -C source install DESTDIR=$(DESTDIR) @@ -246,9 +242,9 @@ # 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.*/samba/*.so $(DESTDIR)/usr/lib/python2.1/site-packages/ + cp source/build/lib.*-*-2.1/samba/*.so $(DESTDIR)/usr/lib/python2.1/site-packages/samba/ + cp source/python/samba/* $(DESTDIR)/usr/lib/python2.1/site-packages/samba/ dh_movefiles @@ -297,7 +293,7 @@ dh_installdebconf dh_installdocs -A debian/README.build # dh_installexamples is not available in Debian Potato... - [ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -ppython2.3-samba source/python/examples/* + [ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -ppython2.1-samba source/python/examples/* # dh_installmenu # dh_installlogrotate is not available in Debian Potato... if [ -x /usr/bin/dh_installlogrotate ]; then \ @@ -319,9 +315,7 @@ # dh_undocumented dh_installchangelogs -Nlibpam-smbpass DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source/pam_smbpass/CHANGELOG - dh_strip --dbg-package=samba --dbg-package=smbclient - cp -a debian/smbclient-dbg/* debian/samba-dbg - rm -rf debian/smbclient-dbg + dh_strip dh_link dh_compress dh_fixperms diff -u samba-3.0.11/debian/samba.pamd samba-3.0.11/debian/samba.pamd --- samba-3.0.11/debian/samba.pamd +++ samba-3.0.11/debian/samba.pamd @@ -1,3 +1,4 @@ -@include common-auth -@include common-account -@include common-session +auth required pam_unix.so nullok +account required pam_unix.so +session required pam_unix.so +password required pam_unix.so only in patch2: unchanged: --- samba-3.0.11.orig/debian/python2.1-samba.files +++ samba-3.0.11/debian/python2.1-samba.files @@ -0,0 +1 @@ +usr/lib/python2.1/site-packages/