From 9c5104cf35c6bca91247a8a31c1748be80ab7d68 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 10 Jul 2013 16:41:14 +0200 Subject: apt-pkg/packagemanager.cc: * apt-pkg/packagemanager.cc: - increate APT::pkgPackageManager::MaxLoopCount to 5000 --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 295142165..cb47dd456 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ apt (0.9.9.1) UNRELEASED; urgency=low + [ Michael Vogt ] * debian/rules: - call dh_clean in clean (closes: #714980) + * apt-pkg/packagemanager.cc: + - increate APT::pkgPackageManager::MaxLoopCount to 5000 -- Michael Vogt Fri, 05 Jul 2013 16:39:34 +0200 -- cgit v1.2.3 From a86f851619f720b8c4a74d01274c5e2bf012d451 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 3 Nov 2012 00:39:19 +0100 Subject: cherry pick 39a07ec8f2c612a5af234c7713571362f7ca90b4 --- debian/apt.auto-removal.sh | 67 ++++++++++++++++++++++++++++++++++++++++++++++ debian/apt.conf.autoremove | 3 --- debian/apt.dirs | 1 + debian/changelog | 10 +++++++ debian/rules | 2 ++ 5 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 debian/apt.auto-removal.sh (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh new file mode 100644 index 000000000..8f6fc2efc --- /dev/null +++ b/debian/apt.auto-removal.sh @@ -0,0 +1,67 @@ +#!/bin/sh + +set -e + +# Author: Steve Langasek +# +# Mark as not-for-autoremoval those kernel packages that are: +# - the currently booted version +# - the kernel version we've been called for +# - the latest kernel version (determined using rules copied from the grub +# package for deciding which kernel to boot) +# In the common case, this results in exactly two kernels saved, but it can +# result in three kernels being saved. It's better to err on the side of +# saving too many kernels than saving too few. +# +# We generate this list and save it to /etc/apt/apt.conf.d instead of marking +# packages in the database because this runs from a postinst script, and apt +# will overwrite the db when it exits. + +config_file=/etc/apt/apt.conf.d/01autoremove-kernels + +installed_version="$1" +running_version="$(uname -r)" + + +version_test_gt () +{ + local version_test_gt_sedexp="s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" + local version_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`" + local version_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`" + dpkg --compare-versions "$version_a" gt "$version_b" + return "$?" +} + +list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') + +latest_version="" +for i in $list; do + if version_test_gt "$i" "$latest_version"; then + latest_version="$i" + fi +done + +kernels=$(sort -u < "$config_file".dpkg-new <> "$config_file".dpkg-new + echo " \"^linux-image-extra-$kernel.*\";" >> "$config_file".dpkg-new + echo " \"^linux-signed-image-$kernel.*\";" >> "$config_file".dpkg-new +done +cat >> "$config_file".dpkg-new < Fri, 05 Jul 2013 16:39:34 +0200 apt (0.9.9) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 02fed44d5..3979bd810 100755 --- a/debian/rules +++ b/debian/rules @@ -183,6 +183,8 @@ apt: build build-manpages # apt install # cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove + cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal + chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir -- cgit v1.2.3 From bac1fd143d91e1595ef412195f44cfedae42b472 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 3 Nov 2012 08:28:54 +0100 Subject: Make sure we always have at least two kernels marked not for removal --- debian/apt.auto-removal.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 8f6fc2efc..598aee1a3 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -9,6 +9,10 @@ set -e # - the kernel version we've been called for # - the latest kernel version (determined using rules copied from the grub # package for deciding which kernel to boot) +# - the second-latest kernel version, if the booted kernel version is +# already the latest and this script is called for that same version, +# to ensure a fallback remains available in the event the newly-installed +# kernel at this ABI fails to boot # In the common case, this results in exactly two kernels saved, but it can # result in three kernels being saved. It's better to err on the side of # saving too many kernels than saving too few. @@ -35,16 +39,30 @@ version_test_gt () list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') latest_version="" +previous_version="" for i in $list; do if version_test_gt "$i" "$latest_version"; then + previous_version="$latest_version" latest_version="$i" + elif version_test_gt "$i" "$previous_version"; then + previous_version="$i" fi done +if [ "$latest_version" != "$installed_version" ] \ + || [ "$latest_version" != "$running_version" ] \ + || [ "$installed_version" != "$running_version" ] +then + # We have at least two kernels that we have reason to think the + # user wants, so don't save the second-newest version. + previous_version= +fi + kernels=$(sort -u < Date: Mon, 5 Nov 2012 10:27:17 +0100 Subject: get dpkg from apt-config as well and add robustness against missing/failing apt-config (for paranoia) Conflicts: debian/apt.auto-removal.sh --- debian/apt.auto-removal.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 598aee1a3..17becd30e 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -21,7 +21,14 @@ set -e # packages in the database because this runs from a postinst script, and apt # will overwrite the db when it exits. -config_file=/etc/apt/apt.conf.d/01autoremove-kernels + +# +eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d) +test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d" +config_file=${APT_CONF_D}/01autoremove-kernels + +eval $(apt-config shell DPKG Dir::bin::dpkg/f) +test -n "$DPKG" || DPKG="/usr/bin/dpkg" installed_version="$1" running_version="$(uname -r)" @@ -32,11 +39,11 @@ version_test_gt () local version_test_gt_sedexp="s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" local version_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`" local version_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`" - dpkg --compare-versions "$version_a" gt "$version_b" + $DPKG --compare-versions "$version_a" gt "$version_b" return "$?" } -list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') +list=$($DPKG -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') latest_version="" previous_version="" -- cgit v1.2.3 From 50dba2a9ad755f2ce476576f54698128df9ba327 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Tue, 6 Nov 2012 15:54:31 -0700 Subject: * Fix up two things in debian/apt.auto-removal.sh: - Use exact matches with $-terminated regexes, so we don't get confusion between similarly-named kernel flavours. - Keep linux-backports-modules in sync with installed kernels. Conflicts: configure.in debian/changelog doc/apt-verbatim.ent --- debian/apt.auto-removal.sh | 7 ++++--- debian/changelog | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 17becd30e..8b0f1cf69 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -81,9 +81,10 @@ APT { EOF for kernel in $kernels; do - echo " \"^linux-image-$kernel.*\";" >> "$config_file".dpkg-new - echo " \"^linux-image-extra-$kernel.*\";" >> "$config_file".dpkg-new - echo " \"^linux-signed-image-$kernel.*\";" >> "$config_file".dpkg-new + echo " \"^linux-image-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-image-extra-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new done cat >> "$config_file".dpkg-new < Fri, 05 Jul 2013 16:39:34 +0200 apt (0.9.9) unstable; urgency=low -- cgit v1.2.3 From 90b9659c9a959601d5ed1cc77f7c8b9e0d5b8939 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 11 Jul 2013 07:52:34 +0200 Subject: debian/apt.auto-removal.sh: merge the remaining bits --- debian/apt.auto-removal.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 8b0f1cf69..4ada56556 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -22,7 +22,6 @@ set -e # will overwrite the db when it exits. -# eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d) test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d" config_file=${APT_CONF_D}/01autoremove-kernels @@ -43,7 +42,7 @@ version_test_gt () return "$?" } -list=$($DPKG -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') +list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') latest_version="" previous_version="" @@ -74,7 +73,7 @@ EOF ) cat > "$config_file".dpkg-new <> "$config_file".dpkg-new echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-headers-${kernel}$\";" >> "$config_file".dpkg-new done cat >> "$config_file".dpkg-new < Date: Thu, 11 Jul 2013 20:44:52 +0200 Subject: update changelog --- debian/changelog | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 185322bb6..49dee8800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -apt (0.9.9.1) UNRELEASED; urgency=low +apt (0.9.9.1) unstable; urgency=low [ Michael Vogt ] * debian/rules: - call dh_clean in clean (closes: #714980) * apt-pkg/packagemanager.cc: - increate APT::pkgPackageManager::MaxLoopCount to 5000 + * cherry pick debian/apt.auto-removal.sh feature from the + ubuntu/master branch [ Steve Langasek ] * debian/apt.conf.autoremove: don't include linux-image*, @@ -22,7 +24,12 @@ apt (0.9.9.1) UNRELEASED; urgency=low confusion between similarly-named kernel flavours. - Keep linux-backports-modules in sync with installed kernels. - -- Michael Vogt Fri, 05 Jul 2013 16:39:34 +0200 + [ David Kalnischkies ] + * Version 3 for DPkg::Pre-Install-Pkgs with MultiArch info (Closes: #712116) + * implement arch+= and arch-= for sources.list + * prevent MarkInstall of unsynced Multi-Arch:same siblings + + -- Michael Vogt Thu, 11 Jul 2013 20:44:31 +0200 apt (0.9.9) unstable; urgency=low -- cgit v1.2.3 From cd32d098b22a3aaf900e4f400ef92922ebecd6a1 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Tue, 16 Jul 2013 07:14:05 +0200 Subject: Vietnamese updated by Tran Ngoc Quan. Closes: #717016 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 49dee8800..8473d5820 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.9.2) UNRELEASED; urgency=low + + [ Programs translations ] + * Vietnamese updated by Tran Ngoc Quan. Closes: #717016 + + -- Christian Perrier Tue, 16 Jul 2013 07:13:08 +0200 + apt (0.9.9.1) unstable; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 209a7f82159e67aa32f6b3e6052245b707f27979 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Jul 2013 14:56:47 +0200 Subject: fix if-clause to generate hook-info for 'rc' packages (Closes: 717006) --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8473d5820..f7c8f8a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -apt (0.9.9.2) UNRELEASED; urgency=low +apt (0.9.9.2) unstable; urgency=low [ Programs translations ] * Vietnamese updated by Tran Ngoc Quan. Closes: #717016 - -- Christian Perrier Tue, 16 Jul 2013 07:13:08 +0200 + [ David Kalnischkies ] + * fix if-clause to generate hook-info for 'rc' packages (Closes: 717006) + + -- Michael Vogt Wed, 17 Jul 2013 14:56:34 +0200 apt (0.9.9.1) unstable; urgency=low -- cgit v1.2.3 From c1f8f8c0b070b52e7d85ed932418bc3497cc7990 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Jul 2013 19:55:14 +0200 Subject: debian/apt.auto-removal.sh: * debian/apt.auto-removal.sh: - do not include debug symbol packages for the kernel in the blacklist (closes: #717616) --- debian/apt.auto-removal.sh | 2 +- debian/changelog | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 4ada56556..d105f440a 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -42,7 +42,7 @@ version_test_gt () return "$?" } -list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') +list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ && $2 !~ /-dbg$/ { print $2 }' | sed -e's/linux-image-//') latest_version="" previous_version="" diff --git a/debian/changelog b/debian/changelog index f7c8f8a5a..acb27293f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.9.9.3) UNRELEASED; urgency=low + + [ Ben Hutchings ] + * debian/apt.auto-removal.sh: + - do not include debug symbol packages for the kernel in the + blacklist (closes: #717616) + + -- Michael Vogt Tue, 23 Jul 2013 19:54:31 +0200 + apt (0.9.9.2) unstable; urgency=low [ Programs translations ] -- cgit v1.2.3 From d3213963281a4f910b78679dad35bf59ddbd721c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Jul 2013 20:09:05 +0200 Subject: debian/apt.postinst: * debian/apt.postinst: - run /etc/kernel/postinst.d/apt-auto-removal once on upgrade to ensure that the correct auto-removal list is generated (closes: #717615) --- debian/apt.postinst | 4 ++++ debian/changelog | 6 ++++++ 2 files changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index bd814e1af..9ff1e031c 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -28,6 +28,10 @@ case "$1" in chmod -f 0640 /var/log/apt/term.log* || true fi + # create kernel autoremoval blacklist on update + if dpkg --compare-versions "$2" lt-nl 0.9.9.3; then + /etc/kernel/postinst.d/apt-auto-removal + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index acb27293f..119f09ec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ apt (0.9.9.3) UNRELEASED; urgency=low * debian/apt.auto-removal.sh: - do not include debug symbol packages for the kernel in the blacklist (closes: #717616) + + [ Michael Vogt ] + * debian/apt.postinst: + - run /etc/kernel/postinst.d/apt-auto-removal once on upgrade + to ensure that the correct auto-removal list is generated + (closes: #717615) -- Michael Vogt Tue, 23 Jul 2013 19:54:31 +0200 -- cgit v1.2.3 From 462cfb71b8ebfa4da6b5681cee96931c927ae232 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 17:15:18 +0200 Subject: skip all Description fields in apt-cache, not just first (Closes: 717254) * skip all Description fields in apt-cache, not just first (Closes: 717254) * fix 'apt-cache search' crash with missing description (Closes: 647590) --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 119f09ec3..745cf7930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.9.3) UNRELEASED; urgency=low +apt (0.9.9.3) unstable; urgency=low [ Ben Hutchings ] * debian/apt.auto-removal.sh: @@ -11,7 +11,11 @@ apt (0.9.9.3) UNRELEASED; urgency=low to ensure that the correct auto-removal list is generated (closes: #717615) - -- Michael Vogt Tue, 23 Jul 2013 19:54:31 +0200 + [ David Kalnischkies ] + * skip all Description fields in apt-cache, not just first (Closes: 717254) + * fix 'apt-cache search' crash with missing description (Closes: 647590) + + -- Michael Vogt Thu, 25 Jul 2013 17:14:58 +0200 apt (0.9.9.2) unstable; urgency=low -- cgit v1.2.3 From 8b620f4b490a973bfaeaf4de30b72a270a2ef9f2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 09:58:55 +0200 Subject: update changelog for upload --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 745cf7930..5159e5b17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.9.9.4) unstable; urgency=low + + [ David Kalnischkies ] + * pick up Translation-* even if only compressed available (Closes: 717665) + * request absolute URIs from proxies again (0.9.9.3 regession) + (Closes: 717891) + + [ Michael vogt ] + * fix missing changelog entry for 0.9.9.3 (git-dch issue) + + -- Michael Vogt Fri, 26 Jul 2013 09:58:17 +0200 + apt (0.9.9.3) unstable; urgency=low [ Ben Hutchings ] @@ -15,6 +27,9 @@ apt (0.9.9.3) unstable; urgency=low * skip all Description fields in apt-cache, not just first (Closes: 717254) * fix 'apt-cache search' crash with missing description (Closes: 647590) + [ Raphael Geissert ] + * Do not send a connection: keep-alive, at all + -- Michael Vogt Thu, 25 Jul 2013 17:14:58 +0200 apt (0.9.9.2) unstable; urgency=low -- cgit v1.2.3 From ed9ba607b47feae1a435126c5fa05ac2a3690099 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 14:12:29 +0200 Subject: make autoconf happy by "mv configure.{in,ac}" Git-Dch: Ignore --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 3979bd810..05dcf813c 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ build-manpages: build/build-manpages-stamp build/environment.mak: build/configure-stamp @true -configure: configure.in +configure: configure.ac build/configure-stamp: configure dh_testdir -mkdir build -- cgit v1.2.3 From 0571cdfc967d0876dab332aaf04fab21077496e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 18:36:50 +0200 Subject: correct management-typo in description found by lintian --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 7730c2491..29d67d765 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: apt (<< 0.9.4~) Section: libs -Description: package managment runtime library +Description: package management runtime library This library provides the common functionality for searching and managing packages as well as information about packages. Higher-level package managers can depend upon this library. @@ -107,9 +107,9 @@ Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: xz-utils -Description: package managment related utility programs +Description: package management related utility programs This package contains some less used commandline utilities related - to package managment with APT. + to package management with APT. . * apt-extracttemplates is used by debconf to prompt for configuration questions before installation. -- cgit v1.2.3 From ee7ddf1294fca70088f8dcc15bf87323870bd417 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 19:13:55 +0200 Subject: implement debian/rules build-{arch,indep} as required by policy 3.9.4 --- debian/control | 2 +- debian/rules | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 29d67d765..ca18ff01f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Julian Andres Klode -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, diff --git a/debian/rules b/debian/rules index 05dcf813c..4686f569d 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 -build: build/build-stamp +build-binary: build/build-binary-stamp build-debiandoc: build/build-debiandoc-stamp build-manpages: build/build-manpages-stamp @@ -84,7 +84,7 @@ build/configure-stamp: configure cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags) touch $@ -build/build-stamp: build/configure-stamp +build/build-binary-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary # compat symlink for the locale split @@ -120,7 +120,6 @@ clean: debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ -binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. libapt-pkg-doc: build-debiandoc dh_testdir -p$@ @@ -172,9 +171,8 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. -binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build build-manpages +apt: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -220,7 +218,7 @@ apt: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -libapt-pkg-dev: build debian/libapt-pkg-dev.install +libapt-pkg-dev: build-binary debian/libapt-pkg-dev.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -240,7 +238,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_builddeb -p$@ apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates -apt-utils: build build-manpages +apt-utils: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -269,7 +267,7 @@ apt-utils: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install +$(LIBAPT_PKG): build-binary debian/$(LIBAPT_PKG).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -288,7 +286,7 @@ $(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_INST): build debian/$(LIBAPT_INST).install +$(LIBAPT_INST): build-binary debian/$(LIBAPT_INST).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -307,7 +305,7 @@ $(LIBAPT_INST): build debian/$(LIBAPT_INST).install dh_md5sums -p$@ dh_builddeb -p$@ -apt-transport-https: build libapt-pkg-dev +apt-transport-https: build-binary libapt-pkg-dev dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -333,10 +331,12 @@ apt-transport-https: build libapt-pkg-dev configure: $(MAKE) configure -really-clean: clean - -find . -name Makefile.in -print0 | xargs --null --no-run-if-empty -- rm -f - find -name ChangeLog | xargs rm -f - rm -f l33ch-stamp - +# translate targets to targets required by debian-policy +binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https +binary-indep: apt-doc libapt-pkg-doc binary: binary-indep binary-arch +build-arch: build-binary +build-indep: build-manpages build-debiandoc +build: build-indep build-arch + .PHONY: build clean binary-indep binary-arch binary -- cgit v1.2.3 From e941cc69cf3e90ab799dec24587bb339db07038f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 22:37:43 +0200 Subject: exclude config.{sub,guess} from source package Lintian complains about these links in the source package as they leave the source directory and as they are autogenerated there isn't that much sense in shipping them, we can just recreate them before calling configure. --- debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 4686f569d..fc44d5a68 100755 --- a/debian/rules +++ b/debian/rules @@ -77,7 +77,7 @@ build/environment.mak: build/configure-stamp @true configure: configure.ac -build/configure-stamp: configure +build/configure-stamp: configure buildlib/config.sub buildlib/config.guess dh_testdir -mkdir build cp COPYING debian/copyright @@ -116,6 +116,8 @@ clean: rm -rf build rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \ debian/libapt-pkg-dev.install + test ! -L buildlib/config.guess || rm -f buildlib/config.guess + test ! -L buildlib/config.sub || rm -f buildlib/config.sub debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ @@ -328,6 +330,9 @@ apt-transport-https: build-binary libapt-pkg-dev dh_md5sums -p$@ dh_builddeb -p$@ +buildlib/config.guess buildlib/config.sub: + $(MAKE) "$@" + configure: $(MAKE) configure -- cgit v1.2.3 From ed0e7e312b90b62c9de89b82d48cbe52762e74b0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 23:56:28 +0200 Subject: update the symbol files to reflect current state --- debian/libapt-inst1.5.symbols | 6 +-- debian/libapt-pkg4.12.symbols | 121 ++++++++++++++++++------------------------ 2 files changed, 53 insertions(+), 74 deletions(-) (limited to 'debian') diff --git a/debian/libapt-inst1.5.symbols b/debian/libapt-inst1.5.symbols index 8fcd29a3e..030795382 100644 --- a/debian/libapt-inst1.5.symbols +++ b/debian/libapt-inst1.5.symbols @@ -81,12 +81,8 @@ libapt-inst.so.1.5 libapt-inst1.5 #MINVER# (c++|optional)"vtable for pkgCache::VerIterator@Base" 0.8.0 (c++|optional)"vtable for pkgCache::Iterator@Base" 0.8.0 (c++|optional)"vtable for pkgCache::Iterator@Base" 0.8.0 -### gcc-4.4 specific -# (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0 -# (c++|optional=std)"std::basic_string, std::allocator >& std::basic_string, std::allocator >::append(unsigned char*, unsigned char*)@Base" 0.8.0 -### gcc-4.6 specific +### gcc artefacts (c++|optional=std)"std::vector >::~vector()@Base" 0.8.12 - (c++|optional=std)"std::basic_string, std::allocator >& std::basic_string, std::allocator >::_M_replace_dispatch(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, unsigned char*, unsigned char*, std::__false_type)@Base" 0.8.0 ### try to ignore std:: template instances (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index bf42e8b10..2b86c9676 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -36,6 +36,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"safe_snprintf(char*, char*, char const*, ...)@Base" 0.8.0 (c++)"stringcasecmp(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, char const*, char const*)@Base" 0.8.0 (c++)"stringcasecmp(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >)@Base" 0.8.0 + (c++)"stringcasecmp(std::basic_string, std::allocator > const&, char const*)@Base" 0.8.0 (c++)"stringcasecmp(char const*, char const*, char const*, char const*)@Base" 0.8.0 (c++)"tolower_ascii(int)@Base" 0.8.0 (c++)"ParseQuoteWord(char const*&, std::basic_string, std::allocator >&)@Base" 0.8.0 @@ -90,6 +91,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 (c++)"HashString::SupportedHashes()@Base" 0.8.0 (c++)"HashString::_SupportedHashes@Base" 0.8.0 + (c++)"HashString::HashString(HashString const&)@Base" 0.8.0 (c++)"HashString::HashString(std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"HashString::HashString(std::basic_string, std::allocator >, std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"HashString::HashString()@Base" 0.8.0 @@ -517,7 +519,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0 (c++)"pkgCacheGenerator::NewFileVer(pkgCache::VerIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewPackage(pkgCache::PkgIterator&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 - (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, unsigned long)@Base" 0.8.0 (c++)"pkgCacheGenerator::SelectFile(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, pkgIndexFile const&, unsigned long)@Base" 0.8.0 (c++)"pkgCacheGenerator::FinishCache(OpProgress*)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0 @@ -1124,32 +1125,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# debVS@Base 0.8.0 pkgLibVersion@Base 0.8.0 pkgVersion@Base 0.8.0 -### demangle strangeness - buildd report it as MISSING and as new… - (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 -### gcc-4.4 specific -# (c++|optional=inherent)"APT::PackageSet::PackageSet(APT::PackageSet const&)@Base" 0.8.0 -# (c++|optional=inline)"stringcasecmp(char const*, char const*, char const*)@Base" 0.8.0 -# (arch=armel|c++|optional=inline)"stringcasecmp(std::basic_string, std::allocator > const&, char const*)@Base" 0.8.0 -# (c++|optional=inherent)"APT::VersionSet::insert(pkgCache::VerIterator const&)@Base" 0.8.0 -# (c++|optional=inline)"APT::VersionSet::insert(APT::VersionSet const&)@Base" 0.8.0 -# (c++|optional=private)"debTranslationsIndex::IndexFile(char const*) const@Base" 0.8.0 -# (c++|optional=inline)"pkgCache::Iterator::end() const@Base" 0.8.0 -# (c++|optional=inherent)"HashString::operator=(HashString const&)@Base" 0.8.0 -# (c++|regex|optional=std)"^std::less<[^ ]+>::operator\(\)\(.+\) const@Base$" 0.8.0 -# (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 -# (c++|regex|optional=std)"^pkgCache::(Dep|Pkg|Ver|Grp|Prv|Desc|PkgFile)Iterator\*\* std::_.+@Base$" 0.8.0 -### gcc-4.5 specific -# (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0 -# (c++|optional=inline)"FileFd::FileFd(std::basic_string, std::allocator >, FileFd::OpenMode, unsigned long)@Base" 0.8.0 -# (c++|regex|optional=template)"^SPtrArray<[^ ]+>::~SPtrArray\(\)@Base$" 0.8.0 -# (c++|optional=template)"SPtrArray::~SPtrArray()@Base" 0.8.0 -### gcc-4.6 specific -# (c++|optional=template)"SPtrArray::~SPtrArray()@Base" 0.8.0 -# (c++|optional=inline)"IndexTarget::~IndexTarget()@Base" 0.8.11 - (c++|regex|optional=std)"^std::basic_string, std::allocator >::basic_string\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::vector::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 - (c++|optional=template)"HashSumValue<160>::operator std::basic_string, std::allocator >() const@Base" 0.8.16~exp14 ### architecture specific: va_list (arch=armel armhf|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, std::__va_list&) const@Base" 0.8.15~exp1 (arch=i386 hurd-i386 kfreebsd-i386|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1 @@ -1177,16 +1152,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# ### architecture specific: size_t (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0 (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0 -### try to ignore std:: template instances - (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0 - (c++|regex|optional=std)"^(void |DiffInfo\* |)std::_.*@Base$" 0.8.0 - (c++|regex|optional=std)"^(bool|void) std::(operator|sort_heap|make_heap)[^ ]+<.+ >\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::reverse_iterator<.+ > std::__.+@Base$" 0.8.0 - (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^__gnu_cxx::__[^ ]+<.*@Base$" 0.8.0 - (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 - (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 ### (c++)"Configuration::MatchAgainstConfig::clearPatterns()@Base" 0.8.1 (c++)"CreateAPTDirectoryIfNeeded(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.2 @@ -1368,7 +1333,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"FileFd::Skip(unsigned long long)@Base" 0.8.16~exp6 (c++)"FileFd::Write(void const*, unsigned long long)@Base" 0.8.16~exp6 (c++)"FileFd::Truncate(unsigned long long)@Base" 0.8.16~exp6 - (c++)"pkgCache::PkgIterator::PkgIterator(pkgCache&, pkgCache::Package*)@Base" 0.8.16~exp6 (c++)"pkgPolicy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6 (c++)"OptionalIndexTarget::IsOptional() const@Base" 0.8.16~exp6 (c++)"typeinfo for pkgTagFile@Base" 0.8.16~exp6 @@ -1404,16 +1368,11 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=internal|regex)"^SHA384_.*@Base$" 0.8.16~exp2 (c++|optional=internal|regex)"^SHA512_.*@Base$" 0.8.16~exp2 ### orderlist rework: the touched methods are protected -# (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator)@Base" 0.8.0 -# (c++)"pkgPackageManager::DepAdd(pkgOrderList&, pkgCache::PkgIterator, int)@Base" 0.8.0 -# (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1 (c++)"SigINT(int)@Base" 0.8.16~exp14 (c++)"pkgPackageManager::SigINTStop@Base" 0.8.16~exp14 (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool, int)@Base" 0.8.16~exp14 (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator, int)@Base" 0.8.16~exp14 ### FileFd rework: supporting different on-the-fly (de)compressing needs more parameter (abi), but the api is stable -# (c++)"FileFd::OpenDescriptor(int, FileFd::OpenMode, bool)@Base" 0.8.0 -# (c++)"FileFd::Open(std::basic_string, std::allocator >, FileFd::OpenMode, unsigned long)@Base" 0.8.0 (c++)"FileFd::OpenDescriptor(int, unsigned int, FileFd::CompressMode, bool)@Base" 0.8.16~exp9 (c++)"FileFd::OpenDescriptor(int, unsigned int, APT::Configuration::Compressor const&, bool)@Base" 0.8.16~exp9 (c++)"FileFd::ModificationTime()@Base" 0.8.16~exp9 @@ -1425,31 +1384,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=deprecated,previous-inline)"FileFd::gzFd()@Base" 0.8.0 (c++|optional=private)"FileFd::OpenInternDescriptor(unsigned int, APT::Configuration::Compressor const&)@Base" 0.8.16~exp9 ### CacheSet rework: making them real containers breaks bigtime the API (for the CacheSetHelper) -# (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageSet const&, OpProgress*)@Base" 0.8.16~exp2 -# (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageSet const&)@Base" 0.8.16~exp2 -# (c++)"APT::PackageSet::FromString(pkgCacheFile&, std::basic_string, std::allocator > const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromCommandLine(pkgCacheFile&, char const**, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromName(pkgCacheFile&, std::basic_string, std::allocator > const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromTask(pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromRegEx(pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::~PackageSet()@Base" 0.8.0 -# (c++)"APT::VersionSet::FromString(pkgCacheFile&, std::basic_string, std::allocator >, APT::VersionSet::Version const&, APT::CacheSetHelper&, bool const&)@Base" 0.8.0 -# (c++)"APT::VersionSet::FromPackage(pkgCacheFile&, pkgCache::PkgIterator const&, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::FromCommandLine(pkgCacheFile&, char const**, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::~VersionSet()@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::showTaskSelection(APT::PackageSet const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::showRegExSelection(APT::PackageSet const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindTask(pkgCacheFile&, std::basic_string, std::allocator >)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindRegEx(pkgCacheFile&, std::basic_string, std::allocator >)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindAllVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindPackage(pkgCacheFile&, std::basic_string, std::allocator > const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const&, pkgCache::VerIterator, std::basic_string, std::allocator > const&, bool const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindCandInstVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindInstCandVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0 (c++)"APT::PackageContainer, std::allocator > >::const_iterator::getPkg() const@Base" 0.8.16~exp9 (c++)"APT::PackageContainer, std::allocator > >::getConstructor() const@Base" 0.8.16~exp9 (c++)"APT::PackageContainer, std::allocator > >::empty() const@Base" 0.8.16~exp9 @@ -1489,7 +1423,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::VersionContainerInterface::FromModifierCommandLine(unsigned short&, APT::VersionContainerInterface*, pkgCacheFile&, char const*, std::list > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9 (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer, std::allocator > > const&, OpProgress*)@Base" 0.8.16~exp9 (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer, std::allocator > > const&)@Base" 0.8.16~exp9 - (c++)"APT::VersionContainer > >::iterator std::max_element > >::iterator, CompareProviders>(APT::VersionContainer > >::iterator, APT::VersionContainer > >::iterator, CompareProviders)@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer, std::allocator > >::const_iterator@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer, std::allocator > >@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer > >::const_iterator@Base" 0.8.16~exp9 @@ -1530,3 +1463,53 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=private)"pkgCacheGenerator::MergeListVersion(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&, std::basic_string, std::allocator > const&, pkgCache::VerIterator*&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator&, pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7 + (c++)"pkgTagSection::Exists(char const*)@Base" 0.9.7.9~exp1 + (c++)"_strrstrip(char*)@Base" 0.9.7.9~exp2 + (c++)"SplitClearSignedFile(std::basic_string, std::allocator > const&, FileFd*, std::vector, std::allocator >, std::allocator, std::allocator > > >*, FileFd*)@Base" 0.9.7.9~exp2 + (c++)"OpenMaybeClearSignedFile(std::basic_string, std::allocator > const&, FileFd&)@Base" 0.9.7.9~exp2 + (c++)"ExecGPGV(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, int const&, int*)@Base" 0.9.7.9~exp2 + (c++)"SigVerify::RunGPGV(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, int const&)@Base" 0.9.7.9~exp2 + (c++)"Configuration::Dump(std::basic_ostream >&, char const*, char const*, bool)@Base" 0.9.3 + (c++)"AcquireUpdate(pkgAcquire&, int, bool, bool)@Base" 0.9.3 + (c++|optional=private)"pkgAcqMethod::Dequeue()@Base" 0.9.4 + (c++)"pkgCache::DepIterator::IsMultiArchImplicit() const@Base" 0.9.6 + (c++)"pkgCache::PrvIterator::IsMultiArchImplicit() const@Base" 0.9.6 + (c++)"APT::PackageContainerInterface::FromGroup(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::PackageArchitectureMatchesSpecification(std::basic_string, std::allocator > const&, bool)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::~PackageArchitectureMatchesSpecification()@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(pkgCache::PkgIterator const&)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(pkgCache::VerIterator const&)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(char const* const&)@Base" 0.9.7 + (c++)"APT::Configuration::checkLanguage(std::basic_string, std::allocator >, bool)@Base" 0.9.7.5 + (c++)"pkgCdrom::DropTranslation(std::vector, std::allocator >, std::allocator, std::allocator > > >&)@Base" 0.9.7.5 + (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::PrvIterator const&) const@Base" 0.9.8 + (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::VerIterator const&) const@Base" 0.9.8 + (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, unsigned int, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.9.8 + (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, unsigned int, unsigned long, unsigned long)@Base" 0.9.8 + (c++)"FileFd::FileFdErrno(char const*, char const*, ...)@Base" 0.9.9 + (c++)"FileFd::FileFdError(char const*, ...)@Base" 0.9.9 + (c++)"operator<<(std::basic_ostream >&, GlobalError::Item)@Base" 0.9.9 + (c++)"pkgDepCache::IsDeleteOkProtectInstallRequests(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 + (c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 + (c++)"pkgDPkgPM::SendPkgsInfo(_IO_FILE*, unsigned int const&)@Base" 0.9.9.1 + (c++)"pkgCache::VerIterator::MultiArchType() const@Base" 0.9.9.1 +### demangle strangeness - buildd report it as MISSING and as new… + (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 +### gcc artefacts + (c++|regex|optional=std)"^std::vector::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 + (c++|optional=std)"std::ctype::widen(char) const@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct(char const*, char const*, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct(char*, char*, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 +### try to ignore std:: template instances + (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0 + (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0 + (c++|regex|optional=std)"^(void |DiffInfo\* |)std::_.*@Base$" 0.8.0 + (c++|regex|optional=std)"^(bool|void) std::(operator|sort_heap|make_heap)[^ ]+<.+ >\(.+\)@Base$" 0.8.0 + (c++|regex|optional=std)"^std::reverse_iterator<.+ > std::__.+@Base$" 0.8.0 + (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 + (c++|regex|optional=std)"^__gnu_cxx::__[^ ]+<.*@Base$" 0.8.0 + (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 + (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 -- cgit v1.2.3 From 64876cf7963f897efa70c3e424527e2e8651aa29 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sat, 3 Aug 2013 16:07:13 +0200 Subject: Vietnamese translation update. Closes: #718615 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5159e5b17..e2bb9c471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.9.9.5) UNRELEASED; urgency=low + + * Vietnamese translation update. Closes: #718615 + + -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 + apt (0.9.9.4) unstable; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From de81d69704bc5103ca55032a8f009820f30624c7 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sat, 10 Aug 2013 12:51:40 +0200 Subject: Japanese translation update. Closes: #719279 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e2bb9c471..d1ecbff1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.9.9.5) UNRELEASED; urgency=low * Vietnamese translation update. Closes: #718615 + * Japanese translation update. Closes: #719279 -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 -- cgit v1.2.3 From f9e64e7bb0c125b54f0699d9e08956a88b467a7f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 00:19:10 +0200 Subject: use a tmpfile for trustdb.gpg in apt-key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for some "interesting" reason gpg decides that it needs to update its trustdb.gpg file in a --list-keys command even if right before gpg is asked to --check-trustdb. That wouldn't be as bad if it wouldn't modify the keyring being listed at that moment as well, which generates not only warnings which are not a problem for us, but as the keyring modified can be in /usr it modified files which aren't allowed to be modified. The suggested solution in the bugreport is running --check-trustdb unconditionally in an 'apt-key update' call, but this command will not be used in the future and this could still potentially bite us in net-update or adv calls. All of this just to keep a file around, which we do not need… The commit therefore switches to the use of a temporary created trusted.gpg file for everyone and asks gpg to not try to update the trustdb after its intial creation, which seems to avoid the problem altogether. It is using your also faked secring btw as calling the check-trustdb without a keyring is a lot slower … Closes: #687611 Thanks: Andreas Beckmann for the initial patch! --- debian/apt.postinst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index 9ff1e031c..caa05ccdf 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,10 +15,15 @@ set -e case "$1" in configure) - SECRING='/etc/apt/secring.gpg' - # test if secring is an empty normal file - if test -f $SECRING -a ! -s $SECRING; then - rm -f $SECRING + if dpkg --compare-versions "$2" lt-nl 0.9.9.5; then + # we are using tmpfiles for both + rm -f /etc/apt/trustdb.gpg + # this removal was done unconditional since 0.8.15.3 + SECRING='/etc/apt/secring.gpg' + # test if secring is an empty normal file + if test -f $SECRING -a ! -s $SECRING; then + rm -f $SECRING + fi fi apt-key update -- cgit v1.2.3 From ec9272975f454d3911e61e5cc3b29fe90fe2ee54 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 17:26:54 +0200 Subject: do not call 'apt-key update' in apt.postinst The debian-archive-keyring package ships trusted.gpg.d fragment files for a while now and dropped their call to 'apt-key update', so there is no need for use to call it as the keys will always be available. This also finally allows a user to remove key(ring)s without APT to overriding this decision by readding them with this step. The functionality is kept around in the odd case that an old debian-archive-keyring package is used which still calls 'apt-key update' and depends on the import (hence, we also do not enforce a newer version of the debian-archive-keyring via our dependencies) --- debian/apt.postinst | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index caa05ccdf..70de237d0 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -25,7 +25,6 @@ case "$1" in rm -f $SECRING fi fi - apt-key update # ensure tighter permissons on the logs, see LP: #975199 if dpkg --compare-versions "$2" lt-nl 0.9.7.7; then -- cgit v1.2.3 From 713a2de01cc1a0b8dcd71a4137f8a099d22783b7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 21:45:59 +0200 Subject: update changelog for upload --- debian/changelog | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d1ecbff1f..8e4def2b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,48 @@ -apt (0.9.9.5) UNRELEASED; urgency=low +apt (0.9.10) unstable; urgency=low + The "Hello to Debconf" upload + + [ Christian Perrier ] * Vietnamese translation update. Closes: #718615 * Japanese translation update. Closes: #719279 - -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 + [ Michael Vogt ] + * work on fixing coverity scan results: + - fix some off-by-one errors + - fix some resource leaks + - fixes in chroot() handling + - fix some missing va_end() + * make the code -Wall clean again + * remove duplicated #include + * add .travis.yml + * use the 'abi-complicance-checker' package and remove the buildin + copy for the abi checks + + [ David Kalnischkies ] + * ensure that FileFd::Size returns 0 in error cases + * add missing Turkish (tr) to po/LINGUAS + * correct management-typo in description found by lintian + * implement debian/rules build-{arch,indep} as required by policy 3.9.4 + * reenable automatic parallel build of APT + * exclude config.{sub,guess} from source package + * update the symbol files to reflect current state + * unset LANGUAGE for showing [Y/n] answer hints + * fix some unitialized data members + * specific pins below 1000 cause downgrades (Closes: 543966) + * use pkgTagFile to parse "header" of Release files + * fix: --print-uris removes authentication (Closes: 719263) + * always use our own trustdb.gpg in apt-key + * use a tmpfile for trustdb.gpg in apt-key. + Thanks to Andreas Beckmann for the initial patch! (Closes: #687611) + * do not double-slash paths in apt-key (Closes: 665411) + * make the keyring locations in apt-key configurable + * let apt-key del work better with softlink and single key keyrings + * do not call 'apt-key update' in apt.postinst + + [ Colin Watson ] + * prefer native arch over higher priority for providers (Closes: #718482) + + -- Michael Vogt Mon, 12 Aug 2013 21:45:07 +0200 apt (0.9.9.4) unstable; urgency=low -- cgit v1.2.3 From 6fcfa3dc25c1790a8d78c9b88f103fc75b76e82f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 23:42:35 +0200 Subject: install libapt-private* into the apt binary --- debian/apt.install | 4 ---- debian/apt.install.in | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 debian/apt.install create mode 100644 debian/apt.install.in (limited to 'debian') diff --git a/debian/apt.install b/debian/apt.install deleted file mode 100644 index 9d4008fab..000000000 --- a/debian/apt.install +++ /dev/null @@ -1,4 +0,0 @@ -bin/apt-* usr/bin/ -bin/methods/* usr/lib/apt/methods/ -scripts/dselect/* usr/lib/dpkg/methods/apt/ -usr/share/locale/*/*/apt.mo diff --git a/debian/apt.install.in b/debian/apt.install.in new file mode 100644 index 000000000..3527f9005 --- /dev/null +++ b/debian/apt.install.in @@ -0,0 +1,5 @@ +bin/apt-* usr/bin/ +bin/methods/* usr/lib/apt/methods/ +scripts/dselect/* usr/lib/dpkg/methods/apt/ +usr/share/locale/*/*/apt.mo +bin/libapt-private* usr/lib/@DEB_HOST_MULTIARCH@/ \ No newline at end of file -- cgit v1.2.3 From a7737ad3a4e570052415628a02775e84894d897d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 23:59:44 +0200 Subject: really build apt.install --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index fc44d5a68..06ccdac31 100755 --- a/debian/rules +++ b/debian/rules @@ -115,7 +115,7 @@ clean: [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \ - debian/libapt-pkg-dev.install + debian/libapt-pkg-dev.install debian/apt.install test ! -L buildlib/config.guess || rm -f buildlib/config.guess test ! -L buildlib/config.sub || rm -f buildlib/config.sub @@ -174,7 +174,7 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build-binary build-manpages +apt: build-binary build-manpages debian/apt.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ -- cgit v1.2.3 From 0e279e3527ce3dc9de0e01441ad693f415e75d6a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Apr 2013 08:15:06 +0200 Subject: merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes: #705445) Conflicts: debian/changelog --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8e4def2b0..7075cb844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.11) UNRELEASED; urgency=low + + [ Daniel Hartwig ] + * Clarify units of Acquire::http::Dl-Limit (closes: #705445) + + -- Michael Vogt Thu, 15 Aug 2013 09:27:35 +0200 + apt (0.9.10) unstable; urgency=low The "Hello to Debconf" upload @@ -38,7 +45,7 @@ apt (0.9.10) unstable; urgency=low * make the keyring locations in apt-key configurable * let apt-key del work better with softlink and single key keyrings * do not call 'apt-key update' in apt.postinst - + [ Colin Watson ] * prefer native arch over higher priority for providers (Closes: #718482) -- cgit v1.2.3 From b9674b755d40b1394c397864d1fcd05ad58a88a2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Apr 2013 08:16:21 +0200 Subject: merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used with additional arguments (closes: #705510) --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7075cb844..6172cb332 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.9.11) UNRELEASED; urgency=low [ Daniel Hartwig ] * Clarify units of Acquire::http::Dl-Limit (closes: #705445) + * Show a error message if {,dist-}upgrade is used with additional + arguments (closes: #705510) -- Michael Vogt Thu, 15 Aug 2013 09:27:35 +0200 -- cgit v1.2.3 From d8a06f6e478323b2fa8573f6f885c0b16d403642 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Oct 2012 10:29:52 +0200 Subject: * lp:~mvo/apt/config-clear: - support Configuration.Clear() for a clear of the entire configuration Conflicts: debian/changelog --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6172cb332..1c7afd863 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ apt (0.9.11) UNRELEASED; urgency=low * Show a error message if {,dist-}upgrade is used with additional arguments (closes: #705510) + [ Michael Vogt ] + * lp:~mvo/apt/config-clear: + - support Configuration.Clear() for a clear of the entire + configuration + -- Michael Vogt Thu, 15 Aug 2013 09:27:35 +0200 apt (0.9.10) unstable; urgency=low -- cgit v1.2.3 From 488011fa99aee25bedb39ae2cc3115ad1ab000c0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Oct 2012 10:27:50 +0200 Subject: * lp:~mvo/apt/add-glob-function: - add Glob() to fileutl.{cc,h} Conflicts: apt-pkg/contrib/fileutl.h debian/changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1c7afd863..b597d1b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.9.11) UNRELEASED; urgency=low * lp:~mvo/apt/config-clear: - support Configuration.Clear() for a clear of the entire configuration + * lp:~mvo/apt/add-glob-function: + - add Glob() to fileutl.{cc,h} -- Michael Vogt Thu, 15 Aug 2013 09:27:35 +0200 -- cgit v1.2.3 From 34b769c51ac7cf747fb9dc5b8a5697c1c292360b Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sat, 17 Aug 2013 07:58:02 +0200 Subject: French translation update. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d1ecbff1f..201e5b58a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.9.9.5) UNRELEASED; urgency=low * Vietnamese translation update. Closes: #718615 * Japanese translation update. Closes: #719279 + * French translation update. -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 -- cgit v1.2.3 From b44c98f9d80ac59f6602e16e6aedd3a8f9f9485a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 17 Aug 2013 10:03:02 +0200 Subject: update changelog --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bd6357c62..3be808686 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ apt (0.9.11) UNRELEASED; urgency=low + The "Happy 20th Birthday Debian" upload + [ Daniel Hartwig ] * Clarify units of Acquire::http::Dl-Limit (closes: #705445) * Show a error message if {,dist-}upgrade is used with additional @@ -14,6 +16,17 @@ apt (0.9.11) UNRELEASED; urgency=low * feature/apt-binary2 - refactor large chunks of cmdline/*.cc into a new libapt-private library that is shared between the internal apt cmdline tools + - install libapt-private* into the apt binary + - add PACKAGE_MATCHER_ABI_COMPAT define so that this branch can be + merged without breaking ABI + + [ David Kalnischkies ] + * ensure that pkgTagFile isn't writing past Buffer length (Closes: 719629) + * allow Pre-Install-Pkgs hooks to get info over an FD != stdin + (Closes: #671728) + + [ Christian PERRIER ] + * French translation update. -- Michael Vogt Thu, 15 Aug 2013 09:27:35 +0200 -- cgit v1.2.3 From 9b151275077ff13d7c6db8c724f34e11975d0fe7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 19 Aug 2013 11:00:44 +0200 Subject: prepare for release --- debian/changelog | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3be808686..743329184 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,5 @@ -apt (0.9.11) UNRELEASED; urgency=low +apt (0.9.11~exp1) experimental; urgency=low - The "Happy 20th Birthday Debian" upload - [ Daniel Hartwig ] * Clarify units of Acquire::http::Dl-Limit (closes: #705445) * Show a error message if {,dist-}upgrade is used with additional @@ -28,7 +26,7 @@ apt (0.9.11) UNRELEASED; urgency=low [ Christian PERRIER ] * French translation update. - -- Michael Vogt Thu, 15 Aug 2013 09:27:35 +0200 + -- Michael Vogt Mon, 19 Aug 2013 13:25:45 +0200 apt (0.9.10) unstable; urgency=low -- cgit v1.2.3 From ad855ee8629bed7ee611fbd9d18ff5ef03b23592 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 19 Aug 2013 14:59:29 +0200 Subject: add lintian override for no-shlibs-control-file and only install libapt-private.so.* instead libapt-private.so --- debian/apt.install.in | 2 +- debian/apt.lintian-overrides | 2 ++ debian/changelog | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 debian/apt.lintian-overrides (limited to 'debian') diff --git a/debian/apt.install.in b/debian/apt.install.in index 3527f9005..ac12060ce 100644 --- a/debian/apt.install.in +++ b/debian/apt.install.in @@ -2,4 +2,4 @@ bin/apt-* usr/bin/ bin/methods/* usr/lib/apt/methods/ scripts/dselect/* usr/lib/dpkg/methods/apt/ usr/share/locale/*/*/apt.mo -bin/libapt-private* usr/lib/@DEB_HOST_MULTIARCH@/ \ No newline at end of file +bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/ \ No newline at end of file diff --git a/debian/apt.lintian-overrides b/debian/apt.lintian-overrides new file mode 100644 index 000000000..2867c74d9 --- /dev/null +++ b/debian/apt.lintian-overrides @@ -0,0 +1,2 @@ +apt: no-shlibs-control-file +apt: package-name-doesnt-match-sonames diff --git a/debian/changelog b/debian/changelog index 743329184..3757d607c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.11~exp2) experimental; urgency=low + + * add lintian override for no-shlibs-control-file so that + the internal libapt-private.so.0.0.0 can be shipped + * adjust apt.install.in to only install libapt-private.so.* + + -- Michael Vogt Mon, 19 Aug 2013 14:54:58 +0200 + apt (0.9.11~exp1) experimental; urgency=low [ Daniel Hartwig ] -- cgit v1.2.3 From c228846bb123915360e35db50ae0c6bd2334caac Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 19 Aug 2013 15:54:23 +0200 Subject: fix incorrect bugnumber for the Pre-Install-Pkgs hook (Closes: #671726) --- debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3757d607c..5d3758850 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.9.11~exp3) UNRELEASEDexperimental; urgency=low + + * fix incorrect bugnumber for the Pre-Install-Pkgs hook + + -- Michael Vogt Mon, 19 Aug 2013 15:53:47 +0200 + apt (0.9.11~exp2) experimental; urgency=low * add lintian override for no-shlibs-control-file so that @@ -29,7 +35,7 @@ apt (0.9.11~exp1) experimental; urgency=low [ David Kalnischkies ] * ensure that pkgTagFile isn't writing past Buffer length (Closes: 719629) * allow Pre-Install-Pkgs hooks to get info over an FD != stdin - (Closes: #671728) + (Closes: #671726) [ Christian PERRIER ] * French translation update. -- cgit v1.2.3 From 329dea2d39d2518e43f0761c1c89990857e197ad Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 21 Aug 2013 17:59:30 +0200 Subject: prepare unstable upload --- debian/changelog | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5d3758850..4b8086464 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,4 @@ -apt (0.9.11~exp3) UNRELEASEDexperimental; urgency=low - - * fix incorrect bugnumber for the Pre-Install-Pkgs hook - - -- Michael Vogt Mon, 19 Aug 2013 15:53:47 +0200 - -apt (0.9.11~exp2) experimental; urgency=low - - * add lintian override for no-shlibs-control-file so that - the internal libapt-private.so.0.0.0 can be shipped - * adjust apt.install.in to only install libapt-private.so.* - - -- Michael Vogt Mon, 19 Aug 2013 14:54:58 +0200 - -apt (0.9.11~exp1) experimental; urgency=low +apt (0.9.11) unstable; urgency=low [ Daniel Hartwig ] * Clarify units of Acquire::http::Dl-Limit (closes: #705445) @@ -31,6 +17,9 @@ apt (0.9.11~exp1) experimental; urgency=low - install libapt-private* into the apt binary - add PACKAGE_MATCHER_ABI_COMPAT define so that this branch can be merged without breaking ABI + - add lintian override for no-shlibs-control-file so that + the internal libapt-private.so.0.0.0 can be shipped + - adjust apt.install.in to only install libapt-private.so.* [ David Kalnischkies ] * ensure that pkgTagFile isn't writing past Buffer length (Closes: 719629) @@ -40,7 +29,7 @@ apt (0.9.11~exp1) experimental; urgency=low [ Christian PERRIER ] * French translation update. - -- Michael Vogt Mon, 19 Aug 2013 13:25:45 +0200 + -- Michael Vogt Wed, 21 Aug 2013 17:51:09 +0200 apt (0.9.10) unstable; urgency=low -- cgit v1.2.3 From 8f3aa4bd4f8a1ddc4395dab5a1e2382eed75660c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 22 Aug 2013 16:36:31 +0200 Subject: add a breaks libapt-inst for FileFd changes in 0.9.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Partial upgrades… The fix for 704608 assumes that bf35c19b817cc1474b3deabce0b0953c248bad42 was applied to libapt-inst which isn't the case for partial upgrades of course, so break it to ensure that it is the case. Closes: 720449 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index ca18ff01f..f2532312f 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: apt (<< 0.9.4~) +Breaks: apt (<< 0.9.4~), libapt-inst1.5 (<< 0.9.9~) Section: libs Description: package management runtime library This library provides the common functionality for searching and -- cgit v1.2.3 From 5add00693a41234b218512f1f8b3e46b44f5f8d3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 22 Aug 2013 16:46:43 +0200 Subject: add versions to manpages-it Replaces+Breaks In the meantime the package was updated to remove the old APT manpages from this package, so we can now add a Breaks and version it, too. The intial Replaces was added in: b57220d815aedbc023847d0885e08c6ed50e629a --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index f2532312f..3c5d14fe8 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git Package: apt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg -Replaces: manpages-pl (<< 20060617-3~), manpages-it +Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) +Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt Description: commandline package manager -- cgit v1.2.3 From 671e82247726a34007be22a439431ce0e7f55b48 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 24 Aug 2013 09:13:57 +0200 Subject: update changelog for update --- debian/changelog | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4b8086464..de838bf0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +apt (0.9.11.1) unstable; urgency=low + + [ Michael Vogt ] + * more coverity fixes: + - explicit init + - always chdir("/") after chroot() + - ftparchive/override.cc: fix "skip empty lines" code, the pointer + needs to get de-referenced first + * dselect/update: + - remove "-f" option for apt-get update to fix breakage (closes: 720532) + + [ Christopher Baines ] + * Add test for bug #507998 + + [ David Kalnischkies ] + * add a breaks libapt-inst for FileFd changes in 0.9.9 (Closes: 720449) + * add versions to manpages-it Replaces+Breaks + + [ Ángel Guzmán Maeso ] + * apt-pkg:contrib Avoid compiler warning about sign-compare + + -- Michael Vogt Sat, 24 Aug 2013 09:13:27 +0200 + apt (0.9.11) unstable; urgency=low [ Daniel Hartwig ] -- cgit v1.2.3 From c71c4768d1f25a9bbc4dacbd0f58758ec9a3290f Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sun, 25 Aug 2013 15:40:44 +0200 Subject: Changelog entry for Vietnamese translation --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4b8086464..526fdcc2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.12) UNRELEASED; urgency=low + + [ Trần Ngọc Quân ] + * Update Vietnamese translation. Closes: #720752 + + -- Christian Perrier Sun, 25 Aug 2013 15:39:40 +0200 + apt (0.9.11) unstable; urgency=low [ Daniel Hartwig ] -- cgit v1.2.3 From 11e6f40674631154a8db1082f6fbf42de3ce3092 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 26 Aug 2013 18:45:32 +0200 Subject: dselect/install: * dselect/install: - remove "-f" option for apt-get dselect-upgrade (closes: #720532) --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 74674786e..8600a6fbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ -apt (0.9.12) UNRELEASED; urgency=low +apt (0.9.11.2) UNRELEASED; urgency=low [ Trần Ngọc Quân ] * Update Vietnamese translation. Closes: #720752 + + [ Michael Vogt ] + * dselect/install: + - remove "-f" option for apt-get dselect-upgrade (closes: #720532) -- Christian Perrier Sun, 25 Aug 2013 15:39:40 +0200 -- cgit v1.2.3 From a5a5dd04bb1b4a5dd406cfe6c335b3965ee07f28 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 26 Aug 2013 18:52:13 +0200 Subject: update changelog --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8600a6fbb..da19e6c99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,9 @@ apt (0.9.11.2) UNRELEASED; urgency=low [ Michael Vogt ] * dselect/install: - - remove "-f" option for apt-get dselect-upgrade (closes: #720532) + - remove "-f" option for apt-get clean/auto-clean (closes: #720532) + * apt-private/private-cmndline.cc: + - fix typo in CmdMatches() selection for dselect-upgrade (closes: #720532) -- Christian Perrier Sun, 25 Aug 2013 15:39:40 +0200 -- cgit v1.2.3 From ec00e21a90092ec1715fcd278c32a247c3a4bdca Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Tue, 27 Aug 2013 19:01:46 +0200 Subject: Update Italian translation. Closes: #721030 --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index da19e6c99..3ae0d3182 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ apt (0.9.11.2) UNRELEASED; urgency=low + [ Milo Casagrande ] + * Update Italian translation. Closes: #721030 + [ Trần Ngọc Quân ] * Update Vietnamese translation. Closes: #720752 -- cgit v1.2.3 From 3cc29bc2cc37f194bb90ae6ae5c467f230f1d5d2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 31 Aug 2013 16:31:53 +0200 Subject: prepare upload of 0.9.12 --- debian/changelog | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3ae0d3182..25f5c5552 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.11.2) UNRELEASED; urgency=low +apt (0.9.11.2) unstable; urgency=low [ Milo Casagrande ] * Update Italian translation. Closes: #721030 @@ -11,8 +11,15 @@ apt (0.9.11.2) UNRELEASED; urgency=low - remove "-f" option for apt-get clean/auto-clean (closes: #720532) * apt-private/private-cmndline.cc: - fix typo in CmdMatches() selection for dselect-upgrade (closes: #720532) + * use SPtr in DoInstall() to simplify the code + * allow pkg manipulation in the upgrade/dist-upgrade commandline, like + apt-get dist-upgrade 2vcard- 4g8+ (thanks to Thorsten Glaser for the + suggestion) - -- Christian Perrier Sun, 25 Aug 2013 15:39:40 +0200 + [ Angel Guzman Maeso ] + * replace usage of potential dangerous mktemp with mkstemp + + -- Michael Vogt Sat, 31 Aug 2013 16:45:31 +0200 apt (0.9.11.1) unstable; urgency=low -- cgit v1.2.3 From 968179cf7b9e1a633c283745da15755d8de4acbd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 1 Sep 2013 18:34:34 +0200 Subject: Remove invalid "-f" option for apt-get check Thanks to Philipp Weis (closes: #721477) --- debian/apt.cron.daily | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 2665b6579..3f9df9d7e 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -375,7 +375,7 @@ fi check_power || exit 0 # check if we can lock the cache and if the cache is clean -if which apt-get >/dev/null && ! eval apt-get check -f $XAPTOPT $XSTDERR ; then +if which apt-get >/dev/null && ! eval apt-get check $XAPTOPT $XSTDERR ; then debug_echo "error encountered in cron job with \"apt-get check\"." exit 0 fi -- cgit v1.2.3 From bf088e52821828a952cb1c573bbe55c49de11b68 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Sep 2013 17:32:50 +0200 Subject: prepare upload --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 25f5c5552..b13e3be92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +apt (0.9.11.3) unstable; urgency=low + + [ Michael Vogt ] + * Add DPkgPM::Progress option to enable terminal install + progress + * fix typo (mkostemp->mkstemp) + * Remove invalid "-f" option for apt-get check, thanks to + Philipp Weis (closes: #721477) + + [ David Kalnischkies ] + * use FileFd in HashSum test to unbreak non-linux ports. + Thanks to Aaron M. Ucko (Closes: 721723) + + -- Michael Vogt Tue, 10 Sep 2013 17:32:02 +0200 + apt (0.9.11.2) unstable; urgency=low [ Milo Casagrande ] -- cgit v1.2.3 From 58c2833fed05dd044a4a937271fb6a8d639fa863 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Sep 2013 17:41:01 +0200 Subject: Fix regression of "apt-cache unmet -i", thanks to Daniel Schepler (closes: #722324) --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b13e3be92..40160c303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.9.11.3) unstable; urgency=low * fix typo (mkostemp->mkstemp) * Remove invalid "-f" option for apt-get check, thanks to Philipp Weis (closes: #721477) + * Fix regression of "apt-cache unmet -i", thanks to Daniel Schepler + (closes: #722324) [ David Kalnischkies ] * use FileFd in HashSum test to unbreak non-linux ports. -- cgit v1.2.3 From fe03781ffb7fec2b72386e8223f3e0d29f448509 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 20 Sep 2013 14:11:48 +0200 Subject: releasing package apt version 0.9.11.4 --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 40160c303..c272d35e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.9.11.4) unstable; urgency=low + + [ Oskari Saarenmaa ] + * don't truncate 100 char long paths in tar extraction. + Thanks to Mika Eloranta for the testcase! (Closes: #689582) + + [ David Kalnischkies ] + * do not trust FileFd::Eof() in pkgTagFile::Fill() + Thanks to Cyril Brulebois (Closes: 723705) + + -- Michael Vogt Fri, 20 Sep 2013 16:12:07 +0200 + apt (0.9.11.3) unstable; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From ad1d6bfbd75e1121ccfdd3ae159254d799825d37 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Mon, 23 Sep 2013 07:06:18 +0200 Subject: Fix typo in apt-private/private-show.cc. Thanks to Benjamin Keresa. Closes: #724073 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c272d35e5..6e31784f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.11.5) UNRELEASED; urgency=low + + * Fix typo in apt-private/private-show.cc. Thanks to Benjamin + Keresa. Closes: #724073 + + -- Christian Perrier Mon, 23 Sep 2013 07:05:34 +0200 + apt (0.9.11.4) unstable; urgency=low [ Oskari Saarenmaa ] -- cgit v1.2.3 From 3286ad136cbfdb73b97f880ba1ad19a2000781c5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 7 Oct 2013 13:42:50 +0200 Subject: fix libapt-inst for >2G debs (closes: #725483) --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6e31784f2..86d2197c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ apt (0.9.11.5) UNRELEASED; urgency=low + [ Christian Perrier ] * Fix typo in apt-private/private-show.cc. Thanks to Benjamin Keresa. Closes: #724073 + + [ Mark Hymers ] + * fix libapt-inst for >2G debs (closes: #725483) -- Christian Perrier Mon, 23 Sep 2013 07:05:34 +0200 -- cgit v1.2.3 From 5361a6180571f5921b6c006129b5f0c274b6154b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Oct 2013 19:46:39 +0200 Subject: debian/apt.postinst: use --compare-versions lt instead of lt-nl, to ensure the apt-auto-removal file is correctly create, thanks to Ben Hutchings --- debian/apt.postinst | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index 70de237d0..fd3e273bb 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -33,7 +33,7 @@ case "$1" in fi # create kernel autoremoval blacklist on update - if dpkg --compare-versions "$2" lt-nl 0.9.9.3; then + if dpkg --compare-versions "$2" lt 0.9.9.3; then /etc/kernel/postinst.d/apt-auto-removal fi ;; diff --git a/debian/changelog b/debian/changelog index 86d2197c1..638d8ef3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ apt (0.9.11.5) UNRELEASED; urgency=low * Fix typo in apt-private/private-show.cc. Thanks to Benjamin Keresa. Closes: #724073 - [ Mark Hymers ] + [ Mark Hymers ] * fix libapt-inst for >2G debs (closes: #725483) -- Christian Perrier Mon, 23 Sep 2013 07:05:34 +0200 -- cgit v1.2.3 From 005d0bfcfbf6a016782a9854ac6f07e9881b5e74 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Oct 2013 20:39:03 +0200 Subject: prepare new release --- debian/changelog | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 638d8ef3b..ec98a8080 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.11.5) UNRELEASED; urgency=low +apt (0.9.12) UNRELEASED; urgency=low [ Christian Perrier ] * Fix typo in apt-private/private-show.cc. Thanks to Benjamin @@ -7,7 +7,39 @@ apt (0.9.11.5) UNRELEASED; urgency=low [ Mark Hymers ] * fix libapt-inst for >2G debs (closes: #725483) - -- Christian Perrier Mon, 23 Sep 2013 07:05:34 +0200 + [ David Kalnischkies ] + * don't strip :any from dependencies in single-arch (Closes: 723586) + * pkg from only trusted sources keeps being trusted (Closes: 617690) + * compression-neutral message for missing data.tar member (Closes: 722710) + * print-uris prints regardless of quiet-level again (Closes: 722207) + * retry without partial data after a 416 response (Closes: 710924) + * replace "filesize - 1" trick in http with proper 416 handling + * fix partial (206 and 416) support in https + * handle complete responses to https range requests (Closes: 617643, 667699) + (LP: 1157943) + * don't consider holds for autoremoval (Closes: 724995) + * put fetch errors in 'source' on our errorstack + * use pkgAcqArchive in 'download' for proper errors + * fix lzma-support detection via xz binary + * do not ++ on erased package pointers in autoremove + + [ Michael Vogt ] + * Add new "apt-get upgrade --with-new-pkgs" option (and add man-page for it). + So "apt-get upgrade --with-new-pkgs" will pull in new dependencies but + never remove packages + * Rename "--dpkg-progress" to "--show-progress" and document it in + apt-get.8. This will show global install progress information in the + terminal window. + * Fix status-fd progress calculation for certain multi-arch install/upgrade + situations + * add new -o DpkgPM::Progress-Fancy for nicer dpkg progress output + on vt100+ terminals + * fix libapt-inst for >2G debs (closes: #725483), thanks to Mark Hymers + * debian/apt.postinst: use --compare-versions lt instead of lt-nl, + to ensure the apt-auto-removal file is correctly create, + thanks to Ben Hutchings + + -- Michael Vogt Tue, 08 Oct 2013 20:38:55 +0200 apt (0.9.11.4) unstable; urgency=low -- cgit v1.2.3 From e81ccffc7a9cc222570adfddf9d08df7cce82691 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Oct 2013 10:27:11 +0200 Subject: update Uploaders to match recent uploaders better --- debian/changelog | 3 ++- debian/control | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ec98a8080..287db9b28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,8 +38,9 @@ apt (0.9.12) UNRELEASED; urgency=low * debian/apt.postinst: use --compare-versions lt instead of lt-nl, to ensure the apt-auto-removal file is correctly create, thanks to Ben Hutchings + * update Uploaders to match recent uploaders better - -- Michael Vogt Tue, 08 Oct 2013 20:38:55 +0200 + -- Michael Vogt Tue, 08 Oct 2013 20:38:55 +0200 apt (0.9.11.4) unstable; urgency=low diff --git a/debian/control b/debian/control index 3c5d14fe8..673fba477 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team -Uploaders: Michael Vogt , Otavio Salvador , - Christian Perrier , Daniel Burrows , +Uploaders: Michael Vogt , Christian Perrier , Julian Andres Klode Standards-Version: 3.9.4 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, -- cgit v1.2.3 From 6c7939ec599f561e4b8243fda1a7aa0c662557e9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Oct 2013 15:02:49 +0200 Subject: update changelog --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 287db9b28..1d67ae160 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,10 @@ apt (0.9.12) UNRELEASED; urgency=low to ensure the apt-auto-removal file is correctly create, thanks to Ben Hutchings * update Uploaders to match recent uploaders better + * Set the default "Acquire::PDiffs::FileLimit" to 20. If the amount + of pdiffs is bigger things tend to get slower. Set + Acquire::PDiffs::FileLimit "0"; + in /etc/apt/preferences to get the old behavior back. -- Michael Vogt Tue, 08 Oct 2013 20:38:55 +0200 -- cgit v1.2.3 From 46cffd8a0ad4c1b1da93f9e3e1e31eddd7cbe7cb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Oct 2013 20:50:13 +0200 Subject: releasing package apt version 0.9.12 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1d67ae160..9523f4c6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.12) UNRELEASED; urgency=low +apt (0.9.12) unstable; urgency=low [ Christian Perrier ] * Fix typo in apt-private/private-show.cc. Thanks to Benjamin @@ -44,7 +44,7 @@ apt (0.9.12) UNRELEASED; urgency=low Acquire::PDiffs::FileLimit "0"; in /etc/apt/preferences to get the old behavior back. - -- Michael Vogt Tue, 08 Oct 2013 20:38:55 +0200 + -- Michael Vogt Wed, 09 Oct 2013 20:50:03 +0200 apt (0.9.11.4) unstable; urgency=low -- cgit v1.2.3 From 41ee37c8f831fc677203000a6c91a53529f543f9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Oct 2013 21:20:57 +0200 Subject: fix typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9523f4c6d..cc7a24c3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,7 +42,7 @@ apt (0.9.12) unstable; urgency=low * Set the default "Acquire::PDiffs::FileLimit" to 20. If the amount of pdiffs is bigger things tend to get slower. Set Acquire::PDiffs::FileLimit "0"; - in /etc/apt/preferences to get the old behavior back. + in /etc/apt/apt.conf to get the old behavior back. -- Michael Vogt Wed, 09 Oct 2013 20:50:03 +0200 -- cgit v1.2.3 From daadc1460a9abf03489ba845a3f0f9fac3ec4544 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 15 Oct 2013 18:50:09 +0200 Subject: releasing package apt version 0.9.12.1 --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cc7a24c3a..379a66c80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +apt (0.9.12.1) unstable; urgency=low + + [ Michael Vogt ] + * do not send pkgname:arch over the APT::Status-Fd to not break + clients (closes: 726156). A new APT::Status-deb822-Fd will be + used to fix this. + * add integration tests for APT::Status-Fd + * add missing _() around the new "Progress" string + + [ David Kalnischkies ] + * fix progress-segfault in case of dpkg errors/prompts (Closes: 726047) + + -- Michael Vogt Tue, 15 Oct 2013 18:25:51 +0200 + apt (0.9.12) unstable; urgency=low [ Christian Perrier ] -- cgit v1.2.3 From 3d22a7fddc53b1b76d8961b10e4151ada46c4658 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 15 Oct 2013 21:12:19 +0200 Subject: fix changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 379a66c80..65269de95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,7 +43,7 @@ apt (0.9.12) unstable; urgency=low never remove packages * Rename "--dpkg-progress" to "--show-progress" and document it in apt-get.8. This will show global install progress information in the - terminal window. + terminal. * Fix status-fd progress calculation for certain multi-arch install/upgrade situations * add new -o DpkgPM::Progress-Fancy for nicer dpkg progress output @@ -58,7 +58,7 @@ apt (0.9.12) unstable; urgency=low Acquire::PDiffs::FileLimit "0"; in /etc/apt/apt.conf to get the old behavior back. - -- Michael Vogt Wed, 09 Oct 2013 20:50:03 +0200 + -- Michael Vogt Wed, 09 Oct 2013 22:39:41 +0200 apt (0.9.11.4) unstable; urgency=low -- cgit v1.2.3