[Pkg-samba-maint] r3907 - trunk/samba/debian
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Mon Sep 26 18:42:17 UTC 2011
Author: vorlon
Date: 2011-09-26 18:42:16 +0000 (Mon, 26 Sep 2011)
New Revision: 3907
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/clean
trunk/samba/debian/compat
trunk/samba/debian/control
trunk/samba/debian/libpam-smbpass.install
trunk/samba/debian/libsmbclient-dev.install
trunk/samba/debian/libsmbclient.install
trunk/samba/debian/libwbclient-dev.install
trunk/samba/debian/libwbclient0.install
trunk/samba/debian/rules
trunk/samba/debian/winbind.install
trunk/samba/debian/winbind.lintian-overrides
Log:
Bump to debhelper compat level 9 and build libraries for multiarch.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/changelog 2011-09-26 18:42:16 UTC (rev 3907)
@@ -16,6 +16,7 @@
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.
-- Steve Langasek <vorlon at debian.org> Sat, 24 Sep 2011 13:36:50 -0700
Modified: trunk/samba/debian/clean
===================================================================
--- trunk/samba/debian/clean 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/clean 2011-09-26 18:42:16 UTC (rev 3907)
@@ -4,4 +4,3 @@
source3/lib/netapi/tests/Makefile
source3/lib/netapi/examples/Makefile
examples/libsmbclient/Makefile.internal
-
Modified: trunk/samba/debian/compat
===================================================================
--- trunk/samba/debian/compat 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/compat 2011-09-26 18:42:16 UTC (rev 3907)
@@ -1 +1 @@
-7
+9
Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/control 2011-09-26 18:42:16 UTC (rev 3907)
@@ -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.1.3~), 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
@@ -176,7 +179,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: ${misc:Pre-Depends}
+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 +213,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),
Modified: trunk/samba/debian/libpam-smbpass.install
===================================================================
--- trunk/samba/debian/libpam-smbpass.install 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/libpam-smbpass.install 2011-09-26 18:42:16 UTC (rev 3907)
@@ -1,2 +1,2 @@
-lib/security/pam_smbpass.so
+lib/*/security/pam_smbpass.so
usr/share/pam-configs/smbpasswd-migrate
Modified: trunk/samba/debian/libsmbclient-dev.install
===================================================================
--- trunk/samba/debian/libsmbclient-dev.install 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/libsmbclient-dev.install 2011-09-26 18:42:16 UTC (rev 3907)
@@ -1,3 +1,3 @@
-usr/lib/samba/libsmbclient.a usr/lib
-usr/lib/samba/libsmbclient.so usr/lib
+usr/lib/*/libsmbclient.a
+usr/lib/*/libsmbclient.so
usr/include/libsmbclient.h
Modified: trunk/samba/debian/libsmbclient.install
===================================================================
--- trunk/samba/debian/libsmbclient.install 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/libsmbclient.install 2011-09-26 18:42:16 UTC (rev 3907)
@@ -1,2 +1,2 @@
-usr/lib/samba/libsmbclient.so.0 usr/lib
+usr/lib/*/libsmbclient.so.0
usr/share/man/man7/libsmbclient.7
Modified: trunk/samba/debian/libwbclient-dev.install
===================================================================
--- trunk/samba/debian/libwbclient-dev.install 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/libwbclient-dev.install 2011-09-26 18:42:16 UTC (rev 3907)
@@ -1,3 +1,3 @@
-usr/lib/samba/libwbclient.so usr/lib
+usr/lib/*/libwbclient.so
usr/include/wbclient.h
usr/include/wbc_async.h
Modified: trunk/samba/debian/libwbclient0.install
===================================================================
--- trunk/samba/debian/libwbclient0.install 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/libwbclient0.install 2011-09-26 18:42:16 UTC (rev 3907)
@@ -1 +1 @@
-usr/lib/samba/libwbclient.so.0 usr/lib
+usr/lib/*/libwbclient.so.0
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/rules 2011-09-26 18:42:16 UTC (rev 3907)
@@ -3,6 +3,7 @@
# Set the host and build architectures for use with config.cache loading,
# cross-building, etc.
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
CFLAGS = -g -Wall
@@ -22,11 +23,10 @@
--with-fhs \
--enable-shared \
--enable-static \
- --libdir=/usr/lib/samba \
--with-privatedir=/etc/samba \
--with-piddir=/var/run/samba \
--with-rootsbindir=/sbin \
- --with-pammodulesdir=/lib/security \
+ --with-pammodulesdir=/lib/$(DEB_HOST_MULTIARCH)/security \
--with-pam \
--with-syslog \
--with-utmp \
@@ -93,8 +93,8 @@
# Install other stuff not installed by "make install"
install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
- 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 -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
@@ -146,3 +146,4 @@
override_dh_makeshlibs:
dh_makeshlibs -plibsmbclient -V'libsmbclient (>= 2:3.2.0)'
dh_makeshlibs -plibwbclient0 -V'libwbclient0 (>= 2:3.5.0~pre2)'
+ dh_makeshlibs -pwinbind
Modified: trunk/samba/debian/winbind.install
===================================================================
--- trunk/samba/debian/winbind.install 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/winbind.install 2011-09-26 18:42:16 UTC (rev 3907)
@@ -19,7 +19,7 @@
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
+lib/*/security/pam_winbind.so
usr/share/pam-configs/winbind
-lib/libnss_winbind.so.2
-lib/libnss_wins.so.2
+lib/*/libnss_winbind.so.2
+lib/*/libnss_wins.so.2
Modified: trunk/samba/debian/winbind.lintian-overrides
===================================================================
--- trunk/samba/debian/winbind.lintian-overrides 2011-09-26 16:32:22 UTC (rev 3906)
+++ trunk/samba/debian/winbind.lintian-overrides 2011-09-26 18:42:16 UTC (rev 3907)
@@ -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/*llibnss_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