[Pkg-gnupg-commit] [gnupg1] 13/15: use wrap-and-sort -ast for cleaner diffs

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg1.

commit 1c76522804fec14e3099c0fb522884ccd6b59018
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Aug 3 09:50:08 2016 -0400

    use wrap-and-sort -ast for cleaner diffs
---
 debian/control     | 71 ++++++++++++++++++++++++++++++++++++------------------
 debian/gnupg1.docs |  6 ++---
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index 12ae6a6..36e7869 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,23 @@ Source: gnupg1
 Section: utils
 Priority: important
 Maintainer: Debian GnuPG-Maintainers <pkg-gnupg-maint at lists.alioth.debian.org>
-Uploaders: Sune Vuorela <debian at pusling.com>,
-           Eric Dorland <eric at debian.org>,
-           Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Uploaders:
+ Sune Vuorela <debian at pusling.com>,
+ Eric Dorland <eric at debian.org>,
+ Daniel Kahn Gillmor <dkg at fifthhorseman.net>,
 Standards-Version: 3.9.8
-Build-Depends: debhelper (>> 9),
-               dh-autoreconf,
-               dh-exec,
-               file,
-               gettext (>= 0.19.3),
-               libbz2-dev,
-               libcurl4-gnutls-dev,
-               libldap2-dev,
-               libreadline-dev,
-               libusb-dev [!hurd-i386],
-               libz-dev
+Build-Depends:
+ debhelper (>> 9),
+ dh-autoreconf,
+ dh-exec,
+ file,
+ gettext (>= 0.19.3),
+ libbz2-dev,
+ libcurl4-gnutls-dev,
+ libldap2-dev,
+ libreadline-dev,
+ libusb-dev [!hurd-i386],
+ libz-dev,
 Homepage: https://www.gnupg.org
 Vcs-Browser: https://anonscm.debian.org/git/pkg-gnupg/gnupg1.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-gnupg/gnupg1.git
@@ -24,11 +26,22 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-gnupg/gnupg1.git
 Package: gnupg1
 Architecture: any
 Multi-Arch: foreign
-Depends: gpgv | gpgv1, ${misc:Depends}, ${shlibs:Depends}
-Recommends: gnupg1-curl, ${shlibs:Recommends}
-Breaks: gnupg (<< 1.4.20-6+exp1)
-Replaces: gnupg (<< 1.4.20-6+exp1)
-Suggests: gnupg-doc, libpcsclite1, parcimonie, xloadimage | imagemagick | eog
+Depends:
+ gpgv | gpgv1,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ gnupg1-curl,
+ ${shlibs:Recommends},
+Breaks:
+ gnupg (<< 1.4.20-6+exp1),
+Replaces:
+ gnupg (<< 1.4.20-6+exp1),
+Suggests:
+ gnupg-doc,
+ libpcsclite1,
+ parcimonie,
+ xloadimage | imagemagick | eog,
 Description: GNU privacy guard - a free PGP replacement ("classic" version)
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -48,7 +61,11 @@ Package: gnupg1-curl
 Priority: optional
 Architecture: any
 Multi-Arch: foreign
-Depends: gnupg1, ${misc:Depends}, ${shlibs:Depends}, ${shlibs:Recommends}
+Depends:
+ gnupg1,
+ ${misc:Depends},
+ ${shlibs:Depends},
+ ${shlibs:Recommends},
 Description: GNU privacy guard - a free PGP replacement (cURL helpers for "classic" version)
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -63,8 +80,11 @@ Description: GNU privacy guard - a free PGP replacement (cURL helpers for "class
 Package: gpgv1
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: gnupg
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ gnupg,
 Description: GNU privacy guard - signature verification tool ("classic" version)
  GnuPG is GNU's tool for secure communication and data storage.
  .
@@ -83,8 +103,11 @@ Package-Type: udeb
 Section: debian-installer
 Priority: extra
 Architecture: armel
-Provides: gpgv-udeb
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides:
+ gpgv-udeb,
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: minimal signature verification tool
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
diff --git a/debian/gnupg1.docs b/debian/gnupg1.docs
index adb9216..9b1196c 100644
--- a/debian/gnupg1.docs
+++ b/debian/gnupg1.docs
@@ -2,9 +2,9 @@ AUTHORS
 README
 THANKS
 TODO
+debian/README.BUGS.Debian
+debian/Upgrading_From_PGP.txt
 doc/DETAILS
 doc/FAQ
-doc/highlights-1.4.txt
 doc/OpenPGP
-debian/Upgrading_From_PGP.txt
-debian/README.BUGS.Debian
+doc/highlights-1.4.txt

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