* merged from the debian-sid bzr branch

* apt-pkg/depcache.cc:
  - Really release action groups only once (Closes: #622744)
  - Make purge work again for config-files (LP: #244598) (Closes: #150831)
* debian/apt.cron.daily:
  - Check power after wait, patch by manuel-soto (LP: #705269)
* debian/control:
  - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
    unpacked if a library is too old and thus break upgrades
* doc/apt-key.8.xml:
  - Document apt-key net-update (LP: #192810)
* apt-pkg/acquire-item.cc:
  - Only try to rename existing Release files (Closes: #622912)
* apt-pkg/indexcopy.cc:
  - Use RealFileExists() instead of FileExists(), allows amongst other
    things a directory named Sources to exist on a CD-ROM (LP: #750694).
* apt-pkg/acquire-item.cc:
  - Use Release files even if they cannot be verified (LP: #704595)
* cmdline/apt-get.cc:
  - Do not install recommends for build-dep (Closes: #454479) (LP: #245273)
* apt-pkg/deb/deblistparser.cc:
  - Handle no space before "[" in build-dependencies (LP: #72344)
* apt-pkg/policy.cc:
  - Allow pinning by glob() expressions, and regular expressions
    surrounded by slashes (the "/" character) (LP: #399474)
    (Closes: #121132)
* debian/control:
  - Set Standards-Version to 3.9.2

* mirror method:
  - do not crash if the mirror file fails to download
* apt-pkg/aptconfiguration.cc:
  - fix comparing for a empty string
* debian/apt.cron.daily:
  - run unattended-upgrades even if there was a error during
    the apt-get update (LP: #676295)
* apt-pkg/pkgcache.cc:
  - use the native Architecture stored in the cache header instead of
    loading it from configuration as suggested by Julian Andres Klode

2 files changed, 59 insertions, 0 deletions

diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index f1cc3ac02..9bfab84b6 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -136,6 +136,22 @@
 
      </listitem>
      </varlistentry>
+     
+     <varlistentry><term>net-update</term>
+     <listitem>
+     <para>
+
+       Update the local keyring with the keys of a key server
+       and removes from the keyring the archive keys which are no
+       longer valid. This requires an installed wget and an APT
+       build configured to have a server to fetch from. APT in
+       Debian does not support this command, but Ubuntu's APT
+       does.
+
+     </para>
+
+     </listitem>
+     </varlistentry>
    </variablelist>
 </refsect1>
 
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 219da7cd1..55504f3e5 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -259,6 +259,49 @@ Pin-Priority: 500
 
 </refsect2>
 
+<refsect2><title>Regular expressions and glob() syntax</title>
+<para>
+APT also supports pinning by glob() expressions and regular
+expressions surrounded by /. For example, the following
+example assigns the priority 500 to all packages from
+experimental where the name starts with gnome (as a glob()-like
+expression or contains the word kde (as a POSIX extended regular
+expression surrounded by slashes).
+</para>
+
+<programlisting>
+Package: gnome* /kde/
+Pin: release n=experimental
+Pin-Priority: 500
+</programlisting>
+
+<para>
+The rule for those expressions is that they can occur anywhere
+where a string can occur. Those, the following pin assigns the
+priority 990 to all packages from a release starting with karmic.
+</para>
+
+<programlisting>
+Package: *
+Pin: release n=karmic*
+Pin-Priority: 990
+</programlisting>
+
+If a regular expression occurs in a <literal>Package</literal> field,
+the behavior is the same as if this regular expression were replaced
+with a list of all package names it matches. It is undecided whether
+this will change in the future, thus you should always list wild-card
+pins first, so later specific pins override it.
+
+The pattern "<literal>*</literal>" in a Package field is not considered
+a glob() expression in itself.
+
+</refsect2>
+
+
+
+
+
 <refsect2>
 <title>How APT Interprets Priorities</title>