Initial packaging for 0.6-1.

4 files changed, 35 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 403bd99..b36dc47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+wallet (0.6-1) unstable; urgency=low
+
+  * New upstream version.
+    - Safer handling of file creation with -f in the client.
+    - The client can get configuration from krb5.conf.
+    - Support get in the client without -f.
+    - Client support for merging keys into an existing keytab.
+    - New client -u option to obtain new Kerberos credentials.
+    - New wallet-admin command-line utility for the server.
+    - The server supports enforcing a local object naming policy.
+    - New wallet-report script (currently Stanford-specific).
+
+ --
+
 wallet (0.5-2) unstable; urgency=low
 
   * Hard-code lsdb-new.stanford.edu as the wallet server name for the time
diff --git a/debian/copyright b/debian/copyright
index a483263..ea33fb5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,26 +2,26 @@ Packaged for Debian by Russ Allbery <rra@debian.org>            2007-03-08
 
 It was downloaded from:
 
-    <http://www.eyrie.org/~eagle/software/wallet/>
+  <http://www.eyrie.org/~eagle/software/wallet/>
 
 Upstream author:
 
-    Russ Allbery <rra@stanford.edu>
+  Russ Allbery <rra@stanford.edu>
 
 Debian packaging copyright:
 
-    Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr.
-    University.
+  Copyright 2006, 2007, 2008 Board of Trustees, Leland Stanford Jr.
+  University.
 
-    All files and modifications related to Debian packaging are covered
-    under the same license terms as the rest of the package.
+  All files and modifications related to Debian packaging are covered
+  under the same license terms as the rest of the package.
 
 Copyright:
 
 The wallet package as a whole is:
 
-  Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University.
-  All rights reserved.
+  Copyright 2006, 2007, 2008 Board of Trustees, Leland Stanford Jr.
+  University.  All rights reserved.
 
 and covered under the following license:
 
@@ -47,8 +47,8 @@ files.
 
 Collected copyright notices for the entire package:
 
-  Copyright 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007
-      Board of Trustees, Leland Stanford Jr. University.
+  Copyright 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007,
+      2008 Board of Trustees, Leland Stanford Jr. University
   Copyright 2000, 2001, 2004 Russ Allbery <rra@stanford.edu>
   Copyright 2004, 2005, 2006
       by Internet Systems Consortium, Inc. ("ISC")
@@ -144,9 +144,7 @@ license:
 
 For the wallet distribution, the option described in the last paragraph
 has been accepted and these files are distributed under the same terms as
-the wallet package as a whole, as described at the top of this file.  You
-can find the GPL version 2 in /usr/share/common-licenses/GPL-2 on Debian
-systems.
+the wallet package as a whole, as described at the top of this file.
 
 The file build-aux/install-sh is covered by the following copyright and
 license:
diff --git a/debian/rules b/debian/rules
index 0d9315f..3f77918 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,10 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+# Used only for the man page.
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \
+		| cut -d- -f1)
+
 # Tell Autoconf the correct system types.  We need to know the host
 # architecture to determine whether setpag is available.
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -60,6 +64,9 @@ install: build-stamp
 	DH_OPTIONS= dh_install --fail-missing
 	install -m 0644 config/keytab.acl \
 	    $(CURDIR)/debian/keytab-backend/etc/remctl/acl/keytab
+	pod2man --section=8 --release=$(VERSION) --center="System Commands" \
+	    contrib/wallet-report \
+	    > $(CURDIR)/debian/wallet-server/usr/share/man/man8/wallet-report.8
 
 binary: binary-arch binary-indep
 
diff --git a/debian/wallet-server.install b/debian/wallet-server.install
index 980789e..c32624a 100644
--- a/debian/wallet-server.install
+++ b/debian/wallet-server.install
@@ -1,6 +1,9 @@
+debian/tmp/usr/sbin/wallet-admin
 debian/tmp/usr/sbin/wallet-backend
 debian/tmp/usr/share/man/man3/*.3pm
+debian/tmp/usr/share/man/man8/wallet-admin.8
 debian/tmp/usr/share/man/man8/wallet-backend.8
 debian/tmp/usr/share/perl5
 
 config/wallet                   etc/remctl/conf.d
+contrib/wallet-report           usr/sbin/wallet-report