From 506ab3c78fb67f5e452a1748f4870af767de5ebb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Apr 2014 13:16:18 +0200 Subject: prepare release 1.0.2 --- debian/changelog | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ea2aaa8f3..1a27dd07e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,34 @@ +apt (1.0.2) unstable; urgency=medium + + [ Michael Vogt ] + * fix apt list output for pkgs in dpkg ^rc state + * Notice the user about "apt list -a" when only a single hit if found + * fix test-failure in adt + * apt-private/acqprogress.cc: fix output when ctrl-c is hit during + apt update (LP: #1310548, closes: #744297) + * Fix option name DPkg::Progress-Fancy in apt.8 manpage + (LP: #1310506) + + [ David Kalnischkies ] + * don't double-count seeks in FileFd::Skip for bzip/xz + * deal with umask only if we really need to for mkstemp + * consider priorities only for downloadable pkgs in resolver + * force fancy progressbar redraw on window size change + * clear HitEof flag in FileFd::Seek + * use Google C++ Testing Framework for libapt tests + * support dist-upgrade options in full-upgrade + + [ Trần Ngọc Quân ] + * l10n: vi.po (624t): Update translation + + [ Theppitak Karoonboonyanan ] + * Updated Thai program translation (closes: #745120) + + [ James McCoy ] + * Consistently use Dpkg::Progress* in documentation (Closes: 745452) + + -- Michael Vogt Fri, 25 Apr 2014 13:15:03 +0200 + apt (1.0.1) unstable; urgency=medium [ Michael Vogt ] -- cgit v1.2.3-70-g09d2 From 6c50447eb443768764f83b3ba86ef32780ba6dde Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Apr 2014 14:41:35 +0200 Subject: reduce delta from ubuntu --- apt-pkg/deb/dpkgpm.cc | 2 +- apt-pkg/init.cc | 1 + debian/apt.conf.autoremove | 2 ++ debian/apt.install.in | 2 +- ftparchive/override.cc | 4 ++-- 5 files changed, 7 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index c3e7e1d1d..c52b83c6e 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1617,7 +1617,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) string::size_type pos; FILE *report; - if (_config->FindB("Dpkg::ApportFailureReport", false) == false) + if (_config->FindB("Dpkg::ApportFailureReport", true) == false) { std::clog << "configured to not write apport reports" << std::endl; return; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 3a35f852e..241628632 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -86,6 +86,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$"); // Default cdrom mount point Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/"); diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index cf69d56c3..fc02350ae 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -22,6 +22,8 @@ APT ".*-modules"; ".*-kernel"; "linux-backports-modules-.*"; + # tools + "linux-tools"; }; Never-MarkAuto-Sections diff --git a/debian/apt.install.in b/debian/apt.install.in index 4ffe43e3b..9c9489572 100644 --- a/debian/apt.install.in +++ b/debian/apt.install.in @@ -3,4 +3,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.so.* usr/lib/@DEB_HOST_MULTIARCH@/ \ No newline at end of file +bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ftparchive/override.cc b/ftparchive/override.cc index b4cd49b6c..8a0c5bab1 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -37,7 +37,7 @@ bool Override::ReadOverride(string const &File,bool const &Source) if (F == 0) return _error->Errno("fopen",_("Unable to open %s"),File.c_str()); - char Line[500]; + char Line[1000]; unsigned long long Counter = 0; while (fgets(Line,sizeof(Line),F) != 0) { @@ -141,7 +141,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/) if (F == 0) return _error->Errno("fopen",_("Unable to open %s"),File.c_str()); - char Line[500]; + char Line[1000]; unsigned long long Counter = 0; while (fgets(Line,sizeof(Line),F) != 0) { -- cgit v1.2.3-70-g09d2 From 697c9314c8ba24f3e393b5de11a3fad7adae4bfc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Apr 2014 15:16:46 +0200 Subject: add bash completion for the "apt" command --- debian/apt.dirs | 1 + debian/rules | 2 + share/bash-completions/apt | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 share/bash-completions/apt (limited to 'debian') diff --git a/debian/apt.dirs b/debian/apt.dirs index 6d492a30f..e4bb2c824 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -15,3 +15,4 @@ var/lib/apt/mirrors/partial var/lib/apt/periodic var/log/apt usr/share/bug/apt +usr/share/bash-completion/completions/ \ No newline at end of file diff --git a/debian/rules b/debian/rules index eec016607..196761444 100755 --- a/debian/rules +++ b/debian/rules @@ -189,6 +189,8 @@ apt: build-binary build-manpages debian/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 + # install bash completion + cp share/bash-completions/* debian/$@/usr/share/bash-completion/completions/ # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir diff --git a/share/bash-completions/apt b/share/bash-completions/apt new file mode 100644 index 000000000..9929bf755 --- /dev/null +++ b/share/bash-completions/apt @@ -0,0 +1,95 @@ +# Debian apt(8) completion -*- shell-script -*- + +_apt() +{ + local sourcesdir="/etc/apt/sources.list.d" + local cur prev words cword + _init_completion || return + + # see if the user selected a command already + local COMMANDS=("install" "remove" "purge" "show" "list" + "update" "upgrade" "full-upgrade" "dist-upgrade" + "edit-sources" "help") + + local command i + for (( i=0; i < ${#words[@]}-1; i++ )); do + if [[ ${COMMANDS[@]} =~ ${words[i]} ]]; then + command=${words[i]} + break + fi + done + + # supported options per command + if [[ "$cur" == -* ]]; then + case $command in + install|remove|purge|upgrade|full-upgrade) + COMPREPLY=( $( compgen -W '--show-progress + --fix-broken --purge --verbose-versions --auto-remove + --simulate --dry-run + --download + --fix-missing + --fix-policy + --ignore-hold + --force-yes + --trivial-only + --reinstall --solver' -- "$cur" ) ) + return 0 + ;; + update) + COMPREPLY=( $( compgen -W '--list-cleanup + ' -- "$cur" ) ) + return 0 + ;; + list) + COMPREPLY=( $( compgen -W '--installed --upgradable + --manual-installed + -v --verbose + -a --all-versions + ' -- "$cur" ) ) + return 0 + ;; + show) + COMPREPLY=( $( compgen -W '-a --all-versions + ' -- "$cur" ) ) + return 0 + ;; + esac + fi + + # specific command arguments + if [[ -n $command ]]; then + case $command in + remove|purge) + if [[ -f /etc/debian_version ]]; then + # Debian system + COMPREPLY=( $( \ + _xfunc dpkg _comp_dpkg_installed_packages $cur ) ) + else + # assume RPM based + _xfunc rpm _rpm_installed_packages + fi + return 0 + ;; + install|show|list) + COMPREPLY=( $( apt-cache --no-generate pkgnames "$cur" \ + 2> /dev/null ) ) + return 0 + ;; + edit-sources) + COMPREPLY=( $( compgen -W '$( command ls $sourcesdir )' \ + -- "$cur" ) ) + return 0 + ;; + esac + fi + + # no command yet, show what commands we have + if [ "$command" = "" ]; then + COMPREPLY=( $( compgen -W '${COMMANDS[@]}' -- "$cur" ) ) + fi + + return 0 +} && +complete -F _apt apt + +# ex: ts=4 sw=4 et filetype=sh -- cgit v1.2.3-70-g09d2 From 12701ee3e5a637e5e45c633dc9aa2b16b81df0b8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Apr 2014 18:18:28 +0200 Subject: provide support for debian/apt.conf.$(lsb_release -i -s) vendor specific config files --- debian/apt.conf.Ubuntu | 6 ++++++ debian/apt.maintscript | 3 +++ debian/rules | 7 +++++++ 3 files changed, 16 insertions(+) create mode 100644 debian/apt.conf.Ubuntu create mode 100644 debian/apt.maintscript (limited to 'debian') diff --git a/debian/apt.conf.Ubuntu b/debian/apt.conf.Ubuntu new file mode 100644 index 000000000..c4092ff44 --- /dev/null +++ b/debian/apt.conf.Ubuntu @@ -0,0 +1,6 @@ +// Server information for apt-changelog +APT { + Changelogs { + Server "http://changelogs.ubuntu.com/changelogs"; + }; +}; diff --git a/debian/apt.maintscript b/debian/apt.maintscript new file mode 100644 index 000000000..939769355 --- /dev/null +++ b/debian/apt.maintscript @@ -0,0 +1,3 @@ +rm_conffile /etc/apt/apt.conf.d/20changelog 1.0.3 -- "@" + + diff --git a/debian/rules b/debian/rules index 196761444..300c0f756 100755 --- a/debian/rules +++ b/debian/rules @@ -56,6 +56,9 @@ endif # APT Programs in apt-utils APT_UTILS=ftparchive sortpkgs extracttemplates +# get distro +APT_VENDOR_CONF := $(shell lsb_release -i -s) + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -191,6 +194,10 @@ apt: build-binary build-manpages debian/apt.install chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal # install bash completion cp share/bash-completions/* debian/$@/usr/share/bash-completion/completions/ + # install distro specific apt conf + if [ -e debian/apt.conf.${APT_VENDOR_CONF} ]; then \ + cp debian/apt.conf.${APT_VENDOR_CONF} debian/$@/etc/apt/apt.conf.d/01-vendor-${APT_VENDOR_CONF}; \ + fi # 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-70-g09d2 From c1b3d18934ce35f6a82b05207f53bf9b0cbfb961 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Apr 2014 13:31:41 +0200 Subject: allow vendors to install configuration files Vendors like ubuntu need to change some options, so giving them a way to do this less painfully avoids reducing differences. --- debian/apt.conf.Ubuntu | 6 ------ debian/rules | 9 ++------- vendor/README | 6 ++++++ vendor/ubuntu/apt.conf-01-vendor-ubuntu | 6 ++++++ 4 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 debian/apt.conf.Ubuntu create mode 100644 vendor/ubuntu/apt.conf-01-vendor-ubuntu (limited to 'debian') diff --git a/debian/apt.conf.Ubuntu b/debian/apt.conf.Ubuntu deleted file mode 100644 index c4092ff44..000000000 --- a/debian/apt.conf.Ubuntu +++ /dev/null @@ -1,6 +0,0 @@ -// Server information for apt-changelog -APT { - Changelogs { - Server "http://changelogs.ubuntu.com/changelogs"; - }; -}; diff --git a/debian/rules b/debian/rules index 300c0f756..fc0e9e8f6 100755 --- a/debian/rules +++ b/debian/rules @@ -56,9 +56,6 @@ endif # APT Programs in apt-utils APT_UTILS=ftparchive sortpkgs extracttemplates -# get distro -APT_VENDOR_CONF := $(shell lsb_release -i -s) - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -194,10 +191,8 @@ apt: build-binary build-manpages debian/apt.install chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal # install bash completion cp share/bash-completions/* debian/$@/usr/share/bash-completion/completions/ - # install distro specific apt conf - if [ -e debian/apt.conf.${APT_VENDOR_CONF} ]; then \ - cp debian/apt.conf.${APT_VENDOR_CONF} debian/$@/etc/apt/apt.conf.d/01-vendor-${APT_VENDOR_CONF}; \ - fi + # install vendor specific apt confs + find -L vendor/current -name 'apt.conf-*' | while read conf; do cp "$${conf}" "debian/$@/etc/apt/apt.conf.d/$${conf#*-}"; done # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir diff --git a/vendor/README b/vendor/README index 19cda6236..c2fabbd4c 100644 --- a/vendor/README +++ b/vendor/README @@ -58,3 +58,9 @@ You can use some placeholders in this file, namely: with the value you would expect based on the name. The placeholder ¤t-codename; is yours and can be set in apt-vendor.ent + + +== apt.conf-* + +Files in your vendor directory following this naming scheme will be picked up +by the debian/rules file and installed in /etc/apt/apt.conf.d/ directory. diff --git a/vendor/ubuntu/apt.conf-01-vendor-ubuntu b/vendor/ubuntu/apt.conf-01-vendor-ubuntu new file mode 100644 index 000000000..c4092ff44 --- /dev/null +++ b/vendor/ubuntu/apt.conf-01-vendor-ubuntu @@ -0,0 +1,6 @@ +// Server information for apt-changelog +APT { + Changelogs { + Server "http://changelogs.ubuntu.com/changelogs"; + }; +}; -- cgit v1.2.3-70-g09d2 From a6f22547948f1f998c754850c9ddeb3cba784873 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 28 Apr 2014 12:57:01 +0200 Subject: debian/apt-doc.docs: remove README.MultiArch --- debian/apt-doc.docs | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs index 4ec23f55d..df9701123 100644 --- a/debian/apt-doc.docs +++ b/debian/apt-doc.docs @@ -1,3 +1,2 @@ README.progress-reporting -README.MultiArch doc/external-dependency-solver-protocol.txt -- cgit v1.2.3-70-g09d2