[pkg-opensc-commit] [SCM] libp11 packaging branch, master, updated. 3581745a67134c4262ccff91218655d9f8de7884

[Eric Dorland]

The following commit has been merged in the master branch:
commit d3bc838ffddb63e5b21d02e8a9ccf6c5fa729283
Author: Eric Dorland <eric at debian.org>
Date:   Sat Sep 24 20:04:43 2011 -0400

    debian/control, debian/libp11-2.install, debian/libp11-dev.install: Convert the package to Multi-Arch.

diff --git a/debian/changelog b/debian/changelog
index 886c4fd..4c7e219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libp11 (0.2.8-2) unstable; urgency=low
 
   * debian/compat, debian/control: Use debhelper compat level v9.
+  * debian/control, debian/libp11-2.install, debian/libp11-dev.install:
+    Convert the package to Multi-Arch.
 
  --
 
diff --git a/debian/control b/debian/control
index fb34f8a..1baa67c 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,9 @@ Description: pkcs#11 convenience library - development files
 
 Package: libp11-2
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: pkcs#11 convenience library
  Libp11 is a library to simplify using smart cards via PKCS#11
@@ -29,6 +31,7 @@ Description: pkcs#11 convenience library
 
 Package: libp11-2-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: libp11-2 (= ${binary:Version}), ${misc:Depends}
diff --git a/debian/libp11-2.install b/debian/libp11-2.install
index c45ebcf..cdae829 100644
--- a/debian/libp11-2.install
+++ b/debian/libp11-2.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/*/lib*.so.*
diff --git a/debian/libp11-dev.install b/debian/libp11-dev.install
index 33c14b5..a6a8693 100644
--- a/debian/libp11-dev.install
+++ b/debian/libp11-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/lib*.a
+debian/tmp/usr/lib/*/lib*.so
+debian/tmp/usr/lib/*/pkgconfig/*

-- 
libp11 packaging