From f23ca86fe037f13f744c588b07e4c9140a534894 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 12 Aug 2016 01:36:55 +0200 Subject: debian: Install etc/apt if present (e.g., on Ubuntu) On Ubuntu, cmake installs are vendor-specific apt.conf.d snippet, causing the build to fail. --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index b6dfc96ea..1ea0e872b 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,8 @@ override_dh_install-indep: override_dh_install-arch: dh_movefiles - dh_install --fail-missing + if [ -e debian/tmp/etc/apt ]; then dh_install -papt etc/apt/* etc/apt; fi + dh_install --list-missing install -m 644 debian/apt.conf.autoremove debian/apt/etc/apt/apt.conf.d/01autoremove install -m 755 debian/apt.auto-removal.sh debian/apt/etc/kernel/postinst.d/apt-auto-removal -- cgit v1.2.3 From 6fbe5739701f4c63bcd5c68d9ecc19e9e28288de Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 18 Aug 2016 14:21:16 +0200 Subject: tests/control: Handle the gpg1/gpg2 mess a bit better Hardcoding gpgv1 and gnupg1 breaks Ubuntu, because on Ubuntu, these packages do not exist yet. Instead allow gnupg (<< 2) for gnupg1 and gnupg2 for gnupg (>= 2), so we cover all potential combinations. --- debian/tests/control | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index b7555dc2e..a282584fa 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,5 +1,8 @@ Tests: run-tests Restrictions: allow-stderr Depends: @, @builddeps@, fakeroot, wget, stunnel4, lsof, db-util, - gnupg, gnupg1, gpgv, gpgv1, + gnupg (>= 2) | gnupg2, + gnupg1 | gnupg (<< 2), + gpgv (>= 2) | gpgv2, + gpgv1 | gpgv (<< 2), libfile-fcntllock-perl, python3-apt -- cgit v1.2.3 From 23ecbf33dbcea0025c9a72b8c33f5ffb3e5ae146 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 19 Aug 2016 17:49:29 +0200 Subject: debian: Make better use of the tree installed by CMake This gets rid of the special casing of etc/apt, various example file installations handled by the upstream build system, and of course the directory creation for all dirs created by the upstream build system. --- debian/apt-doc.docs | 2 -- debian/apt-transport-https.dirs | 1 - debian/apt-utils.dirs | 3 --- debian/apt-utils.examples | 1 - debian/apt.dirs | 19 ------------------- debian/apt.examples | 1 - debian/apt.install | 2 ++ debian/libapt-pkg-doc.docs | 1 - debian/rules | 1 - 9 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 debian/apt-transport-https.dirs delete mode 100644 debian/apt-utils.dirs delete mode 100644 debian/apt-utils.examples delete mode 100644 debian/apt.examples (limited to 'debian') diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs index 2058000c1..3f26b3a2e 100644 --- a/debian/apt-doc.docs +++ b/debian/apt-doc.docs @@ -1,5 +1,3 @@ -build/docs/guide* -build/docs/offline* README.progress-reporting doc/external-dependency-solver-protocol.txt doc/external-installation-planner-protocol.txt diff --git a/debian/apt-transport-https.dirs b/debian/apt-transport-https.dirs deleted file mode 100644 index 3abb3fee8..000000000 --- a/debian/apt-transport-https.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/apt/methods diff --git a/debian/apt-utils.dirs b/debian/apt-utils.dirs deleted file mode 100644 index de7fa756e..000000000 --- a/debian/apt-utils.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/apt/solvers -usr/lib/apt/planners -usr/bin diff --git a/debian/apt-utils.examples b/debian/apt-utils.examples deleted file mode 100644 index 25aadf996..000000000 --- a/debian/apt-utils.examples +++ /dev/null @@ -1 +0,0 @@ -doc/examples/apt-ftparchive.conf \ No newline at end of file diff --git a/debian/apt.dirs b/debian/apt.dirs index 7d46801df..bdc5adddb 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -1,20 +1 @@ -usr/bin -usr/lib/apt/methods -usr/lib/apt/solvers -usr/lib/apt/planners -usr/lib/dpkg/methods/apt -etc/apt -etc/apt/apt.conf.d -etc/apt/preferences.d -etc/apt/sources.list.d -etc/apt/trusted.gpg.d etc/kernel/postinst.d -etc/logrotate.d -var/cache/apt/archives/partial -var/lib/apt/lists/partial -var/lib/apt/mirrors/partial -var/lib/apt/periodic -var/log/apt -usr/share/bug/apt -usr/share/bash-completion/completions/ -lib/systemd/system/ diff --git a/debian/apt.examples b/debian/apt.examples deleted file mode 100644 index 622ef80b1..000000000 --- a/debian/apt.examples +++ /dev/null @@ -1 +0,0 @@ -build/docs/examples/* diff --git a/debian/apt.install b/debian/apt.install index a8a56c925..42b6df691 100644 --- a/debian/apt.install +++ b/debian/apt.install @@ -1,3 +1,4 @@ +etc/apt/ usr/bin/apt usr/bin/apt-get usr/bin/apt-cache @@ -37,3 +38,4 @@ usr/lib/apt/apt-helper usr/share/doc/apt debian/apt.systemd.daily usr/lib/apt +var/ diff --git a/debian/libapt-pkg-doc.docs b/debian/libapt-pkg-doc.docs index dcacac18b..b57607e31 100644 --- a/debian/libapt-pkg-doc.docs +++ b/debian/libapt-pkg-doc.docs @@ -1,3 +1,2 @@ doc/libapt-pkg2_to_3.txt doc/style.txt -#build/doc/doxygen/html diff --git a/debian/rules b/debian/rules index 1ea0e872b..ab101c2e1 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ override_dh_install-indep: override_dh_install-arch: dh_movefiles - if [ -e debian/tmp/etc/apt ]; then dh_install -papt etc/apt/* etc/apt; fi dh_install --list-missing install -m 644 debian/apt.conf.autoremove debian/apt/etc/apt/apt.conf.d/01autoremove install -m 755 debian/apt.auto-removal.sh debian/apt/etc/kernel/postinst.d/apt-auto-removal -- cgit v1.2.3 From 113eaa29214124652e0605730efe028806624151 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 19 Aug 2016 19:26:55 +0200 Subject: debian: Switch to debhelper 10 debhelper 10 is much nicer with the installation part from a dirty tree, so you can just fix some stuff breaking the install step and then continue building with debuild -b -nc until you have fixed all your stuff. It also has some other advantages, of course, like some bug fixes in shell escaping for maintscript, or systemd helper changes. --- debian/compat | 2 +- debian/control | 2 +- debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/compat b/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index c383e2fc1..fea066dcb 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Julian Andres Klode , David Kalnischkies Standards-Version: 3.9.8 -Build-Depends: dpkg-dev (>= 1.17.14), debhelper (>= 9.20141010), libdb-dev, +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), diff --git a/debian/rules b/debian/rules index ab101c2e1..cc2e36fba 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=0 export CTEST_OUTPUT_ON_FAILURE=1 %: - dh $@ --with systemd --parallel --buildsystem=cmake + dh $@ override_dh_install-indep: dh_movefiles -- cgit v1.2.3 From 9956b3e188901244f40e29d6d4a40a093fa26177 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 19 Aug 2016 19:42:45 +0200 Subject: debian: Add more lintian overrides --- debian/apt.lintian-overrides | 3 +++ debian/libapt-pkg-doc.lintian-overrides | 1 + 2 files changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/apt.lintian-overrides b/debian/apt.lintian-overrides index e51d1119f..7d1e892a3 100644 --- a/debian/apt.lintian-overrides +++ b/debian/apt.lintian-overrides @@ -1,2 +1,5 @@ # the private library is for internal sharing only apt: package-name-doesnt-match-sonames +apt: systemd-service-file-missing-install-key lib/systemd/system/apt-daily.service +apt: shlib-calls-exit usr/lib*/libapt-private.so.0.0.0 +apt: no-symbols-control-file usr/lib*/libapt-private.so.0.0.0 diff --git a/debian/libapt-pkg-doc.lintian-overrides b/debian/libapt-pkg-doc.lintian-overrides index d583d9a87..d7cbc437e 100644 --- a/debian/libapt-pkg-doc.lintian-overrides +++ b/debian/libapt-pkg-doc.lintian-overrides @@ -1,2 +1,3 @@ # embedded by doxygen, see /usr/share/doc/doxygen/README.jquery libapt-pkg-doc: embedded-javascript-library +libapt-pkg-doc: duplicate-files usr/share/doc/libapt-pkg-doc/html/* -- cgit v1.2.3 From 20d2f4a4f164cd9026dad698e471c95d7c28973b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 19 Aug 2016 19:49:54 +0200 Subject: debian: Drop outdated stuff The README.source is not usable anymore, and the Build-Conflicts andd Breaks/Replaces are not needed anymore. --- debian/README.source | 6 ------ debian/control | 3 --- 2 files changed, 9 deletions(-) delete mode 100644 debian/README.source (limited to 'debian') diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 9da152556..000000000 --- a/debian/README.source +++ /dev/null @@ -1,6 +0,0 @@ -Build this package with: -$ debian/rules arch-build -or -$ DEB_BUILD_PROG_OPTS="-S" debian/rules arch-build - -make sure you have the pre-build-depds in README.arch installed diff --git a/debian/control b/debian/control index fea066dcb..cb07b8629 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,6 @@ Build-Depends: dpkg-dev (>= 1.17.14), debhelper (>= 9.20160709~), libdb-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), cmake (>= 3.4), pkg-config, libgtest-dev , dh-systemd Build-Depends-Indep: doxygen, w3m, graphviz -Build-Conflicts: autoconf2.13, automake1.4 Vcs-Git: https://anonscm.debian.org/git/apt/apt.git Vcs-Browser: https://anonscm.debian.org/git/apt/apt.git Testsuite: autopkgtest @@ -20,8 +19,6 @@ Testsuite: autopkgtest Package: apt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gpgv | gpgv2 | gpgv1, adduser -Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~), bash-completion (<< 1:2.1-4.2+fakesync1), apt-utils (<< 1.3~exp2~) -Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~), apt-utils (<< 1.3~exp2~) Recommends: gnupg | gnupg2 | gnupg1 Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt, powermgmt-base Description: commandline package manager -- cgit v1.2.3 From 29742f9563256f2e9dea409f5a923154a93a9359 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 19 Aug 2016 20:03:36 +0200 Subject: debian: Run wrap-and-sort Manually clean up the apt.maintscript, it moved stuff from before the comment to after the comment... --- debian/apt-doc.docs | 2 +- debian/apt-utils.install | 23 +++++++----------- debian/apt.install | 44 +++++++++++++++++----------------- debian/apt.maintscript | 1 - debian/control | 55 ++++++++++++++++++++++++++++++------------- debian/libapt-pkg-dev.install | 4 ++-- 6 files changed, 71 insertions(+), 58 deletions(-) (limited to 'debian') diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs index 3f26b3a2e..bd494002c 100644 --- 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 178b528b7..a27f1e1e4 100644 --- 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 42b6df691..82f2f0806 100644 --- 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 f461e673a..296f83bd5 100644 --- 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 cb07b8629..d4dc4e323 100644 --- a/debian/control +++ b/debian/control @@ -3,24 +3,44 @@ Section: admin Priority: important Maintainer: APT Development Team Uploaders: Michael Vogt , - Julian Andres Klode , - David Kalnischkies + Julian Andres Klode , + David Kalnischkies 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 , 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 , + 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 e85dc9934..42e7c34d5 100644 --- 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 -- cgit v1.2.3 From 99fd3fd5943883d947f2f6cd6a7fd9faf0dcc0bf Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 20 Aug 2016 00:25:34 +0200 Subject: debian: Get rid of dh_movefiles again This workaround is a bit more ugly, but does not use a (somewhat) deprecated debhelper command. Gbp-Dch: ignore --- debian/apt-transport-https.files | 1 - debian/apt-transport-https.install | 1 + debian/apt.files | 2 -- debian/apt.install | 2 ++ debian/rules | 6 +++--- 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 debian/apt-transport-https.files create mode 100644 debian/apt-transport-https.install delete mode 100644 debian/apt.files (limited to 'debian') diff --git a/debian/apt-transport-https.files b/debian/apt-transport-https.files deleted file mode 100644 index 7b14886df..000000000 --- a/debian/apt-transport-https.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/apt/methods/https diff --git a/debian/apt-transport-https.install b/debian/apt-transport-https.install new file mode 100644 index 000000000..7b14886df --- /dev/null +++ b/debian/apt-transport-https.install @@ -0,0 +1 @@ +usr/lib/apt/methods/https diff --git a/debian/apt.files b/debian/apt.files deleted file mode 100644 index 572475192..000000000 --- a/debian/apt.files +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/apt/solvers/dump -usr/lib/apt/planners/dump diff --git a/debian/apt.install b/debian/apt.install index 82f2f0806..2c2187849 100644 --- a/debian/apt.install +++ b/debian/apt.install @@ -12,6 +12,8 @@ usr/bin/apt-mark usr/lib/*/libapt-private.so* usr/lib/apt/apt-helper usr/lib/apt/methods/ +usr/lib/apt/planners/dump +usr/lib/apt/solvers/dump usr/lib/dpkg/methods/apt/ usr/share/bash-completion/completions/ usr/share/doc/apt diff --git a/debian/rules b/debian/rules index cc2e36fba..24608a6b8 100755 --- a/debian/rules +++ b/debian/rules @@ -14,12 +14,12 @@ export CTEST_OUTPUT_ON_FAILURE=1 dh $@ override_dh_install-indep: - dh_movefiles dh_install --list-missing override_dh_install-arch: - dh_movefiles - dh_install --list-missing + dh_install -papt-utils -X/dump + dh_install -papt -Xmethods/https + dh_install --remaining --list-missing install -m 644 debian/apt.conf.autoremove debian/apt/etc/apt/apt.conf.d/01autoremove install -m 755 debian/apt.auto-removal.sh debian/apt/etc/kernel/postinst.d/apt-auto-removal -- cgit v1.2.3 From 15134a8e5458fc634482386f1fd2acbccc3ac892 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 24 Aug 2016 16:28:47 +0200 Subject: Lower-case uname -r output in kernel autoremove helper This is needed on FreeBSD which has versions like 11.0-RC1, otherwise the tests would fail. --- debian/apt.auto-removal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 608d950b5..df9048cd6 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -25,7 +25,7 @@ debverlist="$(echo "$list" | cut -d' ' -f 2 | sort --unique --reverse --version- if [ -n "$1" ]; then installed_version="$(echo "$list" | awk "\$1 == \"$1\" { print \$2;exit; }")" fi -unamer="$(uname -r)" +unamer="$(uname -r | tr '[A-Z]' '[a-z]')" if [ -n "$unamer" ]; then running_version="$(echo "$list" | awk "\$1 == \"$unamer\" { print \$2;exit; }")" fi -- cgit v1.2.3 From f06a44591db7f78898bd4e8818ceab74cd98e1ac Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 29 Aug 2016 15:07:39 +0200 Subject: Add new symbols to symbols file There are some optional symbols missing now, but let's keep them in for now, maybe they reappear/still exist on other platforms. The newly added ones actually appeared in older versions already, but there's no huge gain in finding out when precisely we added them. --- debian/libapt-pkg5.0.symbols | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'debian') diff --git a/debian/libapt-pkg5.0.symbols b/debian/libapt-pkg5.0.symbols index e2db6bb12..0df11f9a5 100644 --- a/debian/libapt-pkg5.0.symbols +++ b/debian/libapt-pkg5.0.symbols @@ -1480,3 +1480,15 @@ libapt-pkg.so.5.0 libapt-pkg5.0 #MINVER# (c++|optional=std)"std::basic_istream >& std::operator>> >(std::basic_istream >&, std::_Get_time)@APTPKG_5.0" 1.3~exp2 (c++|optional=std)"std::basic_ostream >& std::operator<< >(std::basic_ostream >&, std::_Put_time)@APTPKG_5.0" 1.3~exp2 (c++|optional=std)"std::ctype::do_narrow(char, char) const@APTPKG_5.0" 1.3~exp2 + (c++)"EIPP::ApplyRequest(std::__cxx11::list, std::allocator >, EIPP::PKG_ACTION>, std::allocator, std::allocator >, EIPP::PKG_ACTION> > >&, pkgDepCache&)@APTPKG_5.0" 1.3~rc2 + (c++)"EIPP::ReadRequest(int, std::__cxx11::list, std::allocator >, EIPP::PKG_ACTION>, std::allocator, std::allocator >, EIPP::PKG_ACTION> > >&, unsigned int&)@APTPKG_5.0" 1.3~rc2 + (c++)"FileFd::Read(int, void*, unsigned long long, unsigned long long*)@APTPKG_5.0" 1.3~rc2 + (c++)"pkgSourceList::AddVolatileFiles(CommandLine&, std::vector, std::allocator >, std::allocator, std::allocator > > >*)@APTPKG_5.0" 1.3~rc2 + (c++)"pkgSourceList::AddVolatileFile(std::__cxx11::basic_string, std::allocator > const&, std::vector, std::allocator >, std::allocator, std::allocator > > >*)@APTPKG_5.0" 1.3~rc2 + (c++)"TimeRFC1123[abi:cxx11](long, bool)@APTPKG_5.0" 1.3~rc2 + (c++)"unsigned long std::uniform_int_distribution::operator() >(std::linear_congruential_engine&, std::uniform_int_distribution::param_type const&)@APTPKG_5.0" 1.3~rc2 + (c++)"void std::shuffle<__gnu_cxx::__normal_iterator > >, std::linear_congruential_engine&>(__gnu_cxx::__normal_iterator > >, __gnu_cxx::__normal_iterator > >, std::linear_congruential_engine&)@APTPKG_5.0" 1.3~rc2 + (c++)"void std::vector >::emplace_back(pkgDPkgPM::Item::Ops&&, pkgCache::PkgIterator&&)@APTPKG_5.0" 1.3~rc2 + (c++)"void std::vector >::emplace_back(pkgDPkgPM::Item::Ops&&, pkgCache::PkgIterator&)@APTPKG_5.0" 1.3~rc2 + (c++)"void std::vector, std::allocator >, std::allocator, std::allocator > > >::emplace_back, std::allocator > const&>(std::__cxx11::basic_string, std::allocator > const&)@APTPKG_5.0" 1.3~rc2 + (c++)"void std::vector, std::allocator > >, std::allocator, std::allocator > > > >::emplace_back, std::allocator > >(pkgDPkgPM::Item*&&, std::__cxx11::basic_string, std::allocator >&&)@APTPKG_5.0" 1.3~rc2 -- cgit v1.2.3 From 317bb39f3cd6626c74f25d7bdf2907f1b235f553 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 30 Aug 2016 22:20:55 +0200 Subject: Release 1.3~rc3 --- debian/changelog | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 128398d00..a9bd132fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,57 @@ +apt (1.3~rc3) unstable; urgency=medium + + [ Julian Andres Klode ] + * Ignore SIGINT and SIGQUIT for Pre-Install hooks + This basically fixes Bug #832593, as long as your /bin/sh + is not dash, as dash is evil. + * prepare-release: Use equivs and gdebi-core for travis deps + * install-progress: Call the real ::fork() in our fork() method + * Packaging cleanup: + - debian: Install etc/apt if present (e.g., on Ubuntu) + - tests/control: Handle the gpg1/gpg2 mess a bit better + - debian: Make better use of the tree installed by CMake + - debian: Switch to debhelper 10 + - debian: Add more lintian overrides + - debian: Drop outdated stuff + - debian: Run wrap-and-sort + - Add new symbols to symbols file + * Build system fixes, including: + - CMake: Translations: Don't rebuild .mo for line number changes + - CMake: Translations: Pass --previous to msgmerge. + Thanks to Guillem Jover for the suggestion. + - CMake: Do not add po/ if USE_NLS is OFF + - CMake: Install config and logging directories + - CMake: Translations: Build byproduct before output + - CMake: Add Large File Support (Closes: #834767) + * Several portability fixes (full test suite passes on FreeBSD), including: + - CMake: Discover docbook stylesheet in other locations + - Add missing includes and external definitions + - Use C locale instead of C.UTF-8 for protocol strings + - Make directory paths configurable + - Lower-case uname -r output in kernel autoremove helper + - Make root group configurable via ROOT_GROUP + * Accept --autoremove as alias for --auto-remove + * apt-inst: debfile: Pass comp. Name to ExtractTar, not Binary + * changelog: Respect Dir setting for local changelog getting + * init: Add Dir::Bin::planners default entry + * Switch documentation from httpredir.d.o to deb.d.o + + [ Zhou Mo ] + * zh_CN.po: update simplified Chinese translation + + [ David Kalnischkies ] + * do dpkg --configure before --remove/--purge --pending (Closes: 835094) + * prevent C++ locale number formatting in text APIs (try 3) (LP: 1611010) + * do fail on weakhash/loop earlier in acquire (Closes: 835195) + * do not restore selections for already purged packages + * apt-key: warn instead of fail on unreadable keyrings + * show apt-key warnings in apt update (Closes: 834973) + * treat .ddeb files like .deb, especially for dpkg (LP: #1616909) + * randomize acquire order for same type index files + * don't loop on pinning pkgs from absolute debs by regex (Closes: 835818) + + -- Julian Andres Klode Tue, 30 Aug 2016 22:20:28 +0200 + apt (1.3~rc2) unstable; urgency=medium [ Julian Andres Klode ] -- cgit v1.2.3