[Pkg-samba-maint] r3950 - branches/samba/experimental/debian
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Tue Oct 25 02:53:52 UTC 2011
Author: bubulle
Date: 2011-10-25 02:53:52 +0000 (Tue, 25 Oct 2011)
New Revision: 3950
Added:
branches/samba/experimental/debian/clean
branches/samba/experimental/debian/libpam-smbpass.install
branches/samba/experimental/debian/libsmbclient-dev.install
branches/samba/experimental/debian/libsmbclient.install
branches/samba/experimental/debian/libsmbclient.lintian-overrides
branches/samba/experimental/debian/libwbclient-dev.install
branches/samba/experimental/debian/libwbclient0.install
branches/samba/experimental/debian/samba-common-bin.install
branches/samba/experimental/debian/samba-common.install
branches/samba/experimental/debian/samba-tools.install
branches/samba/experimental/debian/samba.install
branches/samba/experimental/debian/samba.manpages
branches/samba/experimental/debian/smbclient.install
branches/samba/experimental/debian/smbclient.links
branches/samba/experimental/debian/swat.install
branches/samba/experimental/debian/winbind.install
Removed:
branches/samba/experimental/debian/libpam-smbpass.files
branches/samba/experimental/debian/libsmbclient-dev.files
branches/samba/experimental/debian/libsmbclient.files
branches/samba/experimental/debian/libwbclient-dev.files
branches/samba/experimental/debian/libwbclient0.files
branches/samba/experimental/debian/samba-common-bin.files
branches/samba/experimental/debian/samba-common.files
branches/samba/experimental/debian/samba-tools.files
branches/samba/experimental/debian/samba.files
branches/samba/experimental/debian/smbclient.files
branches/samba/experimental/debian/smbwrapper.dirs
branches/samba/experimental/debian/smbwrapper.docs
branches/samba/experimental/debian/smbwrapper.files
branches/samba/experimental/debian/swat.files
branches/samba/experimental/debian/winbind.files
Modified:
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/compat
branches/samba/experimental/debian/control
branches/samba/experimental/debian/rules
branches/samba/experimental/debian/winbind.lintian-overrides
Log:
Merge changes from 3.5.11~dfsg-2
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/changelog 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,3 +1,45 @@
+samba (2:3.6.1-2) UNRELEASED; urgency=low
+
+ * Merge changes from 3.5.11~dfsg-2 in unstable branch
+
+ [ Steve Langasek ]
+ * Don't export DEB_HOST_ARCH_OS in debian/rules, this is only used locally.
+ * Use dh_links instead of manually creating directories and symlinks from
+ debian/rules.
+ * Switch from dh_movefiles to dh_install and adjust for debhelper compat
+ level 7, in preparation for moving to dh(1).
+ * Where possible, use dh_installman and dh_install's support for target
+ directories instead of moving files around in debian/rules.
+ * We don't need to mess with perms on usr/include/libsmbclient.h anymore
+ in debian/rules, the upstream install target gets it right
+ * Use debian/clean instead of removing left-behind files by hand in the
+ clean target
+ * Convert debian/rules to dh(1).
+ * Don't run debconf-updatepo on clean; not worth the divergence in
+ debian/rules anymore :)
+ * Don't install debian/README.build in the package; this is really only
+ relevant in the source.
+ * Bump to debhelper compat level 9 and build libraries for multiarch.
+ * Drop Makefile.internal from libsmbclient-dev examples so that we can mark
+ libsmbclient-dev Multi-Arch: same.
+ * Bump build-depends on debhelper to 8.9.4, so we ensure we have
+ dpkg-buildflags by default and get full build hardening enabled out of
+ the box - critical for a server like samba.
+ * Use DH_ALWAYS_EXCLUDE instead of passing override options to
+ dh_installexamples.
+ * Pass --sourcedirectory=source3 to dh instead of having to pass it to each
+ dh_auto_* command.
+ * Ironically, this means that we have to manually disable dh_auto_test,
+ which now finds the makefile targets but doesn't work unless we build an
+ extra wrapper library into our binaries that we don't want.
+ * Drop a few configure options from debian/rules that shadow the built-in
+ defaults.
+ * debian/libsmbclient.lintian-overrides: yes, we know the package name
+ doesn't match the soname - and it never should until there's an ABI
+ change.
+
+ -- Christian Perrier <bubulle at debian.org> Tue, 25 Oct 2011 04:52:36 +0200
+
samba (2:3.6.1-1) experimental; urgency=low
* New upstream release
Copied: branches/samba/experimental/debian/clean (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/clean)
===================================================================
--- branches/samba/experimental/debian/clean (rev 0)
+++ branches/samba/experimental/debian/clean 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,5 @@
+source3/pkgconfig/*.pc
+source3/exports/libsmbclient.syms
+source3/exports/libsmbsharemodes.syms
+source3/lib/netapi/tests/Makefile
+source3/lib/netapi/examples/Makefile
Modified: branches/samba/experimental/debian/compat
===================================================================
--- branches/samba/experimental/debian/compat 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/compat 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1 +1 @@
-6
+9
Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/control 2011-10-25 02:53:52 UTC (rev 3950)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Jelmer Vernooij <jelmer at debian.org>
-Build-Depends: debhelper (>= 6.0.7~), libpam0g-dev, libreadline-dev,
+Build-Depends: debhelper (>= 8.9.4~), libpam0g-dev, libreadline-dev,
libcups2-dev | libcupsys2-dev,
libacl1-dev [linux-any],
libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
@@ -140,6 +140,7 @@
Section: admin
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, samba-common (= ${source:Version}), ${misc:Depends},
libpam-runtime (>= 1.0.1-6)
Suggests: samba
@@ -155,6 +156,8 @@
Section: libs
Priority: optional
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: shared library for communication with SMB/CIFS servers
This package provides a shared library that enables client applications
@@ -165,6 +168,7 @@
Section: libdevel
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: libsmbclient (= ${binary:Version}), ${misc:Depends}
Description: development files for libsmbclient
This package provides the development files (static library and headers)
@@ -176,7 +180,8 @@
Section: net
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser, libpam-runtime (>= 1.0.1-6)
+Pre-Depends: multiarch-support
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser, libpam-runtime (>= 1.0.1-6), libpam0g (>= 1.1.3-2~)
Replaces: samba (<= 2.2.3-2)
Description: Samba nameservice integration server
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -209,6 +214,8 @@
Section: libs
Priority: optional
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks:
libpam-smbpass (<< 2:3.4.1),
@@ -232,6 +239,7 @@
Section: libdevel
Priority: optional
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version})
Description: Samba winbind client library - development files
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
Deleted: branches/samba/experimental/debian/libpam-smbpass.files
===================================================================
--- branches/samba/experimental/debian/libpam-smbpass.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/libpam-smbpass.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,2 +0,0 @@
-lib/security/pam_smbpass.so
-usr/share/pam-configs/smbpasswd-migrate
Copied: branches/samba/experimental/debian/libpam-smbpass.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/libpam-smbpass.install)
===================================================================
--- branches/samba/experimental/debian/libpam-smbpass.install (rev 0)
+++ branches/samba/experimental/debian/libpam-smbpass.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,2 @@
+lib/*/security/pam_smbpass.so
+usr/share/pam-configs/smbpasswd-migrate
Deleted: branches/samba/experimental/debian/libsmbclient-dev.files
===================================================================
--- branches/samba/experimental/debian/libsmbclient-dev.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/libsmbclient-dev.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,3 +0,0 @@
-usr/lib/libsmbclient.a
-usr/lib/libsmbclient.so
-usr/include/libsmbclient.h
Copied: branches/samba/experimental/debian/libsmbclient-dev.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/libsmbclient-dev.install)
===================================================================
--- branches/samba/experimental/debian/libsmbclient-dev.install (rev 0)
+++ branches/samba/experimental/debian/libsmbclient-dev.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,3 @@
+usr/lib/*/libsmbclient.a
+usr/lib/*/libsmbclient.so
+usr/include/libsmbclient.h
Deleted: branches/samba/experimental/debian/libsmbclient.files
===================================================================
--- branches/samba/experimental/debian/libsmbclient.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/libsmbclient.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,2 +0,0 @@
-usr/lib/libsmbclient.so.0
-usr/share/man/man7/libsmbclient.7
Copied: branches/samba/experimental/debian/libsmbclient.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/libsmbclient.install)
===================================================================
--- branches/samba/experimental/debian/libsmbclient.install (rev 0)
+++ branches/samba/experimental/debian/libsmbclient.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,2 @@
+usr/lib/*/libsmbclient.so.0
+usr/share/man/man7/libsmbclient.7
Copied: branches/samba/experimental/debian/libsmbclient.lintian-overrides (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/libsmbclient.lintian-overrides)
===================================================================
--- branches/samba/experimental/debian/libsmbclient.lintian-overrides (rev 0)
+++ branches/samba/experimental/debian/libsmbclient.lintian-overrides 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,3 @@
+# changing a library package name needlessly is always worse than having a
+# name that doesn't match the soname.
+libsmbclient: package-name-doesnt-match-sonames libsmbclient0
Deleted: branches/samba/experimental/debian/libwbclient-dev.files
===================================================================
--- branches/samba/experimental/debian/libwbclient-dev.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/libwbclient-dev.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,2 +0,0 @@
-usr/lib/libwbclient.so
-usr/include/wbclient.h
Copied: branches/samba/experimental/debian/libwbclient-dev.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/libwbclient-dev.install)
===================================================================
--- branches/samba/experimental/debian/libwbclient-dev.install (rev 0)
+++ branches/samba/experimental/debian/libwbclient-dev.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,3 @@
+usr/lib/*/libwbclient.so
+usr/include/wbclient.h
+usr/include/wbc_async.h
Deleted: branches/samba/experimental/debian/libwbclient0.files
===================================================================
--- branches/samba/experimental/debian/libwbclient0.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/libwbclient0.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1 +0,0 @@
-usr/lib/libwbclient.so.0
Copied: branches/samba/experimental/debian/libwbclient0.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/libwbclient0.install)
===================================================================
--- branches/samba/experimental/debian/libwbclient0.install (rev 0)
+++ branches/samba/experimental/debian/libwbclient0.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1 @@
+usr/lib/*/libwbclient.so.0
Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/rules 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,47 +1,33 @@
#!/usr/bin/make -f
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
# Set the host and build architectures for use with config.cache loading,
# cross-building, etc.
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-export DEB_HOST_GNU_TYPE
-export DEB_BUILD_GNU_TYPE
-export DEB_HOST_ARCH_OS
+export DEB_CFLAGS_MAINT_APPEND := -Wall
-CFLAGS = -g -Wall
+# Ignore these files which would otherwise be pulled into our examples
+export DH_ALWAYS_EXCLUDE := COPYING:Makefile.internal:history
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
DESTDIR=`pwd`/debian/tmp
+%:
+ dh $@ --sourcedirectory=source3
+
conf_args = \
--cache-file=./config.cache \
--with-fhs \
- --enable-shared \
--enable-static \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libdir=/usr/lib/samba \
--with-privatedir=/etc/samba \
--with-piddir=/var/run/samba \
- --localstatedir=/var \
--with-rootsbindir=/sbin \
- --with-pammodulesdir=/lib/security \
+ --with-pammodulesdir=/lib/$(DEB_HOST_MULTIARCH)/security \
--with-pam \
--with-syslog \
--with-utmp \
--with-readline \
--with-pam_smbpass \
- --with-libsmbclient \
--with-winbind \
--with-shared-modules=idmap_rid,idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_tdb2 \
--with-automount \
@@ -51,7 +37,6 @@
--without-libtdb \
--without-libnetapi \
--with-modulesdir=/usr/lib/samba \
- --datarootdir=/usr/share \
--datadir=/usr/share/samba \
--with-swatdir=/usr/share/samba/swat \
--with-lockdir=/var/run/samba \
@@ -61,6 +46,7 @@
--with-nmbdsocketdir=/var/run/samba \
--enable-external-libtalloc \
--without-libtalloc \
+ --without-cifsmount \
--disable-avahi \
--without-libtdb \
--enable-external-libtdb
@@ -70,69 +56,26 @@
--with-ctdb=/usr --with-cluster-support=yes \
--with-acl-support \
--with-quotas \
- --without-cifsmount \
--without-cifsupcall
else
- conf_args += --without-quotas --without-cifsmount
+ conf_args += --without-quotas
endif
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- conf_args += --build $(DEB_BUILD_GNU_TYPE)
-else
- conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-configure:
- dh_testdir
-
+override_dh_auto_configure:
if [ -f debian/config.cache ]; then \
cp -f debian/config.cache source3/config.cache; \
fi
+ dh_auto_configure -- $(conf_args)
- [ -f source3/Makefile ] || (cd source3 && CFLAGS="$(CFLAGS)" ./configure $(conf_args))
+override_dh_auto_build:
+ dh_auto_build -- everything nsswitch
- touch configure-stamp
+# our test suite requires including a wrapper lib we don't want to ship.
+override_dh_auto_test:
-build: configure build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
- dh_testdir
+override_dh_auto_install:
+ dh_auto_install
- $(MAKE) -C source3 # headers
- $(MAKE) -C source3 everything
- $(MAKE) -C source3 nsswitch
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- [ ! -f source3/Makefile ] || $(MAKE) -C source3 distclean
-
- # Delete stuff left after a build that is not deleted by 'make clean'
- rm -f source3/pkgconfig/*.pc \
- source3/exports/libsmbclient.syms \
- source3/exports/libsmbsharemodes.syms
-
- debconf-updatepo
-
- dh_clean
-
-install: DH_OPTIONS=$(DH_EXTRAS)
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- mkdir -p $(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \
- $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d
-
- $(MAKE) -C source3 install DESTDIR=$(DESTDIR)
-
# Rename to *.samba3 for alternatives
mv $(DESTDIR)/usr/bin/smbstatus $(DESTDIR)/usr/bin/smbstatus.samba3
mv $(DESTDIR)/usr/bin/nmblookup $(DESTDIR)/usr/bin/nmblookup.samba3
@@ -143,112 +86,54 @@
mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.samba3
mv $(DESTDIR)/usr/share/man/man1/testparm.1 $(DESTDIR)/usr/share/man/man1/testparm.samba3.1
- # Starting with Samba 3.0.6 libsmbclient.so is installed in
- # /usr/lib/samba. We don't want it there since it is not in the
- # default library path. Here we move it to /usr/lib/.
- mv $(DESTDIR)/usr/lib/samba/libsmbclient* $(DESTDIR)/usr/lib/
-
- # same problem with libwbclient.
- mv $(DESTDIR)/usr/lib/samba/libwbclient* $(DESTDIR)/usr/lib/
-
# Install other stuff not installed by "make install"
install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
- install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
- install -m 0644 nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
- install -m 0644 nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
- # Install torture stuff
- install -m 0755 source3/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture
- install -m 0755 source3/bin/msgtest $(DESTDIR)/usr/bin/msgtest
- install -m 0755 source3/bin/masktest $(DESTDIR)/usr/bin/masktest
- install -m 0755 source3/bin/locktest $(DESTDIR)/usr/bin/locktest
- install -m 0755 source3/bin/locktest2 $(DESTDIR)/usr/bin/locktest2
- install -m 0755 source3/bin/nsstest $(DESTDIR)/usr/bin/nsstest
- install -m 0755 source3/bin/vfstest $(DESTDIR)/usr/bin/vfstest
- install -m 0755 source3/bin/pdbtest $(DESTDIR)/usr/bin/pdbtest
- install -m 0755 source3/bin/replacetort $(DESTDIR)/usr/bin/replacetort
- install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
+ install -m 0644 nsswitch/libnss_winbind.so $(DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libnss_winbind.so.2
+ install -m 0644 nsswitch/libnss_wins.so $(DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libnss_wins.so.2
mkdir -p $(DESTDIR)/usr/share/pam-configs
install -m 0644 debian/libpam-smbpass.pam-config $(DESTDIR)/usr/share/pam-configs/smbpasswd-migrate
install -m 0644 debian/winbind.pam-config $(DESTDIR)/usr/share/pam-configs/winbind
- # For CUPS to support printing to samba printers, it's necessary
- # to make the following symlink (according to
- # Erich Schubert <debian at vitavonni.de> in #109509):
- ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
-
- cp debian/smb.conf* $(DESTDIR)/usr/share/samba/
- install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action
# Install samba-common's conffiles - they'll get moved later to their
- # correct place by dh_movefiles.
- cp debian/gdbcommands $(DESTDIR)/etc/samba/
+ # correct place by dh_install
+ mkdir -p $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d
install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
mkdir -p $(DESTDIR)/etc/network/if-up.d
install -o root -g root debian/samba.if-up $(DESTDIR)/etc/network/if-up.d/samba
- dh_movefiles
+override_dh_installpam:
dh_installpam --name=samba
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: DH_OPTIONS=-i
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdebconf
- dh_installdocs -A debian/README.build
- # Ignore COPYING. Otherwise, an extra copy of the GPL licence
- # in smbldap-tools example is included in samba-doc
- dh_installexamples -Xsmbldap-tools-* -XCOPYING
- dh_installchangelogs
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-# Pass -a to all debhelper commands in this target to reduce clutter.
-
-binary-arch: DH_OPTIONS=-a $(DH_EXTRAS)
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdebconf
- dh_installdocs -A debian/README.build
- dh_installexamples
- dh_installlogrotate
- dh_installlogcheck
- DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19"
- DH_OPTIONS= dh_installinit -pwinbind
- dh_installcron
- dh_lintian
+override_dh_installchangelogs:
dh_installchangelogs -Nlibpam-smbpass
- DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
- DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common-bin --dbg-package=samba-dbg
- DH_OPTIONS= dh_strip -Nsamba -Nsmbclient -Nwinbind -Nsamba-common-bin
- dh_link
- dh_compress
- dh_fixperms
+ifneq (,$(filter libpam-smbpass, $(shell dh_listpackages)))
+ dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
+endif
- # Upstream makefile installs this using "install" without -m, so
- # it becomes executable
- chmod a-x debian/libsmbclient-dev/usr/include/libsmbclient.h
+override_dh_installinit:
+ifneq (,$(filter samba, $(shell dh_listpackages)))
+ dh_installinit -psamba -- "defaults 20 19"
+endif
+ifneq (,$(filter winbind, $(shell dh_listpackages)))
+ dh_installinit -pwinbind
+endif
+override_dh_strip:
+ dh_strip -psamba -psmbclient -pwinbind -psamba-common-bin --dbg-package=samba-dbg
+ dh_strip -Nsamba -Nsmbclient -Nwinbind -Nsamba-common-bin
+
+override_dh_fixperms:
+ dh_fixperms
+ifneq (,$(filter samba-common, $(shell dh_listpackages)))
+ chmod a+x debian/samba-common/usr/share/samba/panic-action
# Set some reasonable default perms for the samba logdir.
chmod 0750 debian/samba-common/var/log/samba/
chown root:adm debian/samba-common/var/log/samba/
+endif
+ifneq (,$(filter samba, $(shell dh_listpackages)))
chmod 1777 debian/samba/var/spool/samba/
+endif
- DH_OPTIONS= dh_makeshlibs -plibsmbclient -V'libsmbclient (>= 2:3.2.0)'
- DH_OPTIONS= dh_makeshlibs -plibwbclient0 -V'libwbclient0 (>= 2:3.5.0~pre2)'
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_makeshlibs:
+ dh_makeshlibs -plibsmbclient -V'libsmbclient (>= 2:3.2.0)'
+ dh_makeshlibs -plibwbclient0 -V'libwbclient0 (>= 2:3.5.0~pre2)'
Deleted: branches/samba/experimental/debian/samba-common-bin.files
===================================================================
--- branches/samba/experimental/debian/samba-common-bin.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/samba-common-bin.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,12 +0,0 @@
-usr/bin/net.samba3
-usr/bin/nmblookup.samba3
-usr/bin/smbpasswd
-usr/bin/testparm.samba3
-usr/share/man/man1/nmblookup.samba3.1
-usr/share/man/man1/testparm.samba3.1
-usr/share/man/man5/lmhosts.5
-usr/share/man/man5/smb.conf.5
-usr/share/man/man5/smbpasswd.5
-usr/share/man/man7/samba.7
-usr/share/man/man8/net.samba3.8
-usr/share/man/man8/smbpasswd.8
Copied: branches/samba/experimental/debian/samba-common-bin.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/samba-common-bin.install)
===================================================================
--- branches/samba/experimental/debian/samba-common-bin.install (rev 0)
+++ branches/samba/experimental/debian/samba-common-bin.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,12 @@
+usr/bin/net.samba3
+usr/bin/nmblookup.samba3
+usr/bin/smbpasswd
+usr/bin/testparm.samba3
+usr/share/man/man1/nmblookup.samba3.1
+usr/share/man/man1/testparm.samba3.1
+usr/share/man/man5/lmhosts.5
+usr/share/man/man5/smb.conf.5
+usr/share/man/man5/smbpasswd.5
+usr/share/man/man7/samba.7
+usr/share/man/man8/net.samba3.8
+usr/share/man/man8/smbpasswd.8
Deleted: branches/samba/experimental/debian/samba-common.files
===================================================================
--- branches/samba/experimental/debian/samba-common.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/samba-common.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,8 +0,0 @@
-etc/samba/
-etc/dhcp3/
-etc/pam.d/
-usr/share/samba/lowcase.dat
-usr/share/samba/panic-action
-usr/share/samba/smb.conf*
-usr/share/samba/upcase.dat
-usr/share/samba/valid.dat
Copied: branches/samba/experimental/debian/samba-common.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/samba-common.install)
===================================================================
--- branches/samba/experimental/debian/samba-common.install (rev 0)
+++ branches/samba/experimental/debian/samba-common.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,8 @@
+etc/samba/
+debian/gdbcommands etc/samba
+etc/dhcp3/
+usr/share/samba/lowcase.dat
+debian/panic-action usr/share/samba
+debian/smb.conf* usr/share/samba
+usr/share/samba/upcase.dat
+usr/share/samba/valid.dat
Deleted: branches/samba/experimental/debian/samba-tools.files
===================================================================
--- branches/samba/experimental/debian/samba-tools.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/samba-tools.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,11 +0,0 @@
-usr/bin/smbtorture
-usr/bin/msgtest
-usr/bin/masktest
-usr/bin/locktest
-usr/bin/locktest2
-usr/bin/nsstest
-usr/bin/vfstest
-usr/bin/pdbtest
-usr/bin/replacetort
-usr/bin/smbconftort
-
Copied: branches/samba/experimental/debian/samba-tools.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/samba-tools.install)
===================================================================
--- branches/samba/experimental/debian/samba-tools.install (rev 0)
+++ branches/samba/experimental/debian/samba-tools.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,10 @@
+source3/bin/smbtorture usr/bin
+source3/bin/msgtest usr/bin
+source3/bin/masktest usr/bin
+source3/bin/locktest usr/bin
+source3/bin/locktest2 usr/bin
+source3/bin/nsstest usr/bin
+source3/bin/vfstest usr/bin
+source3/bin/pdbtest usr/bin
+source3/bin/replacetort usr/bin
+source3/bin/smbconftort usr/bin
Deleted: branches/samba/experimental/debian/samba.files
===================================================================
--- branches/samba/experimental/debian/samba.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/samba.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,18 +0,0 @@
-usr/bin/eventlogadm
-usr/bin/smbstatus.samba3
-usr/bin/smbcontrol
-usr/bin/profiles
-usr/bin/pdbedit
-usr/sbin/smbd
-usr/sbin/nmbd
-usr/sbin/mksmbpasswd
-usr/lib/samba/vfs
-usr/share/man/man1/smbcontrol.1
-usr/share/man/man1/profiles.1
-usr/share/man/man1/smbstatus.samba3.1
-usr/share/man/man8/nmbd.8
-usr/share/man/man8/pdbedit.8
-usr/share/man/man8/smbd.8
-usr/share/man/man8/mksmbpasswd.8
-usr/share/man/man8/eventlogadm.8
-etc/network/if-up.d/samba
Copied: branches/samba/experimental/debian/samba.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/samba.install)
===================================================================
--- branches/samba/experimental/debian/samba.install (rev 0)
+++ branches/samba/experimental/debian/samba.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,17 @@
+usr/bin/eventlogadm
+usr/bin/smbstatus.samba3
+usr/bin/smbcontrol
+usr/bin/profiles
+usr/bin/pdbedit
+usr/sbin/smbd
+usr/sbin/nmbd
+usr/sbin/mksmbpasswd
+usr/lib/samba/vfs
+usr/share/man/man1/smbcontrol.1
+usr/share/man/man1/profiles.1
+usr/share/man/man1/smbstatus.samba3.1
+usr/share/man/man8/nmbd.8
+usr/share/man/man8/pdbedit.8
+usr/share/man/man8/smbd.8
+usr/share/man/man8/eventlogadm.8
+etc/network/if-up.d/samba
Copied: branches/samba/experimental/debian/samba.manpages (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/samba.manpages)
===================================================================
--- branches/samba/experimental/debian/samba.manpages (rev 0)
+++ branches/samba/experimental/debian/samba.manpages 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1 @@
+debian/mksmbpasswd.8
Deleted: branches/samba/experimental/debian/smbclient.files
===================================================================
--- branches/samba/experimental/debian/smbclient.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/smbclient.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,20 +0,0 @@
-usr/bin/findsmb
-usr/bin/smbclient
-usr/bin/smbget
-usr/bin/smbtar
-usr/bin/rpcclient
-usr/bin/smbspool
-usr/bin/smbtree
-usr/bin/smbcacls
-usr/bin/smbcquotas
-usr/share/man/man1/findsmb.1
-usr/share/man/man1/smbclient.1
-usr/share/man/man1/smbget.1
-usr/share/man/man1/smbtar.1
-usr/share/man/man1/rpcclient.1
-usr/share/man/man5/smbgetrc.5
-usr/share/man/man8/smbspool.8
-usr/share/man/man1/smbcacls.1
-usr/share/man/man1/smbcquotas.1
-usr/share/man/man1/smbtree.1
-usr/lib/cups/backend/smb
Copied: branches/samba/experimental/debian/smbclient.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/smbclient.install)
===================================================================
--- branches/samba/experimental/debian/smbclient.install (rev 0)
+++ branches/samba/experimental/debian/smbclient.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,19 @@
+usr/bin/findsmb
+usr/bin/smbclient
+usr/bin/smbget
+usr/bin/smbtar
+usr/bin/rpcclient
+usr/bin/smbspool
+usr/bin/smbtree
+usr/bin/smbcacls
+usr/bin/smbcquotas
+usr/share/man/man1/findsmb.1
+usr/share/man/man1/smbclient.1
+usr/share/man/man1/smbget.1
+usr/share/man/man1/smbtar.1
+usr/share/man/man1/rpcclient.1
+usr/share/man/man5/smbgetrc.5
+usr/share/man/man8/smbspool.8
+usr/share/man/man1/smbcacls.1
+usr/share/man/man1/smbcquotas.1
+usr/share/man/man1/smbtree.1
Copied: branches/samba/experimental/debian/smbclient.links (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/smbclient.links)
===================================================================
--- branches/samba/experimental/debian/smbclient.links (rev 0)
+++ branches/samba/experimental/debian/smbclient.links 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,4 @@
+# For CUPS to support printing to samba printers, it's necessary to make the
+# following symlink (according to Erich Schubert <debian at vitavonni.de>
+# in #109509)
+usr/bin/smbspool usr/lib/cups/backend/smb
Deleted: branches/samba/experimental/debian/smbwrapper.dirs
===================================================================
--- branches/samba/experimental/debian/smbwrapper.dirs 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/smbwrapper.dirs 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/samba
Deleted: branches/samba/experimental/debian/smbwrapper.docs
===================================================================
--- branches/samba/experimental/debian/smbwrapper.docs 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/smbwrapper.docs 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,2 +0,0 @@
-source3/smbwrapper/README
-source3/smbwrapper/PORTING
Deleted: branches/samba/experimental/debian/smbwrapper.files
===================================================================
--- branches/samba/experimental/debian/smbwrapper.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/smbwrapper.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1 +0,0 @@
-usr/bin/smbsh
Deleted: branches/samba/experimental/debian/swat.files
===================================================================
--- branches/samba/experimental/debian/swat.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/swat.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,7 +0,0 @@
-usr/sbin/swat
-usr/share/samba/*.msg
-usr/share/samba/swat/help/welcome.html
-usr/share/samba/swat/images
-usr/share/samba/swat/include
-usr/share/samba/swat/lang
-usr/share/man/man8/swat.8
Copied: branches/samba/experimental/debian/swat.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/swat.install)
===================================================================
--- branches/samba/experimental/debian/swat.install (rev 0)
+++ branches/samba/experimental/debian/swat.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,7 @@
+usr/sbin/swat
+usr/share/samba/*.msg
+usr/share/samba/swat/help/welcome.html
+usr/share/samba/swat/images
+usr/share/samba/swat/include
+usr/share/samba/swat/lang
+usr/share/man/man8/swat.8
Deleted: branches/samba/experimental/debian/winbind.files
===================================================================
--- branches/samba/experimental/debian/winbind.files 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/winbind.files 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,25 +0,0 @@
-usr/sbin/winbindd
-usr/bin/wbinfo
-usr/bin/ntlm_auth
-usr/lib/samba/idmap/rid.so
-usr/lib/samba/idmap/ad.so
-usr/lib/samba/idmap/adex.so
-usr/lib/samba/idmap/hash.so
-usr/lib/samba/idmap/ldap.so
-usr/lib/samba/idmap/tdb2.so
-usr/share/man/man1/wbinfo.1
-usr/share/man/man1/ntlm_auth.1
-usr/share/man/man8/pam_winbind.8
-usr/share/man/man8/winbindd.8
-usr/share/man/man8/idmap_ad.8
-usr/share/man/man8/idmap_ldap.8
-usr/share/man/man8/idmap_nss.8
-usr/share/man/man8/idmap_rid.8
-usr/share/man/man8/idmap_tdb.8
-usr/share/man/man8/idmap_tdb2.8
-usr/share/man/man8/idmap_adex.8
-usr/share/man/man8/idmap_hash.8
-lib/security/pam_winbind.so
-usr/share/pam-configs/winbind
-lib/libnss_winbind.so.2
-lib/libnss_wins.so.2
Copied: branches/samba/experimental/debian/winbind.install (from rev 3949, tags/samba/2:3.5.11~dfsg-2/debian/winbind.install)
===================================================================
--- branches/samba/experimental/debian/winbind.install (rev 0)
+++ branches/samba/experimental/debian/winbind.install 2011-10-25 02:53:52 UTC (rev 3950)
@@ -0,0 +1,25 @@
+usr/sbin/winbindd
+usr/bin/wbinfo
+usr/bin/ntlm_auth
+usr/lib/samba/idmap/rid.so
+usr/lib/samba/idmap/ad.so
+usr/lib/samba/idmap/adex.so
+usr/lib/samba/idmap/hash.so
+usr/lib/samba/idmap/ldap.so
+usr/lib/samba/idmap/tdb2.so
+usr/share/man/man1/wbinfo.1
+usr/share/man/man1/ntlm_auth.1
+usr/share/man/man8/pam_winbind.8
+usr/share/man/man8/winbindd.8
+usr/share/man/man8/idmap_ad.8
+usr/share/man/man8/idmap_ldap.8
+usr/share/man/man8/idmap_nss.8
+usr/share/man/man8/idmap_rid.8
+usr/share/man/man8/idmap_tdb.8
+usr/share/man/man8/idmap_tdb2.8
+usr/share/man/man8/idmap_adex.8
+usr/share/man/man8/idmap_hash.8
+lib/*/security/pam_winbind.so
+usr/share/pam-configs/winbind
+lib/*/libnss_winbind.so.2
+lib/*/libnss_wins.so.2
Modified: branches/samba/experimental/debian/winbind.lintian-overrides
===================================================================
--- branches/samba/experimental/debian/winbind.lintian-overrides 2011-10-25 02:44:20 UTC (rev 3949)
+++ branches/samba/experimental/debian/winbind.lintian-overrides 2011-10-25 02:53:52 UTC (rev 3950)
@@ -1,5 +1,5 @@
-winbind: no-shlibs-control-file lib/libnss_winbind.so.2
-winbind: no-shlibs-control-file lib/libnss_wins.so.2
-winbind: postinst-must-call-ldconfig lib/libnss_wins.so.2
-winbind: postrm-should-call-ldconfig lib/libnss_wins.so.2
+winbind: no-shlibs-control-file lib/*/libnss_winbind.so.2
+winbind: no-shlibs-control-file lib/*/libnss_wins.so.2
+winbind: postinst-must-call-ldconfig lib/*/libnss_wins.so.2
+winbind: postrm-should-call-ldconfig lib/*/libnss_wins.so.2
winbind: package-name-doesnt-match-sonames libnss-winbind2 libnss-wins2
More information about the Pkg-samba-maint
mailing list