summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/acquire-item.cc32
-rw-r--r--apt-pkg/algorithms.cc6
-rwxr-xr-xcmdline/apt-key1
-rw-r--r--configure.in2
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/changelog64
-rw-r--r--debian/control14
-rw-r--r--debian/libapt-pkg-doc.doc-base.cache2
-rw-r--r--debian/libapt-pkg-doc.doc-base.dpkg-tech2
-rw-r--r--debian/libapt-pkg-doc.doc-base.files2
-rw-r--r--debian/libapt-pkg-doc.doc-base.method2
-rwxr-xr-xdebian/postrm2
-rwxr-xr-xdebian/preinst2
-rwxr-xr-xdebian/prerm2
-rwxr-xr-xdebian/rules7
-rw-r--r--doc/apt-cache.8.xml6
-rw-r--r--doc/apt-get.8.xml138
-rw-r--r--doc/apt-secure.8.xml2
-rw-r--r--doc/apt.81
-rw-r--r--doc/apt.conf.5.xml11
-rw-r--r--doc/apt.ent12
-rw-r--r--doc/examples/configure-index3
-rw-r--r--doc/fr/apt-secure.fr.8.xml2
-rw-r--r--doc/fr/apt.ent.fr4
-rw-r--r--doc/ja/apt-secure.ja.8.xml2
-rw-r--r--doc/ja/apt.ent.ja4
-rw-r--r--doc/sources.list.5.xml7
-rw-r--r--dselect/makefile2
-rw-r--r--po/apt-all.pot127
-rw-r--r--share/lintian-overrides3
30 files changed, 331 insertions, 134 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 7cae6c8b7..ae8ff2205 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -568,9 +568,9 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
else
CompressionExtension = ".gz";
} else {
- CompressionExtension = comprExt;
+ CompressionExtension = (comprExt == "plain" ? "" : comprExt);
}
- Desc.URI = URI + CompressionExtension;
+ Desc.URI = URI + CompressionExtension;
Desc.Description = URIDesc;
Desc.Owner = this;
@@ -597,19 +597,30 @@ string pkgAcqIndex::Custom600Headers()
void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
+ bool descChanged = false;
// no .bz2 found, retry with .gz
if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") {
- Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz";
+ Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz";
- // retry with a gzip one
- new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc,
+ new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc,
ExpectedHash, string(".gz"));
+ descChanged = true;
+ }
+ // no .gz found, retry with uncompressed
+ else if(Desc.URI.substr(Desc.URI.size()-2) == "gz") {
+ Desc.URI = Desc.URI.substr(0,Desc.URI.size()-2);
+
+ new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc,
+ ExpectedHash, string("plain"));
+ descChanged = true;
+ }
+ if (descChanged) {
Status = StatDone;
Complete = false;
Dequeue();
return;
- }
-
+ }
+
// on decompression failure, remove bad versions in partial/
if(Decompression && Erase) {
string s = _config->FindDir("Dir::State::lists") + "partial/";
@@ -700,12 +711,15 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
else
Local = true;
- string compExt = Desc.URI.substr(Desc.URI.size()-3);
+ string compExt = flExtension(flNotDir(URI(Desc.URI).Path));
const char *decompProg;
if(compExt == "bz2")
decompProg = "bzip2";
- else if(compExt == ".gz")
+ else if(compExt == "gz")
decompProg = "gzip";
+ // flExtensions returns the full name if no extension is found
+ else if(compExt == flNotDir(URI(Desc.URI).Path))
+ decompProg = "copy";
else {
_error->Error("Unsupported extension: %s", compExt.c_str());
return;
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2e2a976bb..bd33d5ef1 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1342,7 +1342,11 @@ bool ListUpdate(pkgAcquireStatus &Stat,
(*I)->Finished();
- _error->Warning(_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(),
+ ::URI uri((*I)->DescURI());
+ uri.User.clear();
+ uri.Password.clear();
+ string descUri = string(uri);
+ _error->Warning(_("Failed to fetch %s %s\n"), descUri.c_str(),
(*I)->ErrorText.c_str());
if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError)
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 a65c33e66..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.16")
+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 afce50000..5775003d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,64 @@
-apt (0.7.17~exp1) UNRELEASED; urgency=low
+apt (0.7.17) unstable; urgency=low
+
+ [ Eugene V. Lyubimkin ]
+ * 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)
+ * 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)
+ * 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 '/<release>' and '=<version>' for 'apt-get install' and
+ '=<version>' 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)
[ Luca Bruno ]
* Fix typos:
@@ -19,7 +79,7 @@ apt (0.7.17~exp1) UNRELEASED; urgency=low
- clarify whether configuration items of apt.conf are case-sensitive
(thanks to Vincent McIntyre, closes: #345901)
- -- Luca Bruno <lethalman88@gmail.com> Sat, 11 Oct 2008 09:17:46 +0200
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 24 Oct 2008 23:45:17 +0300
apt (0.7.16) unstable; urgency=low
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 <deity@lists.debian.org>
-Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>
-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 <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
+ Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
+ Luca Bruno <lethalman88@gmail.com>, Eugene V. Lyubimkin <jackyf.devel@gmail.com>
+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 @@
<arg>rdepends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
<arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg>
<arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>xvcg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
<arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
<arg>madison <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
</group>
@@ -249,6 +250,11 @@ Reverse Provides:
<para>Caution, dotty cannot graph larger sets of packages.</para></listitem>
</varlistentry>
+ <varlistentry><term>xvcg <replaceable>pkg(s)</replaceable></term>
+ <listitem><para>The same as <literal>dotty</literal>, only for xvcg from the
+ <ulink url="http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html">VCG tool</ulink>.
+ </para></listitem></varlistentry>
+
<varlistentry><term>policy <replaceable>[ pkg(s) ]</replaceable></term>
<listitem><para><literal>policy</literal> 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;
<!-- The last update date -->
- <date>29 February 2004</date>
+ <date>30 October 2008</date>
</refentryinfo>
<refmeta>
@@ -33,22 +33,67 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>apt-get</command>
- <arg><option>-hvs</option></arg>
- <arg><option>-o=<replaceable>config string</replaceable></option></arg>
- <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <arg><option>-vsqdyfmubV</option></arg>
+ <arg>
+ <option>-o=
+ <replaceable>config_string</replaceable>
+ </option>
+ </arg>
+ <arg>
+ <option>-c=
+ <replaceable>config_file</replaceable>
+ </option>
+ </arg>
+ <arg>
+ <option>-t=</option>
+ <group choice='req'>
+ <arg choice='plain'>
+ <replaceable>target_release_name</replaceable>
+ </arg>
+ <arg choice='plain'>
+ <replaceable>target_release_number_expression</replaceable>
+ </arg>
+ </group>
+ </arg>
+
<group choice="req">
- <arg>update</arg>
- <arg>upgrade</arg>
- <arg>dselect-upgrade</arg>
- <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>purge <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>check</arg>
- <arg>clean</arg>
- <arg>autoclean</arg>
- <arg>autoremove</arg>
+ <arg choice='plain'>update</arg>
+ <arg choice='plain'>upgrade</arg>
+ <arg choice='plain'>dselect-upgrade</arg>
+ <arg choice='plain'>install
+ <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable>
+ <arg>
+ <group choice='req'>
+ <arg choice='plain'>
+ =<replaceable>pkg_version_number</replaceable>
+ </arg>
+ <arg choice='plain'>
+ /<replaceable>target_release_name</replaceable>
+ </arg>
+ </group>
+ </arg>
+ </arg>
+ </arg>
+ <arg choice='plain'>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg choice='plain'>purge <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg choice='plain'>source
+ <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable>
+ <arg>
+ =<replaceable>pkg_version_number</replaceable>
+ </arg>
+ </arg>
+ </arg>
+ <arg choice='plain'>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg choice='plain'>check</arg>
+ <arg choice='plain'>clean</arg>
+ <arg choice='plain'>autoclean</arg>
+ <arg choice='plain'>autoremove</arg>
+ <arg choice='plain'>
+ <group choice='req'>
+ <arg choice='plain'>-h</arg>
+ <arg choice='plain'>--help</arg>
+ </group>
+ </arg>
</group>
</cmdsynopsis>
</refsynopsisdiv>
@@ -111,17 +156,25 @@
</varlistentry>
<varlistentry><term>install</term>
- <listitem><para><literal>install</literal> 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 <literal>libc6_1.9.6-2.deb</literal>) All packages required
- by the package(s) specified for installation will also be retrieved and
- installed. The <filename>/etc/apt/sources.list</filename> 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.</para>
+ <listitem>
+ <para>
+ <literal>install</literal> 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
+ <literal>libc6_1.9.6-2.deb</literal>). All packages required
+ by the package(s) specified for installation will also
+ be retrieved and installed.
+ The <filename>/etc/apt/sources.list</filename> 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.
+ </para>
<para>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 @@
<para>Both of the version selection mechanisms can downgrade packages and must
be used with care.</para>
+ <para>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.
+ </para>
+
<para>Finally, the &apt-preferences; mechanism allows you to
create an alternative installation policy for
individual packages.</para>
@@ -222,6 +286,11 @@
&apt-cmdblurb;
<variablelist>
+ <varlistentry><term><option>--no-install-recommends</option></term>
+ <listitem><para>Do not consider recommended packages as a dependency for installing.
+ Configuration Item: <literal>APT::Install-Recommends</literal>.</para></listitem>
+ </varlistentry>
+
<varlistentry><term><option>-d</option></term><term><option>--download-only</option></term>
<listitem><para>Download only; package files are only retrieved, not unpacked or installed.
Configuration Item: <literal>APT::Get::Download-Only</literal>.</para></listitem>
@@ -450,7 +519,7 @@
</varlistentry>
<varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
- <listitem><para>APT configuration file fragments
+ <listitem><para>APT configuration file fragments.
Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
</varlistentry>
@@ -495,7 +564,16 @@
<refsect1><title>Diagnostics</title>
<para><command>apt-get</command> returns zero on normal operation, decimal 100 on error.</para>
</refsect1>
-
+ <refsect1>
+ <title>ORIGINAL AUTHORS</title>
+ <para>&apt-author.jgunthorpe;</para>
+ </refsect1>
+ <refsect1>
+ <title>CURRENT AUTHORS</title>
+ <para>
+ &apt-author.team;
+ &apt-qapage;
+ </para>
+ </refsect1>
&manbugs;
-
</refentry>
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 @@
<refsect1><title>See Also</title>
<para>
-&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
&debsign; &debsig-verify;, &gpg;
</para>
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.</para></listitem>
</varlistentry>
+ <varlistentry><term>Default-Release</term>
+ <listitem><para>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;.</para></listitem>
+ </varlistentry>
+
<varlistentry><term>Ignore-Hold</term>
<listitem><para>Ignore Held packages; This global option causes the problem resolver to
ignore held packages in its decision making.</para></listitem>
@@ -161,6 +166,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
and the URI handlers.
<variablelist>
+ <varlistentry><term>PDiffs</term>
+ <listitem><para>Try do download deltas called <literal>PDiffs</literal> for
+ Packages or Sources files instead of downloading whole ones. True
+ by default.</para></listitem>
+ </varlistentry>
+
<varlistentry><term>Queue-Mode</term>
<listitem><para>Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</literal> or
<literal>access</literal> 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 @@
</citerefentry>"
>
-<!ENTITY apt-archive "<citerefentry>
- <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+ <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
@@ -148,7 +148,7 @@
<address><email>apt@packages.debian.org</email></address>
<author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
<copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
- <date>14 December 2003</date>
+ <date>28 October 2008</date>
<productname>Linux</productname>
</refentryinfo>
@@ -207,6 +207,12 @@
<productname>Linux</productname>
">
+<!ENTITY apt-qapage "
+ <para>
+ <ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink>
+ </para>
+">
+
<!-- Boiler plate Bug reporting section -->
<!ENTITY manbugs "
<refsect1><title>Bugs</title>
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ères étapes.
<refsect1><title>Voir aussi</title>
<para>
-&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;
</para>
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 @@
</citerefentry>"
>
-<!ENTITY apt-archive "<citerefentry>
- <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+ <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
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 @@
-->
<refsect1><title>関連項目</title>
<para>
-&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
&debsign; &debsig-verify;, &gpg;
</para>
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 @@
</citerefentry>"
>
-<!ENTITY apt-archive "<citerefentry>
- <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+ <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>
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/
<refsect1><title>URI specification</title>
- <para>The currently recognized URI types are cdrom, file, http, and ftp.
+ <para>The currently recognized URI types are cdrom, file, http, ftp, copy,
+ ssh, rsh.
<variablelist>
<varlistentry><term>file</term>
<listitem><para>
@@ -163,8 +164,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/
<varlistentry><term>rsh</term><term>ssh</term>
<listitem><para>
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 <command>find</command> and
<command>dd</command>
commands to perform the file transfers from the remote.</para></listitem>
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/po/apt-all.pot b/po/apt-all.pot
index 81a84a928..922b9af1e 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-28 14:25+0200\n"
+"POT-Creation-Date: 2008-10-28 16:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -251,7 +251,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -780,7 +780,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1344
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -1402,9 +1402,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
+#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
+#: apt-pkg/pkgcachegen.cc:957
msgid "Reading package lists"
msgstr ""
@@ -2240,23 +2240,23 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:248
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1106
+#: apt-pkg/algorithms.cc:1107
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1108
+#: apt-pkg/algorithms.cc:1109
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372
+#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -2352,82 +2352,82 @@ msgstr ""
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:153
+#: apt-pkg/pkgcachegen.cc:164
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:178
+#: apt-pkg/pkgcachegen.cc:189
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:182
+#: apt-pkg/pkgcachegen.cc:193
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:224
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:217
+#: apt-pkg/pkgcachegen.cc:228
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:221
+#: apt-pkg/pkgcachegen.cc:232
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:245
+#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:262
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:265
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:268
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:271
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:288
+#: apt-pkg/pkgcachegen.cc:299
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:312
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:307
+#: apt-pkg/pkgcachegen.cc:318
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:678
+#: apt-pkg/pkgcachegen.cc:690
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:775
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
msgid "IO Error saving source cache"
msgstr ""
@@ -2440,35 +2440,35 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
+#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1421
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1100
+#: apt-pkg/acquire-item.cc:1113
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1213
+#: apt-pkg/acquire-item.cc:1226
#, c-format
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 ""
-#: apt-pkg/acquire-item.cc:1272
+#: apt-pkg/acquire-item.cc:1285
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1313
+#: apt-pkg/acquire-item.cc:1326
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1400
+#: apt-pkg/acquire-item.cc:1413
msgid "Size mismatch"
msgstr ""
@@ -2574,79 +2574,78 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:486
+#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
-msgid "Directory '%s' missing"
+msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:569
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
#, c-format
-msgid "Preparing %s"
+msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:570
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
#, c-format
-msgid "Unpacking %s"
+msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:575
+#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
-msgid "Preparing to configure %s"
+msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:521
#, c-format
-msgid "Configuring %s"
+msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579
+#: apt-pkg/deb/dpkgpm.cc:605
#, c-format
-msgid "Processing triggers for %s"
+msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:606
#, c-format
-msgid "Installed %s"
+msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588
-#: apt-pkg/deb/dpkgpm.cc:589
+#: apt-pkg/deb/dpkgpm.cc:611
#, c-format
-msgid "Preparing for removal of %s"
+msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
#, c-format
-msgid "Removing %s"
+msgid "Processing triggers for %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:592
+#: apt-pkg/deb/dpkgpm.cc:617
#, c-format
-msgid "Removed %s"
+msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:597
+#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
+#: apt-pkg/deb/dpkgpm.cc:625
#, c-format
-msgid "Preparing to completely remove %s"
+msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:598
+#: apt-pkg/deb/dpkgpm.cc:628
#, c-format
-msgid "Completely removed %s"
+msgid "Removed %s"
msgstr ""
-#. populate the "processing" map
-#: apt-pkg/deb/dpkgpm.cc:604
+#: apt-pkg/deb/dpkgpm.cc:633
#, c-format
-msgid "Installing %s"
+msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:607
+#: apt-pkg/deb/dpkgpm.cc:634
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:756
+#: apt-pkg/deb/dpkgpm.cc:788
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 22:39:40 +0000