Update for upstream 0.12 release

Stop installing the wallet-summary contrib script in /usr/sbin and
instead install all the useful contrib scripts into the examples
directory, telling debhelper to not compress them.

5 files changed, 26 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 698b516..d60d277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+wallet (0.12-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - New wallet-rekey client program to rekey a keytab.
+    - New ACL type krb5-regex for the server.
+    - New objects unused wallet-report report.
+    - New acls duplicate wallet-report report.
+    - Add a help command to wallet-report.
+  * Don't install wallet-summary in /usr/sbin in the wallet-server package
+    and instead install it in /usr/share/doc/wallet-server/examples.  This
+    program is Stanford-specific and would require extensive changes for
+    other sites.
+  * Install the other contrib scripts except convert-srvtab-db to the
+    examples directory for wallet-server.
+
+ -- Russ Allbery <rra@debian.org>  Wed, 25 Aug 2010 18:03:49 -0700
+
 wallet (0.11-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index e920649..0f9efbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,3 +16,6 @@ override_dh_auto_install:
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
+
+override_dh_compress:
+	dh_compress -X examples
diff --git a/debian/wallet-client.install b/debian/wallet-client.install
index ec2d8c7..2940357 100644
--- a/debian/wallet-client.install
+++ b/debian/wallet-client.install
@@ -1,2 +1,4 @@
 debian/tmp/usr/bin/wallet
+debian/tmp/usr/bin/wallet-rekey
 debian/tmp/usr/share/man/man1/wallet.1
+debian/tmp/usr/share/man/man1/wallet-rekey.1
diff --git a/debian/wallet-server.examples b/debian/wallet-server.examples
new file mode 100644
index 0000000..bb13c59
--- /dev/null
+++ b/debian/wallet-server.examples
@@ -0,0 +1,4 @@
+contrib/used-principals
+contrib/wallet-contacts
+contrib/wallet-summary
+contrib/wallet-unknown-hosts
diff --git a/debian/wallet-server.install b/debian/wallet-server.install
index ca3e49d..9271899 100644
--- a/debian/wallet-server.install
+++ b/debian/wallet-server.install
@@ -8,5 +8,3 @@ debian/tmp/usr/share/man/man8/wallet-report.8
 debian/tmp/usr/share/perl5
 
 config/wallet                   etc/remctl/conf.d
-contrib/wallet-summary          usr/sbin
-contrib/wallet-summary.8        usr/share/man/man8