[Pkg-gnutls-commits] r1473 - in /packages/p11-kit/trunk/debian: changelog control p11-kit.install rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Apr 15 16:54:22 2012
New Revision: 1473

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1473
Log:
Ship p11-kit proxy module with package p11-kit in directory /usr/lib.
Closes: #656623

Modified:
    packages/p11-kit/trunk/debian/changelog
    packages/p11-kit/trunk/debian/control
    packages/p11-kit/trunk/debian/p11-kit.install
    packages/p11-kit/trunk/debian/rules

Modified: packages/p11-kit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/changelog?rev=1473&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/changelog (original)
+++ packages/p11-kit/trunk/debian/changelog Sun Apr 15 16:54:22 2012
@@ -6,6 +6,8 @@
       #651595.
     + 11_crash-when-duplicate: Do not crash on duplicate modules. See
       LP#911436, this replaces Ubuntu's duplicate-module-fix.patch.
+  * Ship p11-kit proxy module with package p11-kit in directory /usr/lib.
+    Closes: #656623
 
  -- Andreas Metzler <ametzler at debian.org>  Wed, 14 Mar 2012 18:27:15 +0100
 

Modified: packages/p11-kit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/control?rev=1473&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/control (original)
+++ packages/p11-kit/trunk/debian/control Sun Apr 15 16:54:22 2012
@@ -47,7 +47,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: foreign
-Description: Utilities for working with the p11-glue library
+Description: Utilities for working with the p11-glue library and proxy module
  Provides a way to load and enumerate PKCS#11 modules. Provides a standard
  configuration setup for installing PKCS#11 modules in such a way that
  they're discoverable.
@@ -55,4 +55,5 @@
  Also solves problems with coordinating the use of PKCS#11 by different
  components or libraries living in the same process.
  .
- This package contains the p11-kit tool for listing PKCS#11 modules.
+ This package contains the p11-kit tool for listing PKCS#11 modules and
+ the p11-kit proxy module.

Modified: packages/p11-kit/trunk/debian/p11-kit.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/p11-kit.install?rev=1473&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/p11-kit.install (original)
+++ packages/p11-kit/trunk/debian/p11-kit.install Sun Apr 15 16:54:22 2012
@@ -1,1 +1,2 @@
 usr/bin/*
+usr/lib/p11-kit-proxy.so

Modified: packages/p11-kit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/rules?rev=1473&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/rules (original)
+++ packages/p11-kit/trunk/debian/rules Sun Apr 15 16:54:22 2012
@@ -7,5 +7,12 @@
 	dh_auto_configure --verbose -- \
 		--disable-silent-rules
 
+override_dh_auto_install:
+	dh_auto_install
+	cd `dirname debian/tmp/usr/lib/*/p11-kit-proxy.so` && \
+		rm -f p11-kit-proxy.so && \
+		cd .. && \
+		ln -vs */libp11-kit.so.*.*.* p11-kit-proxy.so
+
 %:
 	dh $@