Split underlying machinery into a separate package.

diff --git a/Makefile.am b/Makefile.am
index ca70920..2f90bbe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -205,6 +205,8 @@ EXTRA_DIST          += config/auto-version
 EXTRA_DIST             += debian/changelog debian/control debian/copyright
 EXTRA_DIST             += debian/rules debian/compat
 
+EXTRA_DIST             += debian/distorted-keys-base.install
+
 EXTRA_DIST             += debian/distorted-keys.install
 EXTRA_DIST             += debian/distorted-keys.postinst
 

diff --git a/debian/.gitignore b/debian/.gitignore
index ddf56e8..f03171c 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,4 +1,5 @@
 build
+distorted-keys-base
 distorted-keys
 claim-dir
 tmp

diff --git a/debian/control b/debian/control
index 0e334b7..892543c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,22 @@ Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Build-Depends: python (>= 2.5), debhelper (>= 8.1.2)
 Standards-Version: 3.1.1
 
-Package: distorted-keys
+Package: distorted-keys-base
 Architecture: all
-Depends: python (>= 2.5), userv, openssl (>= 0.9.8o), adduser
+Depends: openssl (>= 0.9.8o)
 Recommends: gnupg, claim-dir
-Suggests: seccure, texlive-latex-recommended, qrencode
+Suggests: seccure
+Description: Underlying machinery for distorted.org.uk key-management system.
+ This package contains the libraries and key-type definitions for the
+ distorted.org.uk key-management system.  It also contains a script suitable
+ for doing public-key operations without any of the `userv' machinery
+ required by the full system.  It might therefore be useful to install this
+ package on satellite systems, even if they don't have the full system.
+
+Package: distorted-keys
+Architecture: all
+Depends: distorted-keys-base, python (>= 2.5), userv, adduser
+Suggests: texlive-latex-recommended, qrencode
 Description: Basic key-management system with secure recovery features.
  The primary purpose of the distorted.org.uk key management system is
  to provide a secure way of recovering important cryptographic keys,

diff --git a/debian/distorted-keys-base.install b/debian/distorted-keys-base.install
new file mode 100644 (file)
index 0000000..a211378
--- /dev/null
+++ b/debian/distorted-keys-base.install
@@ -0,0 +1,5 @@
+usr/bin/pubkeyop
+usr/lib/distorted-keys/keyfunc.sh
+usr/lib/distorted-keys/ktype.*
+
+keys.conf                              /etc/distorted-keys

diff --git a/debian/distorted-keys.install b/debian/distorted-keys.install
index 8ff9b4c..67dab71 100644 (file)
--- a/debian/distorted-keys.install
+++ b/debian/distorted-keys.install
@@ -1,9 +1,11 @@
-usr/bin
+usr/bin/cryptop
+usr/bin/extract-profile
+usr/bin/shamir
 usr/sbin/keys
-usr/lib/distorted-keys
-etc/distorted-keys
+usr/lib/distorted-keys/keys.*
+usr/lib/distorted-keys/cryptop.*
+etc/distorted-keys/profile.d
 
 debian/build/userv/distorted-keys      /etc/userv/default.d
 debian/admin.users                     /etc/distorted-keys
 debian/admin.groups                    /etc/distorted-keys
-keys.conf                              /etc/distorted-keys