From 3c8cda8b05d6eeaef76c7ccc673fe378b0c74f37 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Oct 2008 18:14:29 +0100 Subject: fix various -Wall warnings --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5b5657731..0347e83ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,12 @@ apt (0.7.17~exp2) experimental; urgency=low * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) + + [ Michael Vogt ] + * fix various -Wall warnings - -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 + -- Michael Vogt Tue, 28 Oct 2008 18:06:38 +0100 apt (0.7.17~exp1) experimental; urgency=low -- cgit v1.2.3-70-g09d2 From fca67219cce0a38176bdd882ab9b69017942cbf2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Oct 2008 10:09:26 +0100 Subject: upload as 0.7.17~exp3 --- configure.in | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/configure.in b/configure.in index 809bafca7..995ca5671 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.17~exp2") +AC_DEFINE_UNQUOTED(VERSION,"0.7.17~exp3") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 566ed4324..925a7b0fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ apt (0.7.17~exp3) experimental; urgency=low * apt-pkg/acquire-item.cc: - - fix a merge modification (done by me) that prevents the - fallback to the uncompressed 'Packages' to work correctly + - fix a merge mistake that prevents the fallback to the + uncompressed 'Packages' to work correctly -- Michael Vogt Wed, 29 Oct 2008 09:36:24 +0100 -- cgit v1.2.3-70-g09d2 From 640cfb9604fabe8eb5f634f27c9a9851348d5a17 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Oct 2008 18:55:11 +0100 Subject: add missing bugnumber --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 925a7b0fe..824b34990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ apt (0.7.17~exp3) experimental; urgency=low * apt-pkg/acquire-item.cc: - fix a merge mistake that prevents the fallback to the - uncompressed 'Packages' to work correctly + uncompressed 'Packages' to work correctly (closes: #409284) -- Michael Vogt Wed, 29 Oct 2008 09:36:24 +0100 -- cgit v1.2.3-70-g09d2 From 94cb04ddd1f9221e16680dceb98afad6a1273c50 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:01:52 +0200 Subject: Fixed bashisms in apt-key. --- cmdline/apt-key | 6 +++--- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-key b/cmdline/apt-key index 51a0bc2d1..94c11497c 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -60,16 +60,16 @@ net_update() { if [ ! -d /var/lib/apt/keyrings ]; then mkdir -p /var/lib/apt/keyrings fi - keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING) + keyring=/var/lib/apt/keyrings/`basename $ARCHIVE_KEYRING` old_mtime=0 if [ -e $keyring ]; then - old_mtime=$(stat -c %Y $keyring) + old_mtime=`stat -c %Y $keyring` fi (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) if [ ! -e $keyring ]; then return fi - new_mtime=$(stat -c %Y $keyring) + new_mtime=`stat -c %Y $keyring` if [ $new_mtime -ne $old_mtime ]; then echo "Checking for new archive signing keys now" add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING diff --git a/debian/changelog b/debian/changelog index 40e1cc23d..dedb574b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.7.17) unstable; urgency=low * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) + * cmdline/apt-key: + - Fixed bashisms; -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 -- cgit v1.2.3-70-g09d2 From f7e51977e235f67cdcf8d3c83d11fe9df2ea3e43 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:04:30 +0200 Subject: Fixed 'debian/rules ignores make errors' lintian warnings. --- debian/changelog | 2 ++ debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dedb574b8..07360eca6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.7.17) unstable; urgency=low (Closes: #425150) * cmdline/apt-key: - Fixed bashisms; + * debian/rules: + - Fixed lintian warnings "debian/rules ignores make errors". -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/rules b/debian/rules index 006d2de8a..3b9a115d7 100755 --- a/debian/rules +++ b/debian/rules @@ -125,8 +125,8 @@ build/build-doc-stamp: build/configure-stamp clean: dh_testdir # dh_testroot - -$(MAKE) clean - -$(MAKE) distclean + [ -f Makefile ] && $(MAKE) clean + [ -f Makefile ] && $(MAKE) distclean rm -rf build -- cgit v1.2.3-70-g09d2 From 9b9eb42ace92e3dd2e0a3e5fcaeb251708517106 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:08:12 +0200 Subject: 'Source-Version' in debian/control became 'binary:Version'. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 07360eca6..832f41be1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ apt (0.7.17) unstable; urgency=low - Fixed bashisms; * debian/rules: - Fixed lintian warnings "debian/rules ignores make errors". + * debian/control: + - Substituted outdated "Source-Version" fields with "binary:Version". -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/control b/debian/control index a3c84d72a..e3a727e84 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${Source-Version}), apt-utils (= ${Source-Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} +Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for -- cgit v1.2.3-70-g09d2 From a76446ffb2496427d4268c191c4ffdea3bfac3a9 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:33:12 +0200 Subject: Fixed 'Devel' -> 'Debian' doc-base sections. --- debian/changelog | 3 +++ debian/libapt-pkg-doc.doc-base.cache | 2 +- debian/libapt-pkg-doc.doc-base.dpkg-tech | 2 +- debian/libapt-pkg-doc.doc-base.files | 2 +- debian/libapt-pkg-doc.doc-base.method | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 832f41be1..14f6ffd27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ apt (0.7.17) unstable; urgency=low - Fixed lintian warnings "debian/rules ignores make errors". * debian/control: - Substituted outdated "Source-Version" fields with "binary:Version". + * debian/libapt-pkg-doc.doc-base.*: + - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate + lintian warnings. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/libapt-pkg-doc.doc-base.cache b/debian/libapt-pkg-doc.doc-base.cache index 59558dee8..4b47db810 100644 --- a/debian/libapt-pkg-doc.doc-base.cache +++ b/debian/libapt-pkg-doc.doc-base.cache @@ -8,7 +8,7 @@ Abstract: The APT Cache Specification describes the complete implementation tree very fast by pre-linking important things like dependencies and provides. The specification doubles as documentation for one of the in-memory structures used by the package library and the APT GUI. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/cache.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.dpkg-tech b/debian/libapt-pkg-doc.doc-base.dpkg-tech index 3afc262e9..055e8e674 100644 --- a/debian/libapt-pkg-doc.doc-base.dpkg-tech +++ b/debian/libapt-pkg-doc.doc-base.dpkg-tech @@ -3,7 +3,7 @@ Title: APT's interpetation of DPkg Technical Specification Author: Jason Gunthorpe Abstract: The DPkg Technical Manual gives an overview of dpkg's external functions(as APT sees them) and describes how it views the world. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/dpkg-tech.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.files b/debian/libapt-pkg-doc.doc-base.files index e0b79358c..a9faec027 100644 --- a/debian/libapt-pkg-doc.doc-base.files +++ b/debian/libapt-pkg-doc.doc-base.files @@ -4,7 +4,7 @@ Author: Jason Gunthorpe Abstract: The APT Files document describes the complete implementation and format of the installed APT directory structure. It also serves as guide to how APT views the Debian archive. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/files.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.method b/debian/libapt-pkg-doc.doc-base.method index 61c361251..f40d875bd 100644 --- a/debian/libapt-pkg-doc.doc-base.method +++ b/debian/libapt-pkg-doc.doc-base.method @@ -3,7 +3,7 @@ Title: APT Method Interface Author: Jason Gunthorpe Abstract: The APT Method Interface document describes the interface that APT uses to the archive access methods. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/method.html/index.html -- cgit v1.2.3-70-g09d2 From 7b4159cf2a4b7de10622c7e4e29247067358a3ab Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:34:27 +0200 Subject: Added 'python-apt' to Suggests of apt (because of apt-mark). --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 14f6ffd27..d2e8fcc52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ apt (0.7.17) unstable; urgency=low - Fixed lintian warnings "debian/rules ignores make errors". * debian/control: - Substituted outdated "Source-Version" fields with "binary:Version". + - Added 'python-apt' to Suggests, as apt-mark need it for work. * debian/libapt-pkg-doc.doc-base.*: - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate lintian warnings. diff --git a/debian/control b/debian/control index e3a727e84..468d1f641 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. -- cgit v1.2.3-70-g09d2 From 0c96f6dfdc1cb3a64b1be05bb192463d1601edc0 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 23:17:01 +0200 Subject: Added 'set -e' to maintainer scripts. --- debian/changelog | 3 +++ debian/postrm | 2 ++ debian/preinst | 2 ++ debian/prerm | 2 ++ 4 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d2e8fcc52..47e2d9587 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ apt (0.7.17) unstable; urgency=low * debian/libapt-pkg-doc.doc-base.*: - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate lintian warnings. + * debian/{postrm,prerm,preinst}: + - Added 'set -e', fixes lintian warnings + 'maintainer-script-ignores-error'. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/postrm b/debian/postrm index 8b921dda1..ae1e18d33 100755 --- a/debian/postrm +++ b/debian/postrm @@ -8,6 +8,8 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +set -e + #DEBHELPER# case "$1" in diff --git a/debian/preinst b/debian/preinst index 276eae5de..985ad9b84 100755 --- a/debian/preinst +++ b/debian/preinst @@ -1,5 +1,7 @@ #! /bin/sh +set -e + # dpkg does this for us while we are upgrading.. #if [ "$1" = "upgrade" -a -L /var/state/apt -a -e /var/lib/apt -a ! -L /var/state/apt ] && dpkg --compare-versions "$2" ">=" "0.4.10"; then # rm /var/state/apt diff --git a/debian/prerm b/debian/prerm index ac70a0279..4a8d47782 100755 --- a/debian/prerm +++ b/debian/prerm @@ -1,5 +1,7 @@ #! /bin/sh +set -e + #DEBHELPER# if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] && -- cgit v1.2.3-70-g09d2 From f72538c52031241cb3cb3cd46c87cd046e20f237 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 23:21:22 +0200 Subject: Removed unneeded 'LOCAL' entry, now clean runs smoothly in dselect/ directory. --- debian/changelog | 2 ++ dselect/makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 47e2d9587..58e3f15d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.17) unstable; urgency=low * debian/{postrm,prerm,preinst}: - Added 'set -e', fixes lintian warnings 'maintainer-script-ignores-error'. + * dselect/makefile: + - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/dselect/makefile b/dselect/makefile index c2059f92a..fab72b264 100644 --- a/dselect/makefile +++ b/dselect/makefile @@ -11,7 +11,7 @@ TO = $(BUILD)/scripts/dselect TARGET = program include $(COPY_H) -LOCAL = dselect +# LOCAL = dselect SOURCE = install update TYPE = sh include $(PODOMAIN_H) -- cgit v1.2.3-70-g09d2 From 18c497690be5c6de0d8fcab2729f0c13d782ce8e Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 23:29:37 +0200 Subject: Dropped Debian revision '-1' from build dependency on 'doc-base'. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 58e3f15d1..9a86b3fa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ apt (0.7.17) unstable; urgency=low * debian/control: - Substituted outdated "Source-Version" fields with "binary:Version". - Added 'python-apt' to Suggests, as apt-mark need it for work. + - Drop Debian revision from 'doc-base' build dependency, this fixes + appropriate lintian warning. * debian/libapt-pkg-doc.doc-base.*: - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate lintian warnings. diff --git a/debian/control b/debian/control index 468d1f641..0f72299b6 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12-1), xsltproc, docbook-xsl, xmlto +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt -- cgit v1.2.3-70-g09d2 From 20ba2505a3a2e9f2c526800d154270edce22d78f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Fri, 31 Oct 2008 20:24:05 +0200 Subject: Reverted 'bashisms' commit, it was wrong as $(...) is not a bashism. --- cmdline/apt-key | 6 +++--- debian/changelog | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-key b/cmdline/apt-key index 94c11497c..51a0bc2d1 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -60,16 +60,16 @@ net_update() { if [ ! -d /var/lib/apt/keyrings ]; then mkdir -p /var/lib/apt/keyrings fi - keyring=/var/lib/apt/keyrings/`basename $ARCHIVE_KEYRING` + keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING) old_mtime=0 if [ -e $keyring ]; then - old_mtime=`stat -c %Y $keyring` + old_mtime=$(stat -c %Y $keyring) fi (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) if [ ! -e $keyring ]; then return fi - new_mtime=`stat -c %Y $keyring` + new_mtime=$(stat -c %Y $keyring) if [ $new_mtime -ne $old_mtime ]; then echo "Checking for new archive signing keys now" add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING diff --git a/debian/changelog b/debian/changelog index 9a86b3fa5..c6b7b170c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,6 @@ apt (0.7.17) unstable; urgency=low * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) - * cmdline/apt-key: - - Fixed bashisms; * debian/rules: - Fixed lintian warnings "debian/rules ignores make errors". * debian/control: -- cgit v1.2.3-70-g09d2 From acbd8c84cf41ab41172d6197439c36f71220e40e Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Fri, 31 Oct 2008 20:56:17 +0200 Subject: Added lintian override of 'must depend on python. --- debian/changelog | 4 ++++ debian/rules | 3 +++ share/lintian-overrides | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 share/lintian-overrides (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c6b7b170c..625dd8e0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,10 @@ apt (0.7.17) unstable; urgency=low 'maintainer-script-ignores-error'. * dselect/makefile: - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. + * share/lintian-overrides: + - Added with override of 'apt must depend on python'. Script 'apt-mark' + needs apt-python for working and checks this on fly. We don't want + python in most cases. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/rules b/debian/rules index 3b9a115d7..f6ff3c47a 100755 --- a/debian/rules +++ b/debian/rules @@ -217,6 +217,9 @@ apt: build debian/shlibs.local cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog + # copy lintian override + cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt + # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir rm -f build/po/*.pot diff --git a/share/lintian-overrides b/share/lintian-overrides new file mode 100644 index 000000000..49c5ce53c --- /dev/null +++ b/share/lintian-overrides @@ -0,0 +1,3 @@ +# apt-mark is rarely used auxiliary script, we don't want to depend on +# python-apt only for it. +apt binary: python-script-but-no-python-dep ./usr/bin/apt-mark -- cgit v1.2.3-70-g09d2 From dac074b0ad8925ea542edea8ffd113736364344e Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Fri, 31 Oct 2008 21:21:18 +0200 Subject: Added 'unset GREP_OPTIONS' to apt-key. --- cmdline/apt-key | 1 + debian/changelog | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/cmdline/apt-key b/cmdline/apt-key index 51a0bc2d1..7bb30240e 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -1,6 +1,7 @@ #!/bin/sh set -e +unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available diff --git a/debian/changelog b/debian/changelog index 625dd8e0b..beef99123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,10 @@ apt (0.7.17) unstable; urgency=low - Added with override of 'apt must depend on python'. Script 'apt-mark' needs apt-python for working and checks this on fly. We don't want python in most cases. + * cmdline/apt-key: + - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' + failure when GREP_OPTIONS contains options that modify grep output. + (Closes: #428752) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 -- cgit v1.2.3-70-g09d2 From 00ea69fc15f5ce04e92b75707d2f21a8d2f235e4 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 01:21:47 +0200 Subject: debian/control improvements --- debian/changelog | 3 +++ debian/control | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index beef99123..3355d4e3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,9 @@ apt (0.7.17) unstable; urgency=low - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' failure when GREP_OPTIONS contains options that modify grep output. (Closes: #428752) + * debian/control: + - 'Vcs-Bzr' field is official, used it. + - Lowercased short package descriptions. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/control b/debian/control index 0f72299b6..cfcbf50a0 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador Standards-Version: 3.7.2.2 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto -XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ +Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any @@ -15,7 +15,7 @@ Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Section: admin -Description: Advanced front-end for dpkg +Description: advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. It provides the apt-get utility and APT dselect method that provides a simpler, safer way to install and upgrade packages. @@ -28,7 +28,7 @@ Architecture: all Priority: optional Replaces: apt (<< 0.5.4.9) Section: doc -Description: Documentation for APT +Description: documentation for APT This package contains the user guide and offline guide, for APT, an Advanced Package Tool. @@ -37,7 +37,7 @@ Architecture: any Priority: optional Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} Section: libdevel -Description: Development files for APT's libapt-pkg and libapt-inst +Description: development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for developing with APT's libapt-pkg Debian package manipulation library and the libapt-inst deb/tar/ar library. @@ -46,7 +46,7 @@ Package: libapt-pkg-doc Architecture: all Priority: optional Section: doc -Description: Documentation for APT development +Description: documentation for APT development This package contains documentation for development of the APT Debian package manipulation program and its libraries. -- cgit v1.2.3-70-g09d2 From 575f120279afc7e74c980eb9feae8fce5900a196 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 01:30:51 +0200 Subject: Bumped Standards-Version to 3.8.0. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3355d4e3b..6b7daadc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ apt (0.7.17) unstable; urgency=low * debian/control: - 'Vcs-Bzr' field is official, used it. - Lowercased short package descriptions. + - Bumped 'Standards-Version' to 3.8.0, no changes needed. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/control b/debian/control index cfcbf50a0..99666c6cb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador -Standards-Version: 3.7.2.2 +Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3-70-g09d2 From c94dd3c6a691e2d447f3fd9ac479302823079d43 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 12:23:06 +0200 Subject: Advanced apt-cache.cc's built-in help. --- cmdline/apt-cache.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index f10ea48be..e0043b0c8 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1739,7 +1739,7 @@ bool ShowHelp(CommandLine &Cmd) " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" - " pkgnames - List the names of all packages\n" + " pkgnames - List the names of all packages in the system\n" " dotty - Generate package graphs for GraphVis\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" diff --git a/debian/changelog b/debian/changelog index 6b7daadc2..9ea553256 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.17) unstable; urgency=low - 'Vcs-Bzr' field is official, used it. - Lowercased short package descriptions. - Bumped 'Standards-Version' to 3.8.0, no changes needed. + * cmdline/apt-cache.cc: + - Advanced built-in help. (Closes: #286061) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 -- cgit v1.2.3-70-g09d2 From 2f493cc60cd7b495c0c6739b2c1a04f2e4fb389f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 12:56:50 +0200 Subject: Substituted 'apt-archive' with 'apt-ftparchive'. --- debian/changelog | 7 ++++++- doc/apt-secure.8.xml | 2 +- doc/apt.ent | 12 +++++++++--- doc/fr/apt-secure.fr.8.xml | 2 +- doc/fr/apt.ent.fr | 4 ++-- doc/ja/apt-secure.ja.8.xml | 2 +- doc/ja/apt.ent.ja | 4 ++-- 7 files changed, 22 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9ea553256..ceb5efbdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,7 +35,12 @@ apt (0.7.17) unstable; urgency=low - Lowercased short package descriptions. - Bumped 'Standards-Version' to 3.8.0, no changes needed. * cmdline/apt-cache.cc: - - Advanced built-in help. (Closes: #286061) + - Advanced built-in help. Patch by + Andre Felipe Machado . (Closes: #286061) + * doc/: + - Substituded 'apt-archive' with 'apt-ftparchive' in docs. + Patch based on work of + Andre Felipe Machado . (Closes: #350865) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 01b157789..9696e018d 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -179,7 +179,7 @@ See Also -&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;, +&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, &debsign; &debsig-verify;, &gpg; diff --git a/doc/apt.ent b/doc/apt.ent index b7d03b585..d0bfaba56 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -57,8 +57,8 @@ " > - - apt-archive + + apt-ftparchive 1 " > @@ -148,7 +148,7 @@
apt@packages.debian.org
Jason Gunthorpe 1998-2001 Jason Gunthorpe - 14 December 2003 + 28 October 2008 Linux @@ -207,6 +207,12 @@ Linux "> + + QA Page + +"> + Bugs diff --git a/doc/fr/apt-secure.fr.8.xml b/doc/fr/apt-secure.fr.8.xml index 5cec9a49d..25b5ffd09 100644 --- a/doc/fr/apt-secure.fr.8.xml +++ b/doc/fr/apt-secure.fr.8.xml @@ -188,7 +188,7 @@ les deux premi Voir aussi -&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-archive;, &debsign;, +&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-ftparchive;, &debsign;, &debsig-verify;, &gpg; diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr index d705b9e3e..651100497 100644 --- a/doc/fr/apt.ent.fr +++ b/doc/fr/apt.ent.fr @@ -56,8 +56,8 @@ " > - - apt-archive + + apt-ftparchive 1 " > diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml index e20b86561..20c57fb16 100644 --- a/doc/ja/apt-secure.ja.8.xml +++ b/doc/ja/apt-secure.ja.8.xml @@ -325,7 +325,7 @@ --> 関連項目 -&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;, +&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, &debsign; &debsig-verify;, &gpg; diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja index d63342461..1d1c36b1e 100644 --- a/doc/ja/apt.ent.ja +++ b/doc/ja/apt.ent.ja @@ -56,8 +56,8 @@ " > - - apt-archive + + apt-ftparchive 1 " > -- cgit v1.2.3-70-g09d2 From 77c9def7e8caf13bb1630bc4e3bdc4f2c1853dd4 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 13:19:15 +0200 Subject: Clearly documented '/' and '=' in apt-get.8. --- debian/changelog | 9 +++++---- doc/apt-get.8.xml | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ceb5efbdc..da540872e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,12 +35,13 @@ apt (0.7.17) unstable; urgency=low - Lowercased short package descriptions. - Bumped 'Standards-Version' to 3.8.0, no changes needed. * cmdline/apt-cache.cc: - - Advanced built-in help. Patch by - Andre Felipe Machado . (Closes: #286061) + - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) * doc/: - Substituded 'apt-archive' with 'apt-ftparchive' in docs. - Patch based on work of - Andre Felipe Machado . (Closes: #350865) + Patch based on work of Andre Felipe Machado. (Closes: #350865) + - Mentioned '/' and '=' for 'apt-get install' and + '=' for 'apt-get source'. Patch based on work of Andre Felipe + Machado. (Closes: #399673) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 2ea6ea1d4..7dc2fedb9 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 29 February 2004 + 28 October 2008 @@ -40,10 +40,30 @@ update upgrade dselect-upgrade - install pkg + install + pkg + + + =pkg_version_number + + + /target_release_name + + + + remove pkg purge pkg - source pkg + + source + pkg + + + =pkg_version_number + + + + build-dep pkg check clean @@ -495,7 +515,14 @@ Diagnostics apt-get returns zero on normal operation, decimal 100 on error. - + + ORIGINAL AUTHORS + &apt-author.jgunthorpe; + + + CURRENT AUTHORS + &apt-author.team; + &apt-qapage; + &manbugs; - -- cgit v1.2.3-70-g09d2 From 7e4c7441e83fc2cf37436d0d22b9004392759ec0 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 13:42:09 +0200 Subject: Mentioned more short options in the apt-get's manpage. Documented 'xvcg' in the apt-get manpage. --- debian/changelog | 3 +++ doc/apt-cache.8.xml | 6 ++++++ doc/apt-get.8.xml | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 41 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index da540872e..69f1500fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,9 @@ apt (0.7.17) unstable; urgency=low - Mentioned '/' and '=' for 'apt-get install' and '=' for 'apt-get source'. Patch based on work of Andre Felipe Machado. (Closes: #399673) + - Mentioned more short options in the apt-get manpage. Documented 'xvcg' + option in the apt-cache manpage. The part of patch by Andre Felipe + Machado. (Closes: #176106) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 6416f4edf..520c3cdca 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -51,6 +51,7 @@ rdepends pkg pkgnames prefix dotty pkg + xvcg pkg policy pkgs madison pkgs @@ -241,6 +242,11 @@ Reverse Provides: To limit the output to only the packages listed on the command line, set the APT::Cache::GivenOnly option. + xvcg pkg(s) + The same as dotty, only for xvcg from the + VCG tool. + + The resulting nodes will have several shapes; normal packages are boxes, pure provides are triangles, mixed provides are diamonds, missing packages are hexagons. Orange boxes mean recursion was stopped diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 7dc2fedb9..f0c740cd2 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 28 October 2008 + 30 October 2008 @@ -33,9 +33,37 @@ apt-get - - - + + + + + + + + + + + update upgrade -- cgit v1.2.3-70-g09d2 From 2b0de496a89d9ba180853484fe55b0e437ab7059 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 13:53:30 +0200 Subject: Advanced documentation for 'apt-get install' command, mentioned upgrading possibility. --- debian/changelog | 3 +++ doc/apt-get.8.xml | 41 ++++++++++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 69f1500fc..271f8a6f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,9 @@ apt (0.7.17) unstable; urgency=low - Mentioned more short options in the apt-get manpage. Documented 'xvcg' option in the apt-cache manpage. The part of patch by Andre Felipe Machado. (Closes: #176106) + - Documented that 'apt-get install' command should be used for upgrading + some of installed packages. Based on patch by Nori Heikkinen and + Andre Felipe Machado. (Closes: #267087) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index f0c740cd2..fdf3e00ed 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -159,17 +159,25 @@ install - install is followed by one or more packages desired for - installation. Each package is a package name, not a fully qualified - filename (for instance, in a Debian GNU/Linux system, libc6 would be the - argument provided, not libc6_1.9.6-2.deb) All packages required - by the package(s) specified for installation will also be retrieved and - installed. The /etc/apt/sources.list file is used to locate - the desired packages. If a hyphen is appended to the package name (with - no intervening space), the identified package will be removed if it is - installed. Similarly a plus sign can be used to designate a package to - install. These latter features may be used to override decisions made by - apt-get's conflict resolution system. + + + install is followed by one or more + packages desired for installation or upgrading. + Each package is a package name, not a fully qualified + filename (for instance, in a Debian GNU/Linux system, + libc6 would be the argument provided, not + libc6_1.9.6-2.deb). All packages required + by the package(s) specified for installation will also + be retrieved and installed. + The /etc/apt/sources.list file is + used to locate the desired packages. If a hyphen is + appended to the package name (with no intervening space), + the identified package will be removed if it is installed. + Similarly a plus sign can be used to designate a + package to install. These latter features may be used + to override decisions made by apt-get's conflict + resolution system. + A specific version of a package can be selected for installation by following the package name with an equals and the version of the package @@ -181,6 +189,17 @@ Both of the version selection mechanisms can downgrade packages and must be used with care. + This is also the target to use if you want to upgrade one or + more already-installed packages without upgrading every package + you have on your system. Unlike the "upgrade" target, which + installs the newest version of all currently installed packages, + "install" will install the newest version of only the package(s) + specified. Simply provide the name of the package(s) you wish + to upgrade, and if a newer version is available, it (and its + dependencies, as described above) will be downloaded and + installed. + + Finally, the &apt-preferences; mechanism allows you to create an alternative installation policy for individual packages. -- cgit v1.2.3-70-g09d2 From 972ea2a113abdd6f7cde4ad1dcbda16361343418 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 14:01:24 +0200 Subject: Mentioned 'apt_preferences(5)' in apt manpage. --- debian/changelog | 1 + doc/apt.8 | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 271f8a6f3..ee881a832 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,7 @@ apt (0.7.17) unstable; urgency=low - Documented that 'apt-get install' command should be used for upgrading some of installed packages. Based on patch by Nori Heikkinen and Andre Felipe Machado. (Closes: #267087) + - Mentioned 'apt_preferences(5)' in apt manpage. (Closes: #274295) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt.8 b/doc/apt.8 index 6c14559e3..78e4f0a70 100644 --- a/doc/apt.8 +++ b/doc/apt.8 @@ -37,6 +37,7 @@ None. .BR apt-get (8), .BR apt.conf (5), .BR sources.list (5), +.BR apt_preferences (5), .BR apt-secure (8) .SH DIAGNOSTICS apt returns zero on normal operation, decimal 100 on error. -- cgit v1.2.3-70-g09d2 From 47c2220b79f85bf8b88a42091fd89c97ec7a3599 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 14:17:05 +0200 Subject: Actualized 'Uploaders' field in debian/control. --- debian/changelog | 1 + debian/control | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ee881a832..5dd31b264 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ apt (0.7.17) unstable; urgency=low - 'Vcs-Bzr' field is official, used it. - Lowercased short package descriptions. - Bumped 'Standards-Version' to 3.8.0, no changes needed. + - Actualized 'Uploaders' field. * cmdline/apt-cache.cc: - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) * doc/: diff --git a/debian/control b/debian/control index 99666c6cb..136766ba4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,9 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team -Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador +Uploaders: Michael Vogt , Otavio Salvador , + Christian Perrier , Luca Bruno , + Eugene V. Lyubimkin Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3-70-g09d2 From c257e6f8d7756e292fabf2e82aeefdb4e1093d59 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 16:35:51 +0200 Subject: Re-added path for lintian ovirride. Michael, forgot to merge this before?.. --- debian/apt.dirs | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/apt.dirs b/debian/apt.dirs index 8ce9b175a..47f60e7e3 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -10,3 +10,4 @@ var/lib/apt/lists/partial var/lib/apt/periodic var/log/apt usr/share/bug/apt +usr/share/lintian/overrides -- cgit v1.2.3-70-g09d2 From 5844279e5b7689aacd955043367eebdfa3ec6b46 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 1 Nov 2008 17:27:02 +0200 Subject: Added Daniel Burrows to 'Uploaders'. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 136766ba4..f747210d1 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: admin Priority: important Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , - Christian Perrier , Luca Bruno , - Eugene V. Lyubimkin + Christian Perrier , Daniel Burrows , + Luca Bruno , Eugene V. Lyubimkin Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3-70-g09d2 From 6013c6f4f09c1aedf373654dfadac398f0e0a91d Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 11:23:24 +0200 Subject: Fixed typo. --- cmdline/apt-cache.cc | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index e0043b0c8..420630694 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1740,7 +1740,7 @@ bool ShowHelp(CommandLine &Cmd) " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" " pkgnames - List the names of all packages in the system\n" - " dotty - Generate package graphs for GraphVis\n" + " dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" diff --git a/debian/changelog b/debian/changelog index 5dd31b264..514546ff9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ apt (0.7.17) unstable; urgency=low - Actualized 'Uploaders' field. * cmdline/apt-cache.cc: - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) + - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038) * doc/: - Substituded 'apt-archive' with 'apt-ftparchive' in docs. Patch based on work of Andre Felipe Machado. (Closes: #350865) -- cgit v1.2.3-70-g09d2 From 0dbed486e25d158a903cf0a45ae0b86276500113 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 11:25:09 +0200 Subject: One more bug closed by documenting 'xvcg' in apt-cache.8. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 514546ff9..7c92bee6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,7 +46,7 @@ apt (0.7.17) unstable; urgency=low Machado. (Closes: #399673) - Mentioned more short options in the apt-get manpage. Documented 'xvcg' option in the apt-cache manpage. The part of patch by Andre Felipe - Machado. (Closes: #176106) + Machado. (Closes: #176106, #355945) - Documented that 'apt-get install' command should be used for upgrading some of installed packages. Based on patch by Nori Heikkinen and Andre Felipe Machado. (Closes: #267087) -- cgit v1.2.3-70-g09d2 From 60a8f9c0fea353a5dc3f79e634214d7be3d1122b Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 11:50:48 +0200 Subject: Documented 'APT::Default-Release' in apt.conf. --- debian/changelog | 1 + doc/apt.conf.5.xml | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7c92bee6d..643ea2a02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,7 @@ apt (0.7.17) unstable; urgency=low some of installed packages. Based on patch by Nori Heikkinen and Andre Felipe Machado. (Closes: #267087) - Mentioned 'apt_preferences(5)' in apt manpage. (Closes: #274295) + - Documented 'APT::Default-Release' in apt.conf. (Closes: #430399) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 64724f211..3a2ad70df 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -98,6 +98,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; compiled for. + Default-Release + Default release to install packages from if more than one + version available. Contains release name or release version. Examples: 'stable', 'testing', 'unstable', '4.0', '5.0*'. Release codenames ('etch', 'lenny' etc.) are not allowed now. See also &apt-preferences;. + + Ignore-Hold Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making. -- cgit v1.2.3-70-g09d2 From 50c2691814f0a522a2f78c499d20decd4dc8be3a Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 12:16:25 +0200 Subject: Changed 'Install-Recommends' to 'true' in configure-index. --- debian/changelog | 2 ++ doc/examples/configure-index | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 643ea2a02..d21e4f488 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,8 @@ apt (0.7.17) unstable; urgency=low Andre Felipe Machado. (Closes: #267087) - Mentioned 'apt_preferences(5)' in apt manpage. (Closes: #274295) - Documented 'APT::Default-Release' in apt.conf. (Closes: #430399) + - APT::Install-Recommends is now true by default, mentioned this in + configure-index example. (Closes: #463268) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index c20011c9c..6af2c01ba 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -103,7 +103,7 @@ APT // consider Recommends, Suggests as important dependencies that should // be installed by default - Install-Recommends "false"; + Install-Recommends "true"; Install-Suggests "false"; // consider dependencies of packages in this section manual -- cgit v1.2.3-70-g09d2 From 8070717c2cf131cf0726366c9d6cf4c03fa0354f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 12:23:18 +0200 Subject: Added APT::Get::AllowUnauthenticated to configure-index. --- debian/changelog | 2 ++ doc/examples/configure-index | 1 + 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d21e4f488..529e0a337 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,8 @@ apt (0.7.17) unstable; urgency=low - Documented 'APT::Default-Release' in apt.conf. (Closes: #430399) - APT::Install-Recommends is now true by default, mentioned this in configure-index example. (Closes: #463268) + - Added 'APT::Get::AllowUnauthenticated' to configure-index. + (Closes: #320225) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 6af2c01ba..d0c453a1c 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -32,6 +32,7 @@ APT Get { Arch-Only "false"; + AllowUnauthenticated "false"; AutomaticRemove "false"; HideAutoRemove "false"; Download-Only "false"; -- cgit v1.2.3-70-g09d2 From d914c3b7f836ec6dc2e74e98720c4a16e6ea258e Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 12:49:16 +0200 Subject: Documented '--no-install-recommends' in apt-get manpage. --- debian/changelog | 2 ++ doc/apt-get.8.xml | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 529e0a337..007239c6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,8 @@ apt (0.7.17) unstable; urgency=low configure-index example. (Closes: #463268) - Added 'APT::Get::AllowUnauthenticated' to configure-index. (Closes: #320225) + - Documented '--no-install-recommends' option in apt-get manpage. + (Closes: #462962) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 73ad09c62..75fda1320 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -278,6 +278,11 @@ &apt-cmdblurb; + + Do not consider recommended packages as a dependency for installing. + Configuration Item: APT::Install-Recommends. + + Download only; package files are only retrieved, not unpacked or installed. Configuration Item: APT::Get::Download-Only. -- cgit v1.2.3-70-g09d2 From 0d70b0559c22c006076acbe0d3238f41ddd04072 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 13:15:42 +0200 Subject: Documented 'Acquire::PDiffs' in apt.conf manpage. --- debian/changelog | 1 + doc/apt.conf.5.xml | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 007239c6d..263ca3cae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,7 @@ apt (0.7.17) unstable; urgency=low (Closes: #320225) - Documented '--no-install-recommends' option in apt-get manpage. (Closes: #462962) + - Documented 'Acquire::PDiffs' in apt.conf manpage. (Closes: #376029) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 3a2ad70df..5b71384a7 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -163,6 +163,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; and the URI handlers. + PDiffs + Try do download deltas called PDiffs for + Packages or Sources files instead of downloading whole ones. True + by default. + + Queue-Mode Queuing mode; Queue-Mode can be one of host or access which determines how APT parallelizes outgoing -- cgit v1.2.3-70-g09d2 From 2dfa29500a30539cd0f2b3932f8a4221290968ea Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 13:17:31 +0200 Subject: Minor adjustements to debian/changelog. --- debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 263ca3cae..e622501ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,8 +42,8 @@ apt (0.7.17) unstable; urgency=low - Substituded 'apt-archive' with 'apt-ftparchive' in docs. Patch based on work of Andre Felipe Machado. (Closes: #350865) - Mentioned '/' and '=' for 'apt-get install' and - '=' for 'apt-get source'. Patch based on work of Andre Felipe - Machado. (Closes: #399673) + '=' for 'apt-get source' in apt-get manpage. Patch based on + work of Andre Felipe Machado. (Closes: #399673) - Mentioned more short options in the apt-get manpage. Documented 'xvcg' option in the apt-cache manpage. The part of patch by Andre Felipe Machado. (Closes: #176106, #355945) @@ -51,10 +51,10 @@ apt (0.7.17) unstable; urgency=low some of installed packages. Based on patch by Nori Heikkinen and Andre Felipe Machado. (Closes: #267087) - Mentioned 'apt_preferences(5)' in apt manpage. (Closes: #274295) - - Documented 'APT::Default-Release' in apt.conf. (Closes: #430399) + - Documented 'APT::Default-Release' in apt.conf manpage. (Closes: #430399) - APT::Install-Recommends is now true by default, mentioned this in configure-index example. (Closes: #463268) - - Added 'APT::Get::AllowUnauthenticated' to configure-index. + - Added 'APT::Get::AllowUnauthenticated' to configure-index example. (Closes: #320225) - Documented '--no-install-recommends' option in apt-get manpage. (Closes: #462962) -- cgit v1.2.3-70-g09d2 From c06b16a905570845c372f10bb0b310bd7a667945 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 13:25:19 +0200 Subject: Added 'rsh', 'ssh' and 'copy' to the list of URI schemes in sources.list manpage. --- debian/changelog | 2 ++ doc/sources.list.5.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e622501ac..9d50b380e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ apt (0.7.17) unstable; urgency=low - Documented '--no-install-recommends' option in apt-get manpage. (Closes: #462962) - Documented 'Acquire::PDiffs' in apt.conf manpage. (Closes: #376029) + - Added 'copy', 'rsh', 'ssh' to the list of recognized URI schemes in + sources.list manpage, as they are already described under in the manpage. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e47418b27..bb154b3b0 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -115,7 +115,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/ URI specification - The currently recognized URI types are cdrom, file, http, and ftp. + The currently recognized URI types are cdrom, file, http, ftp, copy, + ssh, rsh. file -- cgit v1.2.3-70-g09d2 From b2d941c5f99ac1cf396bb7b7959cd0683051ef28 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 2 Nov 2008 14:10:17 +0200 Subject: Removed notice that ssh/rsh access cannot use password authentication from sources.list manpage. --- debian/changelog | 2 ++ doc/sources.list.5.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9d50b380e..8c1ce3bd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,8 @@ apt (0.7.17) unstable; urgency=low - Documented 'Acquire::PDiffs' in apt.conf manpage. (Closes: #376029) - Added 'copy', 'rsh', 'ssh' to the list of recognized URI schemes in sources.list manpage, as they are already described under in the manpage. + - Removed notice that ssh/rsh access cannot use password authentication + from sources.list manpage. Thanks to Steffen Joeris. (Closes: #434894) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index bb154b3b0..8b041391a 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -164,8 +164,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/ rshssh The rsh/ssh method invokes rsh/ssh to connect to a remote host - as a given user and access the files. No password authentication is - possible, prior arrangements with RSA keys or rhosts must have been made. + as a given user and access the files. It is a good idea to do prior + arrangements with RSA keys or rhosts. Access to files on the remote uses standard find and dd commands to perform the file transfers from the remote. -- cgit v1.2.3-70-g09d2 From c8921a97bf23f916eea9d77c4d2dbb94172e0983 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Tue, 4 Nov 2008 22:55:15 +0200 Subject: Uncommitted built-in help for apt-cache for Lenny. --- cmdline/apt-cache.cc | 4 ++-- debian/changelog | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 420630694..f10ea48be 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1739,8 +1739,8 @@ bool ShowHelp(CommandLine &Cmd) " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" - " pkgnames - List the names of all packages in the system\n" - " dotty - Generate package graphs for GraphViz\n" + " pkgnames - List the names of all packages\n" + " dotty - Generate package graphs for GraphVis\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" diff --git a/debian/changelog b/debian/changelog index 8c1ce3bd7..c9853169a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,9 +35,6 @@ apt (0.7.17) unstable; urgency=low - Lowercased short package descriptions. - Bumped 'Standards-Version' to 3.8.0, no changes needed. - Actualized 'Uploaders' field. - * cmdline/apt-cache.cc: - - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) - - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038) * doc/: - Substituded 'apt-archive' with 'apt-ftparchive' in docs. Patch based on work of Andre Felipe Machado. (Closes: #350865) -- cgit v1.2.3-70-g09d2 From 40a6cfced93c564bedea27554427c91fa6eff08c Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Tue, 4 Nov 2008 23:03:07 +0200 Subject: Uncommitted lowercasing of short descriptions for Lenny. --- debian/changelog | 1 - debian/control | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c9853169a..f9aed94b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,6 @@ apt (0.7.17) unstable; urgency=low (Closes: #428752) * debian/control: - 'Vcs-Bzr' field is official, used it. - - Lowercased short package descriptions. - Bumped 'Standards-Version' to 3.8.0, no changes needed. - Actualized 'Uploaders' field. * doc/: diff --git a/debian/control b/debian/control index f747210d1..24b0a1fc0 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Section: admin -Description: advanced front-end for dpkg +Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. It provides the apt-get utility and APT dselect method that provides a simpler, safer way to install and upgrade packages. @@ -30,7 +30,7 @@ Architecture: all Priority: optional Replaces: apt (<< 0.5.4.9) Section: doc -Description: documentation for APT +Description: Documentation for APT This package contains the user guide and offline guide, for APT, an Advanced Package Tool. @@ -48,7 +48,7 @@ Package: libapt-pkg-doc Architecture: all Priority: optional Section: doc -Description: documentation for APT development +Description: Documentation for APT development This package contains documentation for development of the APT Debian package manipulation program and its libraries. -- cgit v1.2.3-70-g09d2 From 007aba926a1f2fd17952ba9052fbb739f7a0077c Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 5 Nov 2008 23:19:28 +0200 Subject: Added (x) to some manpage referrings in apt-get manpage. --- debian/changelog | 7 ++++++- doc/apt-get.8.xml | 6 +++--- doc/apt.ent | 14 +++++++++++++- 3 files changed, 22 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5775003d3..4648efe55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -79,7 +79,12 @@ apt (0.7.17) unstable; urgency=low - clarify whether configuration items of apt.conf are case-sensitive (thanks to Vincent McIntyre, closes: #345901) - -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 + [ Eugene V. Lyubimkin ] + * doc/: + - Added '(x)' to some referrings to manpages in apt-get manpage. Patch by + Andre Felipe Machado. (Closes: #309893) + + -- Eugene V. Lyubimkin Wed, 05 Nov 2008 23:16:33 +0200 apt (0.7.16) unstable; urgency=low diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index c63011b2a..f64468052 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 30 October 2008 + 05 November 2008 @@ -101,8 +101,8 @@ Description apt-get is the command-line tool for handling packages, and may be considered the user's "back-end" to other tools using the APT - library. Several "front-end" interfaces exist, such as dselect(8), - aptitude, synaptic, gnome-apt and wajig. + library. Several "front-end" interfaces exist, such as &dselect;, + &aptitude;, &synaptic;, &gnome-apt; and &wajig;. Unless the , or option is given, one of the commands below must be present. diff --git a/doc/apt.ent b/doc/apt.ent index d0bfaba56..6594ba1b3 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -141,7 +141,19 @@ 1 " > - + + + gnome-apt + 1 + " +> + + + wajig + 1 + " +> + -- cgit v1.2.3-70-g09d2 From 2a7f6e97f6a04281dbf6c43ced0cccee3fa2fcfe Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 5 Nov 2008 23:26:04 +0200 Subject: Added 'dist-upgrade' to apt-get synopsis in apt-get manpage. --- debian/changelog | 2 ++ doc/apt-get.8.xml | 1 + 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4648efe55..14af5f036 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,8 @@ apt (0.7.17) unstable; urgency=low * doc/: - Added '(x)' to some referrings to manpages in apt-get manpage. Patch by Andre Felipe Machado. (Closes: #309893) + - Added 'dist-upgrade' apt-get synopsis in apt-get manpage. + (Closes: #323866) -- Eugene V. Lyubimkin Wed, 05 Nov 2008 23:16:33 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index f64468052..73bacf09b 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -60,6 +60,7 @@ update upgrade dselect-upgrade + dist-upgrade install pkg -- cgit v1.2.3-70-g09d2 From e6d9c2b40e935d4a2690173f324705fbd56baf5a Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Thu, 6 Nov 2008 19:42:22 +0100 Subject: French translation update --- debian/changelog | 7 +++++++ po/fr.po | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7d5a0efea..35d6649ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.18) UNRELEASED; urgency=low + + * Translations: + - French updated + + -- Christian Perrier Thu, 06 Nov 2008 19:41:51 +0100 + apt (0.7.17) unstable; urgency=low [ Eugene V. Lyubimkin ] diff --git a/po/fr.po b/po/fr.po index 1aab1e0d9..9bc0aced5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,3 +1,4 @@ +# translation of apt to French # Advanced Package Transfer - APT message translation catalog # French messages # @@ -5,10 +6,10 @@ # Christian Perrier , 2004-2005, 2006, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-28 18:12+0100\n" -"PO-Revision-Date: 2008-07-26 07:36+0200\n" +"PO-Revision-Date: 2008-11-06 19:36+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -2100,9 +2101,8 @@ msgid "Error reading from server" msgstr "Erreur de lecture du serveur" #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 -#, fuzzy msgid "Failed to truncate file" -msgstr "Erreur d'écriture du fichier %s" +msgstr "Echec de la troncature du fichier" #: methods/http.cc:1105 msgid "Bad header data" @@ -2127,7 +2127,7 @@ msgstr "Impossible de réaliser un mapping de %lu octets en mémoire" #: apt-pkg/contrib/mmap.cc:213 msgid "Dynamic MMap ran out of room" -msgstr "" +msgstr "La zone dynamique d'allocation mémoire n'a plus de place" #: apt-pkg/contrib/strutl.cc:1014 #, c-format -- cgit v1.2.3-70-g09d2 From 6ae0cde915102bb4b0d272de4342ff6f62840d63 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 22:19:41 +0200 Subject: Removed obsolete header line from configure-index. --- debian/changelog | 7 +++++++ doc/examples/configure-index | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 14af5f036..225687d9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.18) unstable; urgency=low + + * doc/examples/configure-index: + - Removed obsoleted header line. (Closes: #417638) + + -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 + apt (0.7.17) unstable; urgency=low [ Eugene V. Lyubimkin ] diff --git a/doc/examples/configure-index b/doc/examples/configure-index index d0c453a1c..a55dd27d6 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -1,4 +1,3 @@ -// $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz Exp $ /* This file is an index of all APT configuration directives. It should NOT actually be used as a real config file, though it is (except for the last line) a completely valid file. Most of the options have sane default -- cgit v1.2.3-70-g09d2 From 63b0c1775520329d3daaa9f78a7c0ac9362ef38d Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 22:21:31 +0200 Subject: doc/examples/configure-index: 'linux-kernel' -> 'linux-image'. --- debian/changelog | 1 + doc/examples/configure-index | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 225687d9e..8c6543a0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.7.18) unstable; urgency=low * doc/examples/configure-index: - Removed obsoleted header line. (Closes: #417638) + - Changed 'linux-kernel' to 'linux-image'. -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index a55dd27d6..07803b2cb 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -24,7 +24,7 @@ APT Architecture "i386"; Build-Essential "build-essential"; - NeverAutoRemove { "linux-kernel.*"; }; // packages that should never + NeverAutoRemove { "linux-image.*"; }; // packages that should never // considered for autoRemove // Options for apt-get -- cgit v1.2.3-70-g09d2 From 5af4276c8e64d28f4d43e2ebb5938e9ba2c93cfa Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 22:34:16 +0200 Subject: doc/sources.list.5.xml: fixed grammar and typo. --- debian/changelog | 3 +++ doc/sources.list.5.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8c6543a0f..9dd22caf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.7.18) unstable; urgency=low * doc/examples/configure-index: - Removed obsoleted header line. (Closes: #417638) - Changed 'linux-kernel' to 'linux-image'. + * doc/sources.list.5.xml: + - Fixed typo and grammar in 'sources.list.d' section. Thanks to + Timothy G Abbott . (Closes: #478098) -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 8b041391a..9eb66d728 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -48,7 +48,7 @@ sources.list.d The /etc/apt/sources.list.d directory provides - a way to add sources.list entries in seperate files that end with + a way to add sources.list entries in separate files whose names end with .list. The format is the same as for the regular sources.list file. -- cgit v1.2.3-70-g09d2 From 861aa1bdf1a895fa8e437abfe992c5d33e5f0fcb Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 23:04:40 +0200 Subject: doc/apt-get.8.xml: advanced descriptions for 'remove' and 'purge'. --- debian/changelog | 3 +++ doc/apt-get.8.xml | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9dd22caf4..1f39db3b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ apt (0.7.18) unstable; urgency=low * doc/sources.list.5.xml: - Fixed typo and grammar in 'sources.list.d' section. Thanks to Timothy G Abbott . (Closes: #478098) + * doc/apt-get.8.xml: + - Advanced descriptions for 'remove' and 'purge' options. + (Closes: #274283) -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 73bacf09b..325f1964d 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -213,14 +213,15 @@ remove remove is identical to install except that packages are - removed instead of installed. If a plus sign is appended to the package + removed instead of installed. Note the removing a package leaves its + configuration files in system. If a plus sign is appended to the package name (with no intervening space), the identified package will be installed instead of removed. purge purge is identical to remove except that packages are - removed and purged. + removed and purged (any configuration files are deleted too). source @@ -419,7 +420,8 @@ Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are - scheduled to be purged. + scheduled to be purged. is equivalent for + command. Configuration Item: APT::Get::Purge. -- cgit v1.2.3-70-g09d2 From 425684e05521bba07b03dc2c5e647908ce757141 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 23:52:36 +0200 Subject: Fix 'dpkg-buildpackage -B' FTBFS. --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1f39db3b4..ca8c6cea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.7.18) unstable; urgency=low * doc/apt-get.8.xml: - Advanced descriptions for 'remove' and 'purge' options. (Closes: #274283) + * debian/rules: + - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green. + Fixes FTBFS. (Closes: #504181) -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/debian/rules b/debian/rules index f6ff3c47a..f587b141a 100755 --- a/debian/rules +++ b/debian/rules @@ -186,7 +186,7 @@ apt-doc: build-doc # Build architecture-dependent files here. binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https -apt: build debian/shlibs.local +apt: build build-doc debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k -- cgit v1.2.3-70-g09d2 From 380c35493d1478bc5376a93acf947e3621f51686 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 7 Nov 2008 21:55:46 +0100 Subject: fix depend on libdb4.4 (closes: #501253) --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1d4197488..6672a2089 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.7.18) unstable; urgency=low - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green. Fixes FTBFS. (Closes: #504181) + [ Michael Vogt ] + * fix depend on libdb4.4 (closes: #501253) + -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 apt (0.7.17) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From f03edb29dfcc1ece0dd4161705830274bf0f7739 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 7 Nov 2008 22:14:03 +0100 Subject: upload as 0.7.18 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6672a2089..54f3c35af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,7 @@ apt (0.7.18) unstable; urgency=low [ Michael Vogt ] * fix depend on libdb4.4 (closes: #501253) - -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 + -- Michael Vogt Fri, 07 Nov 2008 22:13:39 +0100 apt (0.7.17) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From b247203097e343779ca429ed9720168f9fc2b959 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 8 Nov 2008 00:27:41 +0200 Subject: Fixed wrong upload date for 0.7.17~exp4 upload, set approximated one. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 54f3c35af..2eddf8f6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,7 +88,7 @@ apt (0.7.17~exp4) experimental; urgency=low failure when GREP_OPTIONS contains options that modify grep output. (Closes: #428752) - -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 + -- Eugene V. Lyubimkin Fri, 31 Oct 2008 23:45:17 +0300 apt (0.7.17~exp3) experimental; urgency=low -- cgit v1.2.3-70-g09d2 From 6823d85bdb3d46f60a7357cc73e60fcf6ba88a96 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 8 Nov 2008 12:43:37 +0200 Subject: Noted allowed file name characters in /etc/apt/sources.list.d/* files. --- debian/changelog | 9 +++++++++ doc/sources.list.5.xml | 9 ++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2eddf8f6d..41093666b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.7.19) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * doc/sources.list.5.xml: + - Mentioned allowed characters in file names in /etc/apt/sources.list.d. + Thanks to Matthias Urlichs. (Closes: #426913) + + -- Eugene V. Lyubimkin Sat, 08 Nov 2008 12:40:19 +0200 + apt (0.7.18) unstable; urgency=low [ Christian Perrier ] diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 9eb66d728..b875086ef 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -48,9 +48,12 @@ sources.list.d The /etc/apt/sources.list.d directory provides - a way to add sources.list entries in separate files whose names end with - .list. The format is the same as for the regular - sources.list file. + a way to add sources.list entries in separate files. + The format is the same as for the regular sources.list file. + File names need to end with + .list and may only contain letters (a-z and A-Z), + digits (0-9), underscore (_), hyphen (-) and period (.) characters. + Otherwise they will be silently ignored. The deb and deb-src types -- cgit v1.2.3-70-g09d2 From 2f0b4b144b0b7d81fe324091c2902592bbbac005 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 8 Nov 2008 13:02:07 +0200 Subject: Update synopsis in apt-get manpage for '-v'/'--version'. --- debian/changelog | 2 ++ doc/apt-get.8.xml | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 41093666b..5ff981df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.19) unstable; urgency=low * doc/sources.list.5.xml: - Mentioned allowed characters in file names in /etc/apt/sources.list.d. Thanks to Matthias Urlichs. (Closes: #426913) + * doc/apt-get.8.xml: + - Included '-v'/'--version' as a command to synopsis. -- Eugene V. Lyubimkin Sat, 08 Nov 2008 12:40:19 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 325f1964d..416fd0384 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 05 November 2008 + 08 November 2008 @@ -33,7 +33,7 @@ apt-get - + + https + HTTPS URIs. Cache-control and proxy options are the same as for + http method. + Pipeline-Depth option is not supported yet. + + CaInfo suboption specifies place of file that + holds info about trusted certificates. + <host>::CaInfo is corresponding per-host option. + Verify-Peer boolean suboption determines whether verify + server's host certificate against trusted certificates or not. + <host>::Verify-Peer is corresponding per-host option. + Verify-Host boolean suboption determines whether verify + server's hostname or not. + <host>::Verify-Host is corresponding per-host option. + SslCert determines what certificate to use for client + authentication. <host>::SslCert is corresponding per-host option. + SslKey determines what private key to use for client + authentication. <host>::SslKey is corresponding per-host option. + SslForceVersion overrides default SSL version to use. + Can contain 'TLSv1' or 'SSLv3' string. + <host>::SslForceVersion is corresponding per-host option. + + ftp FTP URIs; ftp::Proxy is the default proxy server to use. It is in the standard form of ftp://[[user][:pass]@]host[:port]/ and is -- cgit v1.2.3-70-g09d2 From be1b85688d6362b3eb980e8b0b05bf8c13e1099a Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 6 Dec 2008 22:41:43 +0200 Subject: Applied patch from Daniel Burrows to document 'Debug' group of options. --- debian/changelog | 2 + doc/apt.conf.5.xml | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 346 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3535ca5f1..ef383d236 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.20) unstable; urgency=low - Renewed. This fixes lintian errors. * doc/apt.conf.5.xml, debian/apt-transport-https: - Documented briefly 'APT::https' group of options. (Closes: #507398) + - Applied patch from Daniel Burrows to document 'Debug' group of options. + (Closes: #457265) -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 35987f8d8..beae7cc10 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -12,10 +12,16 @@ &apt-author.jgunthorpe; &apt-author.team; + + Daniel + Burrows + Initial documentation of Debug::*. + dburrows@debian.org + &apt-email; &apt-product; - 29 February 2004 + 06 December 2008 @@ -423,16 +429,344 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Debug options - Most of the options in the debug section are not interesting to - the normal user, however Debug::pkgProblemResolver shows - interesting output about the decisions dist-upgrade makes. - Debug::NoLocking disables file locking so APT can do some - operations as non-root and Debug::pkgDPkgPM will print out the - command line for each dpkg invokation. Debug::IdentCdrom will - disable the inclusion of statfs data in CDROM IDs. - Debug::Acquire::gpgv Debugging of the gpgv method. + + Debug options + + Enabling options in the Debug:: section will + cause debugging information to be sent to the standard error + stream of the program utilizing the apt + libraries, or enable special program modes that are primarily + useful for debugging the behavior of apt. + Most of these options are not interesting to a normal user, but a + few may be: + + + + + Debug::pkgProblemResolver enables output + about the decisions made by + dist-upgrade, upgrade, install, remove, purge. + + + + + + Debug::NoLocking disables all file + locking. This can be used to run some operations (for + instance, apt-get -s install) as a + non-root user. + + + + + + Debug::pkgDPkgPM prints out the actual + command line each time that apt invokes + &dpkg;. + + + + + + Debug::IdentCdrom disables the inclusion + of statfs data in CDROM IDs. + + + + + + A full list of debugging options to apt follows. + + + + + Debug::Acquire::cdrom + + + + Print information related to accessing + cdrom:// sources. + + + + + + Debug::Acquire::ftp + + + + Print information related to downloading packages using + FTP. + + + + + + Debug::Acquire::http + + + + Print information related to downloading packages using + HTTP. + + + + + + Debug::Acquire::https + + + + Print information related to downloading packages using + HTTPS. + + + + + + Debug::Acquire::gpgv + + + + Print information related to verifying cryptographic + signatures using gpg. + + + + + + Debug::aptcdrom + + + + Output information about the process of accessing + collections of packages stored on CD-ROMs. + + + + + + Debug::BuildDeps + + + Describes the process of resolving build-dependencies in + &apt-get;. + + + + + + Debug::Hashes + + + Output each cryptographic hash that is generated by the + apt libraries. + + + + + + Debug::IdentCDROM + + + Do not include information from statfs, + namely the number of used and free blocks on the CD-ROM + filesystem, when generating an ID for a CD-ROM. + + + + + + Debug::NoLocking + + + Disable all file locking. For instance, this will allow + two instances of apt-get + update to run at the same time. + + + + + + Debug::pkgAcquire + + + + Log when items are added to or removed from the global + download queue. + + + + + + Debug::pkgAcquire::Auth + + + Output status messages and errors related to verifying + checksums and cryptographic signatures of downloaded files. + + + + + + Debug::pkgAcquire::Diffs + + + Output information about downloading and applying package + index list diffs, and errors relating to package index list + diffs. + + + + + + Debug::pkgAcquire::RRed + + + + Output information related to patching apt package lists + when downloading index diffs instead of full indices. + + + + + + Debug::pkgAcquire::Worker + + + + Log all interactions with the sub-processes that actually + perform downloads. + + + + + + Debug::pkgAutoRemove + + + + Log events related to the automatically-installed status of + packages and to the removal of unused packages. + + + + + + Debug::pkgDepCache::AutoInstall + + + Generate debug messages describing which packages are being + automatically installed to resolve dependencies. This + corresponds to the initial auto-install pass performed in, + e.g., apt-get install, and not to the + full apt dependency resolver; see + Debug::pkgProblemResolver for that. + + + + + + + Debug::pkgInitConfig + + + Dump the default configuration to standard output on + startup. + + + + + + Debug::pkgDPkgPM + + + When invoking &dpkg;, output the precise command line with + which it is being invoked, with arguments separated by a + single space character. + + + + + + Debug::pkgDPkgProgressReporting + + + Output all the data received from &dpkg; on the status file + descriptor and any errors encountered while parsing it. + + + + + + Debug::pkgOrderList + + + + Generate a trace of the algorithm that decides the order in + which apt should pass packages to + &dpkg;. + + + + + + Debug::pkgPackageManager + + + + Output status messages tracing the steps performed when + invoking &dpkg;. + + + + + + Debug::pkgPolicy + + + + Output the priority of each package list on startup. + + + + + + Debug::pkgProblemResolver + + + + Trace the execution of the dependency resolver (this + applies only to what happens when a complex dependency + problem is encountered). + + + + + + Debug::sourceList + + + + Print information about the vendors read from + /etc/apt/vendors.list. + + + + + + Debug::Vendor + + + + Print information about each vendor. + + + + Examples -- cgit v1.2.3-70-g09d2 From 0224daf23a4b89a85967aec6639b189495d1326a Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 6 Dec 2008 23:20:13 +0200 Subject: Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. --- debian/changelog | 2 ++ doc/apt.conf.5.xml | 9 +++++++++ 2 files changed, 11 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ef383d236..83aa70d4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ apt (0.7.20) unstable; urgency=low - Documented briefly 'APT::https' group of options. (Closes: #507398) - Applied patch from Daniel Burrows to document 'Debug' group of options. (Closes: #457265) + - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. + (Closes: #438559) -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index beae7cc10..1835f2282 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -429,6 +429,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; + + Periodic and Archives options + APT::Periodic and APT::Archives + groups of options configure behavior of apt periodic updates, which is + done by /etc/cron.daily/apt script. See header of + this script for the brief documentation of these options. + + + Debug options -- cgit v1.2.3-70-g09d2 From 45b5cb269dccfb8835901b54701a96237a84bf26 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 6 Dec 2008 23:34:11 +0200 Subject: Included missing file debian/apt-transport-https.README to repo. --- configure.in | 2 +- debian/apt-transport-https.README | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 debian/apt-transport-https.README (limited to 'debian') diff --git a/configure.in b/configure.in index 0ffbc67ff..04d8a4712 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.18") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt-transport-https.README b/debian/apt-transport-https.README new file mode 100644 index 000000000..0c470a1a2 --- /dev/null +++ b/debian/apt-transport-https.README @@ -0,0 +1,2 @@ +See APT::https group of options in apt.conf(5) to configure how APT will handle +https:// URIs. -- cgit v1.2.3-70-g09d2 From bbaf502024a6a715583cd500cd58cb9ea5c47941 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 7 Dec 2008 10:34:59 +0100 Subject: Drop awful use of first person in French translation. The same should happen to English messages after lenny --- debian/changelog | 4 ++++ po/ChangeLog | 4 ++++ po/fr.po | 10 +++++----- 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 325804f84..b2da4648b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ apt (0.7.20~exp3) unstable; urgency=low - Added instruction how to work around MMap error in MMap error message. (Closes: #385674, 436028) + [ Christian Perrier ] + * Translations: + - French corrected (remove awful use of first person) + -- Michael Vogt Tue, 02 Dec 2008 20:30:14 +0100 apt (0.7.19) unstable; urgency=low diff --git a/po/ChangeLog b/po/ChangeLog index f8633af22..e71fb1447 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2008-12-06 Christian Perrier + + * fr.po: dropped awful use of first person + 2008-11-23 Artem Bondarenko * uk.po: updated to 477t55f7u diff --git a/po/fr.po b/po/fr.po index ec164dc4c..91099636a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2527,7 +2527,7 @@ msgstr "Le type de fichier d'index « %s » n'est pas accepté" #, c-format msgid "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son " +"Le paquet %s doit être réinstallé, mais il est impossible de trouver son " "archive." #: apt-pkg/algorithms.cc:1107 @@ -2760,8 +2760,8 @@ msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " -"sans doute que vous devrez corriger ce paquet manuellement (absence " +"Impossible de localiser un fichier du paquet %s. Cela signifie " +"que vous devrez corriger ce paquet vous-même (absence " "d'architecture)." #: apt-pkg/acquire-item.cc:1290 @@ -2770,8 +2770,8 @@ msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " -"que vous devrez corriger manuellement ce paquet." +"Impossible de localiser un fichier du paquet %s. Cela signifie " +"que vous devrez corriger ce paquet vous-même." #: apt-pkg/acquire-item.cc:1331 #, c-format -- cgit v1.2.3-70-g09d2 From 3205e1f3b0dc9310fe767aef23824d0deb7a26bf Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Dec 2008 15:58:12 -0800 Subject: debian/changelog: fix changelog --- debian/changelog | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5d6a6d6b1..5b3c1a470 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,16 +13,14 @@ apt (0.7.20) unstable; urgency=low - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. (Closes: #438559) - -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 - -apt (0.7.20~exp3) unstable; urgency=low - [ Michael Vogt ] * make "apt-get build-dep" installed packages marked automatic by default. This can be changed by setting the value of APT::Get::Build-Dep-Automatic to false (thanks to Aaron Haviland, closes: #44874, LP: #248268) + -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 + apt (0.7.20~exp2) unstable; urgency=low [ Eugene V. Lyubimkin ] -- cgit v1.2.3-70-g09d2