Merge commit 'dkg/master'

4 files changed, 4 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 8f0e77a..d032017 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 monkeysphere (0.15~pre-1) UNRELEASED; urgency=low
 
-  * porting work: clarifying makefiles, pruning dependencies, etc.
+  * porting work and packaging simplification: clarifying makefiles,
+    pruning dependencies, etc.
   * added tests to monkeysphere-server diagnostics
+  * moved monkeysphere(5) to section 7 of the manual
+  * now shipping TODO in /usr/share/doc/monkeysphere
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 04 Sep 2008 19:08:40 -0400
 
diff --git a/debian/monkeysphere.docs b/debian/monkeysphere.docs
deleted file mode 100644
index 398bc5a..0000000
--- a/debian/monkeysphere.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-doc/getting-started-user.mdwn
-doc/getting-started-admin.mdwn
-doc/MonkeySpec
diff --git a/debian/monkeysphere.install b/debian/monkeysphere.install
deleted file mode 100644
index 6dd3dda..0000000
--- a/debian/monkeysphere.install
+++ /dev/null
@@ -1,7 +0,0 @@
-src/keytrans/openpgp2ssh usr/bin
-src/monkeysphere usr/bin
-src/monkeysphere-server usr/sbin
-src/monkeysphere-ssh-proxycommand usr/bin
-src/common usr/share/monkeysphere
-etc/monkeysphere.conf etc/monkeysphere
-etc/monkeysphere-server.conf etc/monkeysphere
diff --git a/debian/monkeysphere.manpages b/debian/monkeysphere.manpages
deleted file mode 100644
index ab99bbf..0000000
--- a/debian/monkeysphere.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-man/man1/monkeysphere.1
-man/man1/openpgp2ssh.1
-man/man1/monkeysphere-ssh-proxycommand.1
-man/man5/monkeysphere.5
-man/man8/monkeysphere-server.8