From: Michael Vogt Date: Wed, 5 Nov 2008 12:20:25 +0000 (+0100) Subject: * debian/rules: X-Git-Tag: 0.7.21~69 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a530607f8ac4936402831d854f171fc8dc89ef4f?hp=1c8ab7200ec4527cd38d0b4d0ef847452f011915 * debian/rules: - 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. - 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. * 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. * 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. * 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) * apt-pkg/acquire-item.cc: - fix a merge mistake that prevents the fallback to the uncompressed 'Packages' to work correctly (closes: #409284) * apt-pkg/acquire-item.cc: - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz' available. (Closes: #409284) * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) * fix various -Wall warnings --- 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/configure.in b/configure.in index 995ca5671..bf4116e8b 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~exp3") +AC_DEFINE_UNQUOTED(VERSION,"0.7.17") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) 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 diff --git a/debian/changelog b/debian/changelog index 824b34990..a1913daee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,66 @@ +apt (0.7.17) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * debian/control: + - 'Vcs-Bzr' field is official, used it. + - Bumped 'Standards-Version' to 3.8.0, no changes needed. + - Actualized 'Uploaders' field. + * doc/: + - 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' 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) + - 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) + - 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 example. + (Closes: #320225) + - 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. + - Removed notice that ssh/rsh access cannot use password authentication + from sources.list manpage. Thanks to Steffen Joeris. (Closes: #434894) + + -- Michael Vogt Wed, 05 Nov 2008 13:14:56 +0100 + +apt (0.7.17~exp4) experimental; urgency=low + + * debian/rules: + - 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. + - 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. + * 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. + * 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. + * 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 + apt (0.7.17~exp3) experimental; urgency=low * apt-pkg/acquire-item.cc: diff --git a/debian/control b/debian/control index a3c84d72a..ba9e32e4b 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,12 @@ Source: apt 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 -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 -XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ +Uploaders: Michael Vogt , Otavio Salvador , + 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/ Package: apt Architecture: any @@ -13,7 +15,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. @@ -35,7 +37,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 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 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" ] && diff --git a/debian/rules b/debian/rules index 006d2de8a..f6ff3c47a 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 @@ -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/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 6416f4edf..21605ff0e 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 @@ -249,6 +250,11 @@ Reverse Provides: Caution, dotty cannot graph larger sets of packages. + xvcg pkg(s) + The same as dotty, only for xvcg from the + VCG tool. + + policy [ pkg(s) ] policy is meant to help debug issues relating to the preferences file. With no arguments it will print out the diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 2ea6ea1d4..c63011b2a 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 29 February 2004 + 30 October 2008 @@ -33,22 +33,67 @@ apt-get - - - + + + + + + + + + + + + target_release_name + + + target_release_number_expression + + + + - update - upgrade - dselect-upgrade - install pkg - remove pkg - purge pkg - source pkg - build-dep pkg - check - clean - autoclean - autoremove + update + upgrade + dselect-upgrade + install + pkg + + + + =pkg_version_number + + + /target_release_name + + + + + + remove pkg + purge pkg + source + pkg + + =pkg_version_number + + + + build-dep pkg + check + clean + autoclean + autoremove + + + -h + --help + + @@ -111,17 +156,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 @@ -133,6 +186,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. @@ -222,6 +286,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. @@ -450,7 +519,7 @@ /etc/apt/apt.conf.d/ - APT configuration file fragments + APT configuration file fragments. Configuration Item: Dir::Etc::Parts. @@ -495,7 +564,16 @@ 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; - 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.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. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index db8dfa7ce..ce7012460 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -101,6 +101,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. @@ -161,6 +166,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 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/examples/configure-index b/doc/examples/configure-index index c20011c9c..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"; @@ -103,7 +104,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 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 " > diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e47418b27..8b041391a 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 @@ -163,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. 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) 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