From 8707dca0be80e183e8c7f985b5a789ddcbf4226c Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Sat, 22 Oct 2016 12:32:03 -0400
Subject: [PATCH] Update Debian packaging stuff.

---
 debian/changelog |  8 ++++++++
 debian/control   | 26 ++++++++++++--------------
 debian/docs      |  1 -
 debian/rules     |  3 +--
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3add71b..012a67b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pwmd (3.1.0-beta1-1) UNRELEASED; urgency=medium
+
+  * New upstream. 
+  * Update Recommends.
+  * Require gnupg-agent. 
+
+ -- Ben Kibbey <bjk@luxsci.net>  Sat, 22 Oct 2016 11:39:07 -0400
+
 pwmd (3.0.6-1) testing; urgency=medium
 
   * New upstream.
diff --git a/debian/control b/debian/control
index 183284e5..1cc4c757 100644
--- a/debian/control
+++ b/debian/control
@@ -9,28 +9,26 @@ Vcs-Git: git://repo.or.cz/pwmd.git
 
 Package: pwmd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libpwmd7, pinentry-curses (>= 0.8.2) | pinentry-gtk (>= 0.8.2) | pinentry-gtk2 (>= 0.8.2) | pinentry-qt (>= 0.8.2) | pinentry-qt4 (>= 0.8.2), gpg-agent (>= 2.1.0)
-Description: a universal data server
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg-agent (>= 2.1.15)
+Recommends: libpwmd8, pinentry-curses (>= 0.9.7) | pinentry-gnome3 (>= 0.9.7) | pinentry-gtk2 (>= 0.9.7) | pinentry-qt (>= 0.9.7) | pinentry-qt4 (>= 0.9.7), qpwmc
+Description: a password manager and universal data server
  Password Manager Daemon is a server that provides a way for applications to
  securely store data in a centralized location. The data is stored in an
- (optionally) encrypted XML file and clients connect to manipulate the data.
+ OpenPGP encrypted XML file and clients connect to manipulate the data.
  Some of the features include:
  .
     * Multi-threaded. More than one client may access the data at the same
       time.
-    * A key cache so clients won't need to enter a key each time a file is
-      opened or saved.
-    * Key retrieval via pinentry(1).
+    * A document cache so clients won't need to enter the passphrase each time
+      a file is opened or saved.
     * Configuration file which supports file specific settings including
-      encryption iterations, cache expiration and encryption key or key file.
-    * Compressed data file support.
+      cache expiration and encryption key passphrase file and more.
     * Logging to file and/or syslog.
-    * Configurable cipher type.
-    * Secure memory usage. PWMD will zero out memory before freeing it and
+    * Secure memory usage. Pwmd will zero out memory before freeing it and
       also has the option to lock the entire process in RAM to avoid swapping
       the data to virtual memory.
-    * Remote connections over TLS.
-    * gpg-agent support (including smartcards).
+    * Remote connections over TLS and SSH via a proxy program.
+    * Smartcard support via gnupg's scdaemon.
+    * Per file and element ACL's including connections via TLS.
  .
- Read pwmd.info for protocol commands and syntax.
\ No newline at end of file
+ Please read pwmd.info for protocol commands and syntax.
diff --git a/debian/docs b/debian/docs
index ddf32f9c..92f13ad4 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,5 +1,4 @@
 NEWS
 README
-TODO.org
 doc/pwmd.html
 doc/config.example
diff --git a/debian/rules b/debian/rules
index 5e3e12da..3b4a1633 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,7 @@
 #export DH_VERBOSE=1
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-agent --enable-gnutls --enable-acl \
-	--enable-quality
+	dh_auto_configure -- --enable-gnutls --enable-acl
 
 %:
 	dh $@  --with autotools-dev
-- 
2.11.4.GIT