[Pkg-samba-maint] r4103 - trunk/samba/debian

[luk at alioth.debian.org]

tags 674215 pending
thanks

Author: luk
Date: 2012-05-24 18:08:44 +0000 (Thu, 24 May 2012)
New Revision: 4103

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/libwbclient-dev.install
   trunk/samba/debian/rules
Log:
Ship wbclient.pc file in multiarch safe directory (Closes: #674215).

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-05-21 20:14:06 UTC (rev 4102)
+++ trunk/samba/debian/changelog	2012-05-24 18:08:44 UTC (rev 4103)
@@ -7,6 +7,9 @@
   * Update symbols file for libsmbclient and libwbclient0
   * Add lintian overrides for examples in samba-doc
 
+  [ Luk Claes ]
+  * Ship wbclient.pc file in multiarch safe directory (Closes: #674215).
+
  -- Christian Perrier <bubulle at debian.org>  Fri, 18 May 2012 08:45:13 +0200
 
 samba (2:3.6.5-3) unstable; urgency=low

Modified: trunk/samba/debian/libwbclient-dev.install
===================================================================
--- trunk/samba/debian/libwbclient-dev.install	2012-05-21 20:14:06 UTC (rev 4102)
+++ trunk/samba/debian/libwbclient-dev.install	2012-05-24 18:08:44 UTC (rev 4103)
@@ -1,3 +1,3 @@
 usr/lib/*/libwbclient.so
 usr/include/wbclient.h
-../../source3/pkgconfig/wbclient.pc usr/lib/pkgconfig
+usr/lib/*/pkgconfig/wbclient.pc

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2012-05-21 20:14:06 UTC (rev 4102)
+++ trunk/samba/debian/rules	2012-05-24 18:08:44 UTC (rev 4103)
@@ -95,6 +95,8 @@
 	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
+	mkdir -p $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+	install -m 0644 source3/pkgconfig/wbclient.pc $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 
 	# Install samba-common's conffiles - they'll get moved later to their
 	# correct place by dh_install