Merge from apt--mvo--0

Patches applied:

 * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-6
   * stronger dependencies for libapt-pkg-dev (depends on the source version of apt and apt-watch now)

 * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-7
   * distro really should be hoary, not unstable :/

 * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-8
   * documented the "--allow-unauthenticated" switch

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-2
   brought tree up-to-date with matt

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-3
   * imported changes from apt--main

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-4
   * merged changes from the conference

5 files changed, 19 insertions, 5 deletions

diff --git a/configure.in b/configure.in
index ba80075d3..55062a2b8 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.6.27ubuntu2")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.27ubuntu3")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index a3d16fc4a..f32aa5a94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.6.27ubuntu3) hoary; urgency=low
+
+  * added a exact dependency from libapt-pkg-dev to the apt version it was
+    build with
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 15 Dec 2004 09:56:32 +0100
+
 apt (0.6.27ubuntu2) hoary; urgency=low
 
   * fixed a bug in the rule file that happend during the big 0.5->0.6 merge
diff --git a/debian/control b/debian/control
index ea709acc9..54d4e4caa 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-utils, ${libapt-pkg:provides}, ${libapt-inst:provides}
+Depends: apt (= ${Source-Version}), apt-utils (= ${Source-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/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 24083aeb8..ac84f342a 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -279,8 +279,8 @@
                    <term><option>--assume-yes</option></term>
      <listitem><para>Automatic yes to prompts; assume "yes" as answer to all prompts and run
      non-interactively. If an undesirable situation, such as changing a held
-     package or removing an essential package occurs then <literal>apt-get</literal> 
-     will abort. 
+     package, trying to install a unauthenticated package or removing an essential package 
+     occurs then <literal>apt-get</literal> will abort. 
      Configuration Item: <literal>APT::Get::Assume-Yes</literal>.</para></listitem>
      </varlistentry>
 
@@ -403,7 +403,14 @@
      <listitem><para>Only process architecture-dependent build-dependencies.
      Configuration Item: <literal>APT::Get::Arch-Only</literal>.</para></listitem>
      </varlistentry>
+
+     <varlistentry><term><option>--allow-unauthenticated</option></term>
+     <listitem><para>Ignore if packages can't be authenticated and don't prompt about it.
+     This is usefull for tools like pbuilder.
+     Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem>
+     </varlistentry>
      
+
      &apt-commonoptions;
      
    </variablelist>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index fc1768ecc..7d8e9d40f 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: 2004-12-14 12:20+0100\n"
+"POT-Creation-Date: 2004-12-20 10:20+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"