[Pkg-gnupg-commit] [gnupg2] 240/241: apply wrap-and-sort for canonicalization

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit ee3ed8efd0c2d4608d68ba010af88c18496941be
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Dec 9 12:21:55 2015 -0500

    apply wrap-and-sort for canonicalization
---
 debian/control             | 10 +++-------
 debian/dirmngr.install     |  2 +-
 debian/dirmngr.maintscript |  6 +++---
 debian/dirmngr.manpages    |  2 +-
 debian/gnupg2.docs         |  8 ++++----
 debian/gnupg2.manpages     |  2 +-
 debian/gpgsm.docs          |  2 +-
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 2a186a7..3617a0b 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Build-Depends: automake,
                libksba-dev (>= 1.2.0),
                libldap2-dev,
                libnpth0-dev (>= 0.91),
-               libsqlite3-dev, 
                libreadline-dev,
+               libsqlite3-dev,
                libusb-dev,
                pkg-config,
                texinfo,
@@ -36,9 +36,7 @@ Homepage: http://www.gnupg.org/
 Package: gnupg-agent
 Architecture: any
 Multi-Arch: foreign
-Depends: pinentry-curses | pinentry,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: pinentry-curses | pinentry, ${misc:Depends}, ${shlibs:Depends}
 Recommends: gnupg2 | gpgsm | gnupg
 Conflicts: newpg
 Replaces: gnupg2 (<< 2.0.18-2), gpgsm (<< 2.0.18-2), newpg
@@ -72,9 +70,7 @@ Description: GNU privacy guard - smart card support
 Package: gpgsm
 Architecture: any
 Multi-Arch: foreign
-Depends: gnupg-agent (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: gnupg-agent (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Recommends: dirmngr (>= 2.1.0~)
 Breaks: gnupg2 (<< 2.0.0-2)
 Replaces: gnupg2 (<< 2.0.0-2)
diff --git a/debian/dirmngr.install b/debian/dirmngr.install
index 4ee0d19..4098779 100644
--- a/debian/dirmngr.install
+++ b/debian/dirmngr.install
@@ -1,4 +1,4 @@
+debian/sks-keyservers.netCA.pem usr/share/dirmngr
 debian/tmp/usr/bin/dirmngr
 debian/tmp/usr/bin/dirmngr-client
 debian/tmp/usr/lib/gnupg2/dirmngr_ldap
-debian/sks-keyservers.netCA.pem usr/share/dirmngr
diff --git a/debian/dirmngr.maintscript b/debian/dirmngr.maintscript
index f302404..aa11aa5 100644
--- a/debian/dirmngr.maintscript
+++ b/debian/dirmngr.maintscript
@@ -1,5 +1,5 @@
-rm_conffile /etc/logrotate.d/dirmngr
-rm_conffile /etc/init.d/dirmngr
 rm_conffile /etc/default/dirmngr
-rm_conffile /etc/dirmngr/ldapservers.conf
 rm_conffile /etc/dirmngr/dirmngr.conf
+rm_conffile /etc/dirmngr/ldapservers.conf
+rm_conffile /etc/init.d/dirmngr
+rm_conffile /etc/logrotate.d/dirmngr
diff --git a/debian/dirmngr.manpages b/debian/dirmngr.manpages
index aa07c56..93702d9 100644
--- a/debian/dirmngr.manpages
+++ b/debian/dirmngr.manpages
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/man/man8/dirmngr.8
 debian/tmp/usr/share/man/man1/dirmngr-client.1
+debian/tmp/usr/share/man/man8/dirmngr.8
diff --git a/debian/gnupg2.docs b/debian/gnupg2.docs
index 777b19e..b182260 100644
--- a/debian/gnupg2.docs
+++ b/debian/gnupg2.docs
@@ -1,9 +1,9 @@
-README 
-NEWS 
-THANKS 
+NEWS
+README
+THANKS
 TODO
 doc/DETAILS
 doc/FAQ
-doc/OpenPGP
 doc/HACKING
 doc/KEYSERVER
+doc/OpenPGP
diff --git a/debian/gnupg2.manpages b/debian/gnupg2.manpages
index edabf51..8f67258 100644
--- a/debian/gnupg2.manpages
+++ b/debian/gnupg2.manpages
@@ -1,7 +1,7 @@
+debian/kbxutil.1
 debian/tmp/usr/share/man/man1/gpg2.1
 debian/tmp/usr/share/man/man1/gpgconf.1
 debian/tmp/usr/share/man/man1/gpgparsemail.1
 debian/tmp/usr/share/man/man1/watchgnupg.1
 debian/tmp/usr/share/man/man8/addgnupghome.8
 debian/tmp/usr/share/man/man8/applygnupgdefaults.8
-debian/kbxutil.1
diff --git a/debian/gpgsm.docs b/debian/gpgsm.docs
index 57727ca..2904cc3 100644
--- a/debian/gpgsm.docs
+++ b/debian/gpgsm.docs
@@ -1 +1 @@
-doc/com-certs.pem
\ No newline at end of file
+doc/com-certs.pem

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git