[Pkg-gnupg-commit] [gnupg2] 05/07: use "wrap-and-sort -as" since it makes future diffs even cleaner
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Jul 15 11:02:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit ec95e02ecaeed9cc19e220d4816986fdfe01e6fd
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Fri Jul 15 12:24:50 2016 +0200
use "wrap-and-sort -as" since it makes future diffs even cleaner
---
debian/control | 185 +++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 119 insertions(+), 66 deletions(-)
diff --git a/debian/control b/debian/control
index fe2005c..26a5405 100644
--- a/debian/control
+++ b/debian/control
@@ -2,42 +2,45 @@ Source: gnupg2
Section: utils
Priority: optional
Maintainer: Debian GnuPG Maintainers <pkg-gnupg-maint at lists.alioth.debian.org>
-Uploaders: Eric Dorland <eric at debian.org>,
- Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Uploaders:
+ Eric Dorland <eric at debian.org>,
+ Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Standards-Version: 3.9.8
-Build-Depends: automake,
- autopoint,
- debhelper (>= 9),
- dh-autoreconf,
- file,
- gettext,
- ghostscript,
- imagemagick,
- libassuan-dev (>= 2.4.3),
- libbz2-dev,
- libcurl4-gnutls-dev,
- libgcrypt20-dev (>= 1.7.0),
- libgnutls28-dev (>= 3.0),
- libgpg-error-dev (>= 1.24),
- libksba-dev (>= 1.3.4),
- libldap2-dev,
- libnpth0-dev (>= 1.2),
- libreadline-dev,
- librsvg2-bin,
- libsqlite3-dev,
- libusb-1.0-0-dev,
- pkg-config,
- texinfo,
- transfig,
- zlib1g-dev | libz-dev
-Build-Depends-Indep: binutils-multiarch [!amd64 !i386],
- libassuan-mingw-w64-dev,
- libgcrypt-mingw-w64-dev,
- libgpg-error-mingw-w64-dev,
- libksba-mingw-w64-dev,
- libnpth-mingw-w64-dev,
- libz-mingw-w64-dev,
- mingw-w64
+Build-Depends:
+ automake,
+ autopoint,
+ debhelper (>= 9),
+ dh-autoreconf,
+ file,
+ gettext,
+ ghostscript,
+ imagemagick,
+ libassuan-dev (>= 2.4.3),
+ libbz2-dev,
+ libcurl4-gnutls-dev,
+ libgcrypt20-dev (>= 1.7.0),
+ libgnutls28-dev (>= 3.0),
+ libgpg-error-dev (>= 1.24),
+ libksba-dev (>= 1.3.4),
+ libldap2-dev,
+ libnpth0-dev (>= 1.2),
+ libreadline-dev,
+ librsvg2-bin,
+ libsqlite3-dev,
+ libusb-1.0-0-dev,
+ pkg-config,
+ texinfo,
+ transfig,
+ zlib1g-dev | libz-dev
+Build-Depends-Indep:
+ binutils-multiarch [!amd64 !i386],
+ libassuan-mingw-w64-dev,
+ libgcrypt-mingw-w64-dev,
+ libgpg-error-mingw-w64-dev,
+ libksba-mingw-w64-dev,
+ libnpth-mingw-w64-dev,
+ libz-mingw-w64-dev,
+ mingw-w64
Vcs-Git: https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-gnupg/gnupg2.git
Homepage: https://www.gnupg.org/
@@ -45,9 +48,14 @@ Homepage: https://www.gnupg.org/
Package: gnupg-agent
Architecture: any
Multi-Arch: foreign
-Depends: pinentry-curses | pinentry, ${misc:Depends}, ${shlibs:Depends}
-Recommends: gnupg (= ${binary:Version}) | gpgsm
-Provides: gpg-agent
+Depends:
+ pinentry-curses | pinentry,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ gnupg (= ${binary:Version}) | gpgsm
+Provides:
+ gpg-agent
Description: GNU privacy guard - cryptographic agent
GnuPG is GNU's tool for secure communication and data storage.
It can be used to encrypt data and to create digital signatures.
@@ -62,7 +70,10 @@ Description: GNU privacy guard - cryptographic agent
Package: scdaemon
Architecture: any
Multi-Arch: foreign
-Depends: gnupg-agent (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ gnupg-agent (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: GNU privacy guard - smart card support
GnuPG is GNU's tool for secure communication and data storage.
It can be used to encrypt data and to create digital signatures.
@@ -75,10 +86,16 @@ Description: GNU privacy guard - smart card support
Package: gpgsm
Architecture: any
Multi-Arch: foreign
-Depends: gnupg-agent (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Recommends: dirmngr (= ${binary:Version})
-Breaks: gnupg2 (<< 2.1.10-2)
-Replaces: gnupg2 (<< 2.1.10-2)
+Depends:
+ gnupg-agent (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ dirmngr (= ${binary:Version})
+Breaks:
+ gnupg2 (<< 2.1.10-2)
+Replaces:
+ gnupg2 (<< 2.1.10-2)
Description: GNU privacy guard - S/MIME version
GnuPG is GNU's tool for secure communication and data storage.
It can be used to encrypt data and to create digital signatures.
@@ -92,14 +109,23 @@ Description: GNU privacy guard - S/MIME version
Package: gnupg
Architecture: any
Multi-Arch: foreign
-Depends: gnupg-agent (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: dirmngr (= ${binary:Version}), ${shlibs:Recommends}
-Suggests: parcimonie, xloadimage
-Breaks: dirmngr (<< 2.1.0~), gnupg2 (<< 2.1.11-7+exp1)
-Replaces: gnupg2 (<< 2.1.11-7+exp1)
-Provides: gpg
+Depends:
+ gnupg-agent (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ dirmngr (= ${binary:Version}),
+ ${shlibs:Recommends}
+Suggests:
+ parcimonie,
+ xloadimage
+Breaks:
+ dirmngr (<< 2.1.0~),
+ gnupg2 (<< 2.1.11-7+exp1)
+Replaces:
+ gnupg2 (<< 2.1.11-7+exp1)
+Provides:
+ gpg
Description: GNU privacy guard - a free PGP replacement
GnuPG is GNU's tool for secure communication and data storage.
It can be used to encrypt data and to create digital signatures.
@@ -113,7 +139,9 @@ Package: gnupg2
Architecture: all
Section: oldlibs
Priority: extra
-Depends: gnupg (>= ${source:Version}), ${misc:Depends}
+Depends:
+ gnupg (>= ${source:Version}),
+ ${misc:Depends}
Description: GNU privacy guard - a free PGP replacement (dummy transitional package)
GnuPG is GNU's tool for secure communication and data storage.
It can be used to encrypt data and to create digital signatures.
@@ -126,10 +154,17 @@ Description: GNU privacy guard - a free PGP replacement (dummy transitional pack
Package: gpgv
Architecture: any
Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: gnupg2 (<< 2.0.21-2), gpgv2 (<< 2.1.11-7+exp1)
-Replaces: gnupg2 (<< 2.0.21-2), gpgv2 (<< 2.1.11-7+exp1)
-Suggests: gnupg
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks:
+ gnupg2 (<< 2.0.21-2),
+ gpgv2 (<< 2.1.11-7+exp1)
+Replaces:
+ gnupg2 (<< 2.0.21-2),
+ gpgv2 (<< 2.1.11-7+exp1)
+Suggests:
+ gnupg
Description: GNU privacy guard - signature verification tool
GnuPG is GNU's tool for secure communication and data storage.
.
@@ -143,7 +178,9 @@ Package: gpgv2
Section: oldlibs
Priority: extra
Architecture: all
-Depends: gpgv (>= ${source:Version}), ${misc:Depends}
+Depends:
+ gpgv (>= ${source:Version}),
+ ${misc:Depends}
Description: GNU privacy guard - signature verification tool (dummy transitional package)
GnuPG is GNU's tool for secure communication and data storage.
gpgv is actually a stripped-down version of gpg which is only able
@@ -154,12 +191,24 @@ Description: GNU privacy guard - signature verification tool (dummy transitional
Package: dirmngr
Architecture: any
-Depends: adduser, lsb-base (>= 3.2-13), ${misc:Depends}, ${shlibs:Depends}
-Recommends: gnupg (= ${binary:Version}), ${shlibs:Recommends}
-Enhances: gnupg, gpgsm, squid
-Breaks: gnupg2 (<< 2.1.10-2)
-Replaces: gnupg2 (<< 2.1.10-2)
-Suggests: tor
+Depends:
+ adduser,
+ lsb-base (>= 3.2-13),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ gnupg (= ${binary:Version}),
+ ${shlibs:Recommends}
+Enhances:
+ gnupg,
+ gpgsm,
+ squid
+Breaks:
+ gnupg2 (<< 2.1.10-2)
+Replaces:
+ gnupg2 (<< 2.1.10-2)
+Suggests:
+ tor
Description: GNU privacy guard - network certificate management service
dirmngr is a server for managing and downloading OpenPGP and X.509
certificates, as well as updates and status signals related to those
@@ -177,7 +226,9 @@ Package-Type: udeb
Section: debian-installer
Priority: extra
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+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.
@@ -190,8 +241,10 @@ Description: minimal signature verification tool
Package: gpgv-win32
Architecture: all
Priority: extra
-Depends: ${misc:Depends}
-Suggests: wine
+Depends:
+ ${misc:Depends}
+Suggests:
+ wine
Description: GNU privacy guard - signature verification tool (win32 build)
GnuPG is GNU's tool for secure communication and data storage.
.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list