debian: Multi-arch support.

diff --git a/Makefile.am b/Makefile.am
index 0f24bbc..a1c773c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,6 +132,9 @@ EXTRA_DIST          += debian/catacomb-bin.postinst
 EXTRA_DIST             += debian/catacomb-bin.config
 EXTRA_DIST             += debian/catacomb-bin.templates
 
+## catacomb-data
+EXTRA_DIST             += debian/catacomb-data.install
+
 ## catacomb-dev
 EXTRA_DIST             += debian/catacomb-dev.install
 

diff --git a/debian/catacomb-data.install b/debian/catacomb-data.install
new file mode 100644 (file)
index 0000000..d25242b
--- /dev/null
+++ b/debian/catacomb-data.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man5

diff --git a/debian/catacomb-dev.install b/debian/catacomb-dev.install
index f781d2c..27e1f6c 100644 (file)
--- a/debian/catacomb-dev.install
+++ b/debian/catacomb-dev.install
@@ -1,6 +1,6 @@
 debian/tmp/usr/include
-debian/tmp/usr/lib/catacomb/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/libcatacomb.a
-debian/tmp/usr/lib/libcatacomb.la
-debian/tmp/usr/lib/libcatacomb.so
+debian/tmp/usr/lib/*/catacomb/include
+debian/tmp/usr/lib/*/pkgconfig
+debian/tmp/usr/lib/*/libcatacomb.a
+debian/tmp/usr/lib/*/libcatacomb.la
+debian/tmp/usr/lib/*/libcatacomb.so

diff --git a/debian/catacomb2.install b/debian/catacomb2.install
index b81d6ae..7a31776 100644 (file)
--- a/debian/catacomb2.install
+++ b/debian/catacomb2.install
@@ -1,2 +1 @@
-debian/tmp/usr/lib/libcatacomb.so.*
-debian/tmp/usr/share/man/man5
+debian/tmp/usr/lib/*/libcatacomb.so.*

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/debian/control b/debian/control
index 65cb6bd..248791c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,10 @@ Standards-Version: 3.1.1
 
 Package: catacomb2
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}
-Recommends: catacomb-bin
+Pre-Depends: ${misc:Pre-Depends}
+Recommends: catacomb-bin, catacomb-data
 Breaks: python-catacomb (<< 1.1.2)
 Description: A cryptographic library
  Catacomb is a cryptographic library.  It implements a large number of
@@ -42,6 +44,22 @@ Description: A cryptographic library
  This package contains a tool for key management, a passphrase
  pixie, and other stuff.
 
+Package: catacomb-data
+Architecture: any
+Description: A cryptographic library
+ Catacomb is a cryptographic library.  It implements a large number of
+ encryption algorithms, hash functions, message authentication codes
+ and random number generators.  It has a multi-precision maths library,
+ for implementing public key schemes such as RSA, DSA and Diffie-Hellman.
+ It contains rudimentary key-management tools.
+ .
+ The objective of Catacomb is to make a crypto library which is
+ relatively straightforward to audit for security.  Its focus is on
+ clarity of source code and portability more than performance.
+ .
+ This package contains some documentation files which users of the library
+ may find useful.
+
 Package: catacomb-dev
 Architecture: any
 Depends: catacomb2 (= ${Source-Version}), mlib-dev (>= 2.2.2.1)