Browse Source

debian: Run wrap-and-sort

Manually clean up the apt.maintscript, it moved stuff from
before the comment to after the comment...
tags/devuan/2.0.1+devuan1
Julian Andres Klode 4 years ago
parent
commit
29742f9563
7 changed files with 71 additions and 59 deletions
  1. +0
    -1
      COPYING
  2. +1
    -1
      debian/apt-doc.docs
  3. +8
    -15
      debian/apt-utils.install
  4. +21
    -23
      debian/apt.install
  5. +0
    -1
      debian/apt.maintscript
  6. +39
    -16
      debian/control
  7. +2
    -2
      debian/libapt-pkg-dev.install

+ 0
- 1
COPYING View File

@@ -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.


+ 1
- 1
debian/apt-doc.docs View File

@@ -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

+ 8
- 15
debian/apt-utils.install View File

@@ -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.*

+ 21
- 23
debian/apt.install View File

@@ -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/

+ 0
- 1
debian/apt.maintscript View File

@@ -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~


+ 39
- 16
debian/control View File

@@ -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


+ 2
- 2
debian/libapt-pkg-dev.install View File

@@ -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

Loading…
Cancel
Save