debian: Run wrap-and-sort

Manually clean up the apt.maintscript, it moved stuff from
before the comment to after the comment...

diff --git a/COPYING b/COPYING
index c0e89b51ae2673525217dfd4ad2fe98f0c157994..2f9ab10e8f81ce63c7c970a9d57fd9deaa3fb888 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -20,4 +20,3 @@ License: GPLv2+
 See /usr/share/common-licenses/GPL-2, or
 <http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
 of the GNU General Public License.
-

diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs
index 3f26b3a2e2b38c61dbbbbdfc03938c01cf4869b2..bd494002ca72c550c27dbd112c985c7e19e2fc18 100644 (file)
--- a/debian/apt-doc.docs
+++ b/debian/apt-doc.docs
@@ -1,4 +1,4 @@
 README.progress-reporting
+doc/acquire-additional-files.txt
 doc/external-dependency-solver-protocol.txt
 doc/external-installation-planner-protocol.txt
-doc/acquire-additional-files.txt

diff --git a/debian/apt-utils.install b/debian/apt-utils.install
index 178b528b70041a364c2d9821960ac780a185e25c..a27f1e1e4c32dfb9027b60e6c75cfaf3824cfdac 100644 (file)
--- a/debian/apt-utils.install
+++ b/debian/apt-utils.install
@@ -1,20 +1,13 @@
-usr/share/locale/*/*/apt-utils.mo
-
+usr/bin/apt-extracttemplates
 usr/bin/apt-ftparchive
 usr/bin/apt-sortpkgs
-usr/bin/apt-extracttemplates
-
-usr/share/man/*/apt-ftparchive.*
+usr/lib/apt/planners/
+usr/lib/apt/solvers/
+usr/share/doc/apt-utils
+usr/share/locale/*/*/apt-utils.mo
+usr/share/man/*/*/apt-extracttemplates.*
 usr/share/man/*/*/apt-ftparchive.*
-
-usr/share/man/*/apt-sortpkgs.*
 usr/share/man/*/*/apt-sortpkgs.*
-
 usr/share/man/*/apt-extracttemplates.*
-usr/share/man/*/*/apt-extracttemplates.*
-
-
-usr/lib/apt/solvers/
-usr/lib/apt/planners/
-
-usr/share/doc/apt-utils
+usr/share/man/*/apt-ftparchive.*
+usr/share/man/*/apt-sortpkgs.*

diff --git a/debian/apt.install b/debian/apt.install
index 42b6df6913213e649f891efb15d487e5467fbb8f..82f2f080664cc8cd567d40784c5638705eb86b5e 100644 (file)
--- a/debian/apt.install
+++ b/debian/apt.install
@@ -1,41 +1,39 @@
+debian/*.service /lib/systemd/system/
+debian/*.timer /lib/systemd/system/
+debian/apt.systemd.daily usr/lib/apt
 etc/apt/
 usr/bin/apt
-usr/bin/apt-get
 usr/bin/apt-cache
 usr/bin/apt-cdrom
 usr/bin/apt-config
+usr/bin/apt-get
 usr/bin/apt-key
 usr/bin/apt-mark
+usr/lib/*/libapt-private.so*
+usr/lib/apt/apt-helper
 usr/lib/apt/methods/
 usr/lib/dpkg/methods/apt/
+usr/share/bash-completion/completions/
+usr/share/doc/apt
 usr/share/locale/*/*/apt.mo
-usr/lib/*/libapt-private.so*
-usr/share/man/*/apt.*
-usr/share/man/*/apt-get.*
-usr/share/man/*/apt-cache.*
-usr/share/man/*/apt-cdrom.*
-usr/share/man/*/apt-config.*
-usr/share/man/*/apt-key.*
-usr/share/man/*/apt-mark.*
-usr/share/man/*/apt-secure.*
-usr/share/man/*/sources.list.*
-usr/share/man/*/apt_preferences.*
-usr/share/man/*/*/apt.*
-usr/share/man/*/*/apt-get.*
 usr/share/man/*/*/apt-cache.*
 usr/share/man/*/*/apt-cdrom.*
 usr/share/man/*/*/apt-config.*
+usr/share/man/*/*/apt-get.*
 usr/share/man/*/*/apt-key.*
 usr/share/man/*/*/apt-mark.*
 usr/share/man/*/*/apt-secure.*
-usr/share/man/*/*/sources.list.*
+usr/share/man/*/*/apt.*
 usr/share/man/*/*/apt_preferences.*
-usr/share/bash-completion/completions/
-debian/*.service /lib/systemd/system/
-debian/*.timer /lib/systemd/system/
-usr/lib/apt/apt-helper
-
-usr/share/doc/apt
-
-debian/apt.systemd.daily usr/lib/apt
+usr/share/man/*/*/sources.list.*
+usr/share/man/*/apt-cache.*
+usr/share/man/*/apt-cdrom.*
+usr/share/man/*/apt-config.*
+usr/share/man/*/apt-get.*
+usr/share/man/*/apt-key.*
+usr/share/man/*/apt-mark.*
+usr/share/man/*/apt-secure.*
+usr/share/man/*/apt.*
+usr/share/man/*/apt_preferences.*
+usr/share/man/*/sources.list.*
 var/

diff --git a/debian/apt.maintscript b/debian/apt.maintscript
index f461e673a014a3f5e1395f4aa76b60f642bccadc..296f83bd5fc4647dd8b341b383a6f559aa6f0eaf 100644 (file)
--- a/debian/apt.maintscript
+++ b/debian/apt.maintscript
@@ -1,4 +1,3 @@
 rm_conffile /etc/apt/apt.conf.d/20changelog 1.2.4~
 # we use a systemd timer unit now
 rm_conffile /etc/cron.daily/apt 1.2.10~
-

diff --git a/debian/control b/debian/control
index cb07b862954ff971b701897da771c042059f56f9..d4dc4e32399fd2f3a32aa9409eb3971f44eb6d75 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,24 +3,44 @@ Section: admin
 Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>,
- Julian Andres Klode <jak@debian.org>,
- David Kalnischkies <donkult@debian.org>
+           Julian Andres Klode <jak@debian.org>,
+           David Kalnischkies <donkult@debian.org>
 Standards-Version: 3.9.8
-Build-Depends: dpkg-dev (>= 1.17.14), debhelper (>= 9.20160709~), libdb-dev,
- gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
- zlib1g-dev, libbz2-dev, liblzma-dev, liblz4-dev (>= 0.0~r126),
- xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2),
- cmake (>= 3.4), pkg-config, libgtest-dev <!nocheck>, dh-systemd
-Build-Depends-Indep: doxygen, w3m, graphviz
+Build-Depends: cmake (>= 3.4),
+               debhelper (>= 9.20160709~),
+               dh-systemd,
+               docbook-xml,
+               docbook-xsl,
+               dpkg-dev (>= 1.17.14),
+               gettext (>= 0.12),
+               libbz2-dev,
+               libcurl4-gnutls-dev (>= 7.19.4~),
+               libdb-dev,
+               libgtest-dev <!nocheck>,
+               liblz4-dev (>= 0.0~r126),
+               liblzma-dev,
+               pkg-config,
+               po4a (>= 0.34-2),
+               xsltproc,
+               zlib1g-dev
+Build-Depends-Indep: doxygen, graphviz, w3m
 Vcs-Git: https://anonscm.debian.org/git/apt/apt.git
 Vcs-Browser: https://anonscm.debian.org/git/apt/apt.git
 Testsuite: autopkgtest
 
 Package: apt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gpgv | gpgv2 | gpgv1, adduser
+Depends: adduser,
+         gpgv | gpgv2 | gpgv1,
+         ${apt:keyring},
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: gnupg | gnupg2 | gnupg1
-Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt, powermgmt-base
+Suggests: apt-doc,
+          aptitude | synaptic | wajig,
+          dpkg-dev (>= 1.17.2),
+          powermgmt-base,
+          python-apt
 Description: commandline package manager
  This package provides commandline tools for searching and
  managing as well as querying information about packages
@@ -40,8 +60,8 @@ Package: libapt-pkg5.0
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: apt (<< 1.1~exp14), libapt-inst1.5 (<< 0.9.9~), appstream (<< 0.9.0-3~)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: appstream (<< 0.9.0-3~), apt (<< 1.1~exp14), libapt-inst1.5 (<< 0.9.9~)
 Recommends: apt (>= ${binary:Version})
 Section: libs
 Provides: libapt-pkg (= ${binary:Version})
@@ -65,7 +85,7 @@ Package: libapt-inst2.0
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Section: libs
 Provides: libapt-inst (= ${binary:Version})
 Description: deb package format runtime library
@@ -87,7 +107,10 @@ Architecture: any
 Multi-Arch: same
 Priority: optional
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libapt-pkg (= ${binary:Version}), libapt-inst (= ${binary:Version}), ${misc:Depends}, zlib1g-dev
+Depends: libapt-inst (= ${binary:Version}),
+         libapt-pkg (= ${binary:Version}),
+         zlib1g-dev,
+         ${misc:Depends}
 Section: libdevel
 Description: development files for APT's libapt-pkg and libapt-inst
  This package contains the header files and libraries for
@@ -108,7 +131,7 @@ Description: documentation for APT development
 
 Package: apt-utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apt (= ${binary:Version})
+Depends: apt (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: package management related utility programs
  This package contains some less used commandline utilities related
  to package management with APT.
@@ -121,7 +144,7 @@ Description: package management related utility programs
 
 Package: apt-transport-https
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: ca-certificates
 Priority: optional
 Description: https download transport for APT

diff --git a/debian/libapt-pkg-dev.install b/debian/libapt-pkg-dev.install
index e85dc99340c56f6f173043f7fcac70825fe515ba..42e7c34d569806d1d1190c578263e4d9a8badb85 100644 (file)
--- a/debian/libapt-pkg-dev.install
+++ b/debian/libapt-pkg-dev.install
@@ -1,3 +1,3 @@
-usr/lib/*/libapt-pkg*.so
-usr/lib/*/libapt-inst*.so
 usr/include/apt-pkg/
+usr/lib/*/libapt-inst*.so
+usr/lib/*/libapt-pkg*.so