6 files changed, 64 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog
index 11a7fc2..374678c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ wallet (1.3-1) UNRELEASED; urgency=medium
     - New report that dumps all object history.
     - Displays of ACLs and ACL entries are now sorted correctly.
   * Change the branch layout to follow DEP-14.
+  * Run wrap-and-sort -ast on the package.
 
  -- Russ Allbery <rra@debian.org>  Sun, 17 Jan 2016 19:40:54 -0800
 
diff --git a/debian/control b/debian/control
index 9296899..d582008 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,33 @@ Section: net
 Priority: extra
 Maintainer: Russ Allbery <rra@debian.org>
 Bugs: mailto:rra@debian.org
-Build-Depends: debhelper (>= 9), dh-autoreconf, libauthen-sasl-perl,
- libdatetime-perl, libdatetime-format-sqlite-perl, libdbd-sqlite3-perl,
- libdbi-perl, libdbix-class-perl, libheimdal-kadm5-perl, libkrb5-dev,
- libnet-dns-perl, libnet-duo-perl, libnet-ldap-perl, libremctl-dev,
- libsql-translator-perl, libtest-minimumversion-perl, libtest-pod-perl,
- libtest-strict-perl, libtimedate-perl, libwebauth-perl, perl, sqlite3
+Build-Depends:
+ debhelper (>= 9),
+ dh-autoreconf,
+ libauthen-sasl-perl,
+ libcrypt-generatepassword-perl,
+ libdatetime-format-sqlite-perl,
+ libdatetime-perl,
+ libdbd-sqlite3-perl,
+ libdbi-perl,
+ libdbix-class-perl,
+ libheimdal-kadm5-perl,
+ libjson-perl,
+ libkrb5-dev,
+ libnet-dns-perl,
+ libnet-duo-perl,
+ libnet-ldap-perl,
+ libnet-remctl-perl,
+ libperl6-slurp-perl,
+ libremctl-dev,
+ libsql-translator-perl,
+ libtest-minimumversion-perl,
+ libtest-pod-perl,
+ libtest-strict-perl,
+ libtimedate-perl,
+ libwebauth-perl,
+ perl,
+ sqlite3,
 Standards-Version: 3.9.6
 Homepage: http://www.eyrie.org/~eagle/software/wallet/
 Vcs-Git: git://git.eyrie.org/kerberos/wallet.git -b debian/master
@@ -17,8 +38,12 @@ Vcs-Browser: http://git.eyrie.org/?p=kerberos/wallet.git
 Package: keytab-backend
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${perl:Depends}, krb5-admin-server, perl,
- remctl-server
+Depends:
+ krb5-admin-server,
+ perl,
+ remctl-server,
+ ${misc:Depends},
+ ${perl:Depends},
 Description: Provide existing MIT Kerberos keytabs via remctl
  keytab-backend is a service that runs under remctld and allows
  authenticated clients to download Kerberos keytabs from an MIT Kerberos
@@ -30,7 +55,9 @@ Description: Provide existing MIT Kerberos keytabs via remctl
 Package: wallet-client
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Kerberos-authenticated secure data management client
  The wallet is a system for managing secure data, authorization rules to
  retrieve or change that data, and audit rules for documenting actions
@@ -47,15 +74,30 @@ Description: Kerberos-authenticated secure data management client
 Package: wallet-server
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${perl:Depends},
- libdatetime-format-sqlite-perl | libdatetime-format-mysql-perl |
- libdatetime-format-pg-perl,
+Depends:
+ libdatetime-format-sqlite-perl | libdatetime-format-mysql-perl | libdatetime-format-pg-perl,
+ libdatetime-perl,
  libdbd-sqlite3-perl | libdbd-mysql-perl | libdbd-pg-perl,
- libdbix-class-perl, libdatetime-perl, libsql-translator-perl,
- libtimedate-perl, remctl-server
-Recommends: krb5-user | libheimdal-kadm5-perl, remctl-server (>= 2.14)
-Suggests: libauthen-sasl-perl, libnet-duo-perl, libnet-ldap-perl,
- libnet-remctl-perl, libwebauth-perl (>= 4.4.0)
+ libdbi-perl,
+ libdbix-class-perl,
+ libsql-translator-perl,
+ libtimedate-perl,
+ remctl-server,
+ ${misc:Depends},
+ ${perl:Depends},
+Recommends:
+ krb5-user | libheimdal-kadm5-perl,
+ remctl-server (>= 2.14),
+Suggests:
+ libauthen-sasl-perl,
+ libcrypt-generatepassword-perl,
+ libipc-run-perl,
+ libjson-perl,
+ libnet-duo-perl,
+ libnet-ldap-perl,
+ libnet-remctl-perl,
+ libperl6-slurp-perl,
+ libwebauth-perl (>= 4.4.0),
 Description: Kerberos-authenticated secure data management server
  The wallet is a system for managing secure data, authorization rules to
  retrieve or change that data, and audit rules for documenting actions
diff --git a/debian/copyright b/debian/copyright
index fc867cc..faa5cc6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -180,4 +180,3 @@ Comment: The option described in the license has been accepted and these
  files are distributed under the same terms as the 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.
-
diff --git a/debian/keytab-backend.install b/debian/keytab-backend.install
index 666b71c..52a736e 100644
--- a/debian/keytab-backend.install
+++ b/debian/keytab-backend.install
@@ -1,6 +1,5 @@
+config/allow-extract            etc/krb5kdc
+config/keytab                   etc/remctl/conf.d
 debian/tmp/etc/remctl/acl/keytab
 debian/tmp/usr/sbin/keytab-backend
 debian/tmp/usr/share/man/man8/keytab-backend.8
-
-config/allow-extract            etc/krb5kdc
-config/keytab                   etc/remctl/conf.d
diff --git a/debian/wallet-client.install b/debian/wallet-client.install
index 2940357..1807636 100644
--- a/debian/wallet-client.install
+++ b/debian/wallet-client.install
@@ -1,4 +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
+debian/tmp/usr/share/man/man1/wallet.1
diff --git a/debian/wallet-server.install b/debian/wallet-server.install
index dfc1d6e..f4f5bdc 100644
--- a/debian/wallet-server.install
+++ b/debian/wallet-server.install
@@ -1,3 +1,4 @@
+config/wallet                   etc/remctl/conf.d
 debian/tmp/etc/remctl/acl/wallet-report
 debian/tmp/usr/sbin/wallet-admin
 debian/tmp/usr/sbin/wallet-backend
@@ -8,5 +9,3 @@ debian/tmp/usr/share/man/man8/wallet-backend.8
 debian/tmp/usr/share/man/man8/wallet-report.8
 debian/tmp/usr/share/perl5
 debian/tmp/usr/share/wallet
-
-config/wallet                   etc/remctl/conf.d