* 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)

15 files changed, 183 insertions, 47 deletions

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 beef99123..f9aed94b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,35 @@ 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.
+    - 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)
 
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 24 Oct 2008 23:45:17 +0300
 
diff --git a/debian/control b/debian/control
index 0f72299b6..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
+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
-XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
+Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 
 Package: apt
 Architecture: any
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 64724f211..5b71384a7 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.</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>
@@ -158,6 +163,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>