[Pkg-samba-maint] [samba] 01/01: Add so version to the private libraries so dpkg-shlibdeps works
Jeroen Dekkers
dekkers-guest at alioth.debian.org
Fri Aug 16 17:34:09 UTC 2013
This is an automated email from the git hooks/post-receive script.
dekkers-guest pushed a commit to branch samba_4.0
in repository samba.
commit 93149bd0bb71705d45a40627e5c06677e657ae8b
Author: Jeroen Dekkers <jeroen at dekkers.ch>
Date: Fri Aug 16 19:33:41 2013 +0200
Add so version to the private libraries so dpkg-shlibdeps works
---
debian/libdcerpc-server0.install | 6 ++---
debian/libdcerpc0.install | 8 +++---
debian/libgensec0.install | 26 ++++++++++----------
debian/libndr-standard0.install | 12 ++++-----
debian/libregistry0.install | 2 +-
debian/libsamba-hostconfig0.install | 10 ++++----
debian/libsamba-util0.install | 22 ++++++++---------
debian/libsamdb0.install | 6 ++---
debian/libsmbclient-raw0.install | 14 +++++------
debian/libsmbd0.install | 8 +++---
debian/patches/add-so-version-to-private-libraries | 21 ++++++++++++++++
debian/patches/series | 1 +
debian/python-samba.install | 2 +-
debian/samba-ad-dc.install | 12 ++++-----
debian/samba-common-bin.install | 26 ++++++++++----------
debian/samba-dsdb-modules.install | 2 +-
debian/samba-testsuite.install | 2 +-
debian/winbind.install | 4 +--
18 files changed, 103 insertions(+), 81 deletions(-)
diff --git a/debian/libdcerpc-server0.install b/debian/libdcerpc-server0.install
index 8ef93f1..0074bd5 100644
--- a/debian/libdcerpc-server0.install
+++ b/debian/libdcerpc-server0.install
@@ -1,4 +1,4 @@
usr/lib/*/libdcerpc-server.so.*
-usr/lib/*/samba/libLIBWBCLIENT_OLD.so
-usr/lib/*/samba/libauth4.so
-usr/lib/*/samba/libauth_unix_token.so
+usr/lib/*/samba/libLIBWBCLIENT_OLD.so.*
+usr/lib/*/samba/libauth4.so.*
+usr/lib/*/samba/libauth_unix_token.so.*
diff --git a/debian/libdcerpc0.install b/debian/libdcerpc0.install
index f255f45..d799865 100644
--- a/debian/libdcerpc0.install
+++ b/debian/libdcerpc0.install
@@ -2,7 +2,7 @@ usr/lib/*/libdcerpc-atsvc.so.*
usr/lib/*/libdcerpc-binding.so.*
usr/lib/*/libdcerpc-samr.so.*
usr/lib/*/libdcerpc.so.*
-usr/lib/*/samba/libHDB_SAMBA4.so
-usr/lib/*/samba/libdcerpc-samba.so
-usr/lib/*/samba/libdcerpc-samba4.so
-usr/lib/*/samba/libsamba-net.so
+usr/lib/*/samba/libHDB_SAMBA4.so.*
+usr/lib/*/samba/libdcerpc-samba.so.*
+usr/lib/*/samba/libdcerpc-samba4.so.*
+usr/lib/*/samba/libsamba-net.so.*
diff --git a/debian/libgensec0.install b/debian/libgensec0.install
index e70c7fe..28db0b4 100644
--- a/debian/libgensec0.install
+++ b/debian/libgensec0.install
@@ -1,15 +1,15 @@
usr/lib/*/libgensec.so.0*
usr/lib/*/samba/gensec/*.so
-usr/lib/*/samba/libauth_sam_reply.so
-usr/lib/*/samba/libauthkrb5.so
-usr/lib/*/samba/libcli-ldap-common.so
-usr/lib/*/samba/libcli-ldap.so
-usr/lib/*/samba/libcli-nbt.so
-usr/lib/*/samba/libcli_cldap.so
-usr/lib/*/samba/libcli_smb_common.so
-usr/lib/*/samba/libcliauth.so
-usr/lib/*/samba/libcmdline-credentials.so
-usr/lib/*/samba/libdb-glue.so
-usr/lib/*/samba/libkrb5samba.so
-usr/lib/*/samba/libsmb_transport.so
-usr/lib/*/samba/libwinbind-client.so
+usr/lib/*/samba/libauth_sam_reply.so.*
+usr/lib/*/samba/libauthkrb5.so.*
+usr/lib/*/samba/libcli-ldap-common.so.*
+usr/lib/*/samba/libcli-ldap.so.*
+usr/lib/*/samba/libcli-nbt.so.*
+usr/lib/*/samba/libcli_cldap.so.*
+usr/lib/*/samba/libcli_smb_common.so.*
+usr/lib/*/samba/libcliauth.so.*
+usr/lib/*/samba/libcmdline-credentials.so.*
+usr/lib/*/samba/libdb-glue.so.*
+usr/lib/*/samba/libkrb5samba.so.*
+usr/lib/*/samba/libsmb_transport.so.*
+usr/lib/*/samba/libwinbind-client.so.*
diff --git a/debian/libndr-standard0.install b/debian/libndr-standard0.install
index 1f9cd7a..6726c3a 100644
--- a/debian/libndr-standard0.install
+++ b/debian/libndr-standard0.install
@@ -1,9 +1,9 @@
usr/lib/*/libndr-krb5pac.so.*
usr/lib/*/libndr-nbt.so.0*
usr/lib/*/libndr-standard.so.*
-usr/lib/*/samba/libndr-samba.so
-usr/lib/*/samba/libndr-samba4.so
-usr/lib/*/samba/libnpa_tstream.so
-usr/lib/*/samba/libsamba-security.so
-usr/lib/*/samba/libsamba-sockets.so
-usr/lib/*/samba/libxattr_tdb.so
+usr/lib/*/samba/libndr-samba.so.*
+usr/lib/*/samba/libndr-samba4.so.*
+usr/lib/*/samba/libnpa_tstream.so.*
+usr/lib/*/samba/libsamba-security.so.*
+usr/lib/*/samba/libsamba-sockets.so.*
+usr/lib/*/samba/libxattr_tdb.so.*
diff --git a/debian/libregistry0.install b/debian/libregistry0.install
index fef87c2..68a0fd4 100644
--- a/debian/libregistry0.install
+++ b/debian/libregistry0.install
@@ -1,2 +1,2 @@
usr/lib/*/libregistry.so.*
-usr/lib/*/samba/libutil_reg.so
+usr/lib/*/samba/libutil_reg.so.*
diff --git a/debian/libsamba-hostconfig0.install b/debian/libsamba-hostconfig0.install
index 8f5fc46..48e2efb 100644
--- a/debian/libsamba-hostconfig0.install
+++ b/debian/libsamba-hostconfig0.install
@@ -1,6 +1,6 @@
usr/lib/*/libsamba-hostconfig.so.*
-usr/lib/*/samba/libcluster.so
-usr/lib/*/samba/libnetif.so
-usr/lib/*/samba/libserver-role.so
-usr/lib/*/samba/libshares.so
-usr/lib/*/samba/libtdb-wrap.so
+usr/lib/*/samba/libcluster.so.*
+usr/lib/*/samba/libnetif.so.*
+usr/lib/*/samba/libserver-role.so.*
+usr/lib/*/samba/libshares.so.*
+usr/lib/*/samba/libtdb-wrap.so.*
diff --git a/debian/libsamba-util0.install b/debian/libsamba-util0.install
index eb0a573..5b2c928 100644
--- a/debian/libsamba-util0.install
+++ b/debian/libsamba-util0.install
@@ -1,13 +1,13 @@
usr/lib/*/libsamba-util.so.*
usr/lib/*/libtevent-util.so.*
-usr/lib/*/samba/libasn1util.so
-usr/lib/*/samba/liberrors.so
-usr/lib/*/samba/libevents.so
-usr/lib/*/samba/libflag_mapping.so
-usr/lib/*/samba/libiniparser.so
-usr/lib/*/samba/libinterfaces.so
-usr/lib/*/samba/libsamba-modules.so
-usr/lib/*/samba/libsamba3-util.so
-usr/lib/*/samba/libsmbpasswdparser.so
-usr/lib/*/samba/libutil_setid.so
-usr/lib/*/samba/libutil_tdb.so
+usr/lib/*/samba/libasn1util.so.*
+usr/lib/*/samba/liberrors.so.*
+usr/lib/*/samba/libevents.so.*
+usr/lib/*/samba/libflag_mapping.so.*
+usr/lib/*/samba/libiniparser.so.*
+usr/lib/*/samba/libinterfaces.so.*
+usr/lib/*/samba/libsamba-modules.so.*
+usr/lib/*/samba/libsamba3-util.so.*
+usr/lib/*/samba/libsmbpasswdparser.so.*
+usr/lib/*/samba/libutil_setid.so.*
+usr/lib/*/samba/libutil_tdb.so.*
diff --git a/debian/libsamdb0.install b/debian/libsamdb0.install
index 8a5af59..596331a 100644
--- a/debian/libsamdb0.install
+++ b/debian/libsamdb0.install
@@ -1,4 +1,4 @@
usr/lib/*/libsamdb.so.*
-usr/lib/*/samba/libldb-cmdline.so
-usr/lib/*/samba/libldbsamba.so
-usr/lib/*/samba/libsamdb-common.so
+usr/lib/*/samba/libldb-cmdline.so.*
+usr/lib/*/samba/libldbsamba.so.*
+usr/lib/*/samba/libsamdb-common.so.*
diff --git a/debian/libsmbclient-raw0.install b/debian/libsmbclient-raw0.install
index 52f90fe..1d67041 100644
--- a/debian/libsmbclient-raw0.install
+++ b/debian/libsmbclient-raw0.install
@@ -1,9 +1,9 @@
usr/lib/*/libsmbclient-raw.so.0*
usr/lib/*/libsmbconf.so.0
-usr/lib/*/samba/libCHARSET3.so
-usr/lib/*/samba/libaddns.so
-usr/lib/*/samba/libgse.so
-usr/lib/*/samba/liblibsmb.so
-usr/lib/*/samba/libsecrets3.so
-usr/lib/*/samba/libsmbregistry.so
-usr/lib/*/samba/libutil_cmdline.so
+usr/lib/*/samba/libCHARSET3.so.*
+usr/lib/*/samba/libaddns.so.*
+usr/lib/*/samba/libgse.so.*
+usr/lib/*/samba/liblibsmb.so.*
+usr/lib/*/samba/libsecrets3.so.*
+usr/lib/*/samba/libsmbregistry.so.*
+usr/lib/*/samba/libutil_cmdline.so.*
diff --git a/debian/libsmbd0.install b/debian/libsmbd0.install
index a6a4fa5..3655db0 100644
--- a/debian/libsmbd0.install
+++ b/debian/libsmbd0.install
@@ -1,8 +1,8 @@
usr/lib/*/samba/auth/
-usr/lib/*/samba/libauth.so
-usr/lib/*/samba/libsmbd_base.so
-usr/lib/*/samba/libsmbd_conn.so
-usr/lib/*/samba/libsmbd_shim.so
+usr/lib/*/samba/libauth.so.*
+usr/lib/*/samba/libsmbd_base.so.*
+usr/lib/*/samba/libsmbd_conn.so.*
+usr/lib/*/samba/libsmbd_shim.so.*
usr/lib/*/samba/vfs/*.so
usr/share/man/man8/vfs_acl_tdb.8
usr/share/man/man8/vfs_acl_xattr.8
diff --git a/debian/patches/add-so-version-to-private-libraries b/debian/patches/add-so-version-to-private-libraries
new file mode 100644
index 0000000..1e438ce
--- /dev/null
+++ b/debian/patches/add-so-version-to-private-libraries
@@ -0,0 +1,21 @@
+From: Jeroen Dekkers <jeroen at dekkers.ch>
+Subject: Add so version number to private libraries for dpkg-shlibdeps
+Origin: vendor
+Forwarded: not-needed
+
+We also want dpkg-shlibdeps to generate correct dependency information
+for the private libraries in our binary packages, but dpkg-shlibdeps
+only works when the library has a version number.
+
+--- a/buildtools/wafsamba/wafsamba.py
++++ b/buildtools/wafsamba/wafsamba.py
+@@ -207,6 +207,9 @@
+ raise Utils.WafError("public library '%s' must have header files" %
+ libname)
+
++ if private_library and not vnum:
++ vnum = '0'
++
+ if target_type == 'PYTHON' or realname or not private_library:
+ bundled_name = libname.replace('_', '-')
+ else:
diff --git a/debian/patches/series b/debian/patches/series
index f8139c8..5234377 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ smbclient-pager.patch
usershare.patch
VERSION.patch
waf_smbpasswd_location
+add-so-version-to-private-libraries
diff --git a/debian/python-samba.install b/debian/python-samba.install
index b4a27f3..d16be54 100644
--- a/debian/python-samba.install
+++ b/debian/python-samba.install
@@ -1,2 +1,2 @@
-usr/lib/*/samba/libsamba_python.so
+usr/lib/*/samba/libsamba_python.so.*
usr/lib/python*/*-packages/samba
diff --git a/debian/samba-ad-dc.install b/debian/samba-ad-dc.install
index 1e23150..48d4f0e 100644
--- a/debian/samba-ad-dc.install
+++ b/debian/samba-ad-dc.install
@@ -2,12 +2,12 @@ usr/bin/oLschema2ldif
usr/lib/*/samba/bind9/dlz_bind9.so
usr/lib/*/samba/bind9/dlz_bind9_9.so
usr/lib/*/samba/hdb/hdb_samba4.so
-usr/lib/*/samba/libdfs_server_ad.so
-usr/lib/*/samba/libntvfs.so
-usr/lib/*/samba/libpac.so
-usr/lib/*/samba/libposix_eadb.so
-usr/lib/*/samba/libprocess_model.so
-usr/lib/*/samba/libservice.so
+usr/lib/*/samba/libdfs_server_ad.so.*
+usr/lib/*/samba/libntvfs.so.*
+usr/lib/*/samba/libpac.so.*
+usr/lib/*/samba/libposix_eadb.so.*
+usr/lib/*/samba/libprocess_model.so.*
+usr/lib/*/samba/libservice.so.*
usr/lib/*/samba/process_model/*.so
usr/lib/*/samba/service/*.so
usr/sbin/samba
diff --git a/debian/samba-common-bin.install b/debian/samba-common-bin.install
index 9d55c17..960b87e 100644
--- a/debian/samba-common-bin.install
+++ b/debian/samba-common-bin.install
@@ -6,19 +6,19 @@ usr/bin/smbpasswd
usr/bin/testparm
usr/lib/*/libpdb.so.0
usr/lib/*/libsmbldap.so.0
-usr/lib/*/samba/libads.so
-usr/lib/*/samba/libcli_spoolss.so
-usr/lib/*/samba/libdbwrap.so
-usr/lib/*/samba/libgpo.so
-usr/lib/*/samba/liblibcli_lsa3.so
-usr/lib/*/samba/liblibcli_netlogon3.so
-usr/lib/*/samba/libmsrpc3.so
-usr/lib/*/samba/libnet_keytab.so
-usr/lib/*/samba/libpopt_samba3.so
-usr/lib/*/samba/libprinting_migrate.so
-usr/lib/*/samba/libsmbldaphelper.so
-usr/lib/*/samba/libtdb_compat.so
-usr/lib/*/samba/libtrusts_util.so
+usr/lib/*/samba/libads.so.*
+usr/lib/*/samba/libcli_spoolss.so.*
+usr/lib/*/samba/libdbwrap.so.*
+usr/lib/*/samba/libgpo.so.*
+usr/lib/*/samba/liblibcli_lsa3.so.*
+usr/lib/*/samba/liblibcli_netlogon3.so.*
+usr/lib/*/samba/libmsrpc3.so.*
+usr/lib/*/samba/libnet_keytab.so.*
+usr/lib/*/samba/libpopt_samba3.so.*
+usr/lib/*/samba/libprinting_migrate.so.*
+usr/lib/*/samba/libsmbldaphelper.so.*
+usr/lib/*/samba/libtdb_compat.so.*
+usr/lib/*/samba/libtrusts_util.so.*
usr/lib/tmpfiles.d/samba.conf
usr/sbin/samba_kcc
usr/share/man/man1/dbwrap_tool.1
diff --git a/debian/samba-dsdb-modules.install b/debian/samba-dsdb-modules.install
index f0248a6..caa3211 100644
--- a/debian/samba-dsdb-modules.install
+++ b/debian/samba-dsdb-modules.install
@@ -1,3 +1,3 @@
usr/lib/*/ldb
usr/lib/*/samba/ldb
-usr/lib/*/samba/libdsdb-module.so
+usr/lib/*/samba/libdsdb-module.so.*
diff --git a/debian/samba-testsuite.install b/debian/samba-testsuite.install
index 5ab1799..331cb40 100644
--- a/debian/samba-testsuite.install
+++ b/debian/samba-testsuite.install
@@ -3,7 +3,7 @@ usr/bin/locktest
usr/bin/masktest
usr/bin/ndrdump
usr/bin/smbtorture
-usr/lib/*/samba/libdlz_bind9_for_torture.so
+usr/lib/*/samba/libdlz_bind9_for_torture.so.*
usr/share/man/man1/gentest.1
usr/share/man/man1/locktest.1
usr/share/man/man1/masktest.1
diff --git a/debian/winbind.install b/debian/winbind.install
index 64edcb7..1504e0b 100644
--- a/debian/winbind.install
+++ b/debian/winbind.install
@@ -3,8 +3,8 @@ usr/bin/ntlm_auth
usr/bin/wbinfo
usr/lib/*/plugin/krb5/winbind_krb5_locator.so
usr/lib/*/samba/idmap
-usr/lib/*/samba/libidmap.so
-usr/lib/*/samba/libnss_info.so
+usr/lib/*/samba/libidmap.so.*
+usr/lib/*/samba/libnss_info.so.*
usr/lib/*/samba/nss_info
usr/sbin/winbindd
usr/share/man/man1/ntlm_auth.1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint
mailing list