Apply "wrap-and-sort -a"

Fixes some trailing blanks and trailing blank lines, too.

Signed-off-by: Axel Beckert <abe@deuxchevaux.org>

3 files changed, 20 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index c0bb6c02..31a384a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ debhelper (9.20160814+unreleased) UNRELEASED; urgency=medium
     (Closes: #836344)
   * Use uppercase "Debian" in package description when the project is
     meant. Fixes lintian warning capitalization-error-in-description.
+  * Apply "wrap-and-sort -a"
 
  -- Niels Thykier <niels@thykier.net>  Sun, 14 Aug 2016 09:30:15 +0000
 
diff --git a/debian/control b/debian/control
index d675e628..d1470279 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,29 @@ Source: debhelper
 Section: devel
 Priority: optional
 Maintainer: Debhelper Maintainers <debhelper-devel@lists.alioth.debian.org>
-Uploaders: Niels Thykier <niels@thykier.net>, Bernhard R. Link <brlink@debian.org>
-Build-Depends: po4a (>= 0.24), dpkg-dev (>= 1.18.0~), perl:any
+Uploaders: Niels Thykier <niels@thykier.net>,
+           Bernhard R. Link <brlink@debian.org>
+Build-Depends: dpkg-dev (>= 1.18.0~),
+               perl:any,
+               po4a (>= 0.24)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/debhelper/debhelper.git
 Vcs-Browser: https://anonscm.debian.org/git/debhelper/debhelper.git
 
 Package: debhelper
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.18.2~), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14), dh-strip-nondeterminism, autotools-dev, dh-autoreconf (>= 12~)
+Depends: autotools-dev,
+         binutils,
+         dh-autoreconf (>= 12~),
+         dh-strip-nondeterminism,
+         dpkg (>= 1.16.2),
+         dpkg-dev (>= 1.18.2~),
+         file (>= 3.23),
+         libdpkg-perl (>= 1.17.14),
+         man-db (>= 2.5.1-1),
+         po-debconf,
+         ${misc:Depends},
+         ${perl:Depends}
 Breaks: dh-systemd (<< 1.38)
 Replaces: dh-systemd (<< 1.38)
 Suggests: dh-make
@@ -19,7 +33,7 @@ Multi-Arch: foreign
 Description: helper programs for debian/rules
  A collection of programs that can be used in a debian/rules file to
  automate common tasks related to building Debian packages. Programs
- are included to install various files into your package, compress 
- files, fix file permissions, integrate your package with the Debian 
+ are included to install various files into your package, compress
+ files, fix file permissions, integrate your package with the Debian
  menu system, debconf, doc-base, etc. Most Debian packages use debhelper
  as part of their build process.
diff --git a/debian/copyright b/debian/copyright
index f0648869..01bf3890 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -89,4 +89,3 @@ License: GPL-2+
 License: GPL-3+
  The full text of the GPL version 3 is distributed in
  /usr/share/common-licenses/GPL-3 on Debian systems.
-