merged from debian-sid

diff --git a/configure.in b/configure.in
index 4d3f557d2325f03f6e04436b393bb4a4bbba89f9..a65c33e669437cd9d387fc25816934c406e0fff4 100644 (file)
--- 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.15")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.16")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index ad21f59550d06c3a26c0b1fce870dda0a64116f0..0bb4fcdde3ec946a5a171982f83bdbbf3e344168 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-apt (0.7.16~exp1) UNRELEASED; urgency=low
+apt (0.7.16) unstable; urgency=low
 
-  [Luca Bruno]
+  [ Luca Bruno ]
   * doc/apt-cache.8.xml:
     - search command uses POSIX regex, and searches for virtual packages too
       (closes: #277536)
@@ -16,8 +16,12 @@ apt (0.7.16~exp1) UNRELEASED; urgency=low
   * Retitle the apt-mark.8 manpage (thanks to Justin Pryzby, closes: #471276)
   * Better documentation on using both APT::Default-Release and
     /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575)
+  
+  [ Michael Vogt ]
+  * doc/apt-cache.8.xml:
+    - add missing citerefentry
 
- -- Luca Bruno <lethalman88@gmail.com>  Fri, 03 Oct 2008 20:00:18 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri, 10 Oct 2008 23:44:50 +0200
 
 apt (0.7.15) unstable; urgency=low
 

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 7ba0046237acb856d19e481e3884c2ef567db6eb..6416f4edf99eff973434a9df8d90e3ec8818dd5c 100644 (file)
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -198,8 +198,8 @@ Reverse Provides:
      <varlistentry><term>search <replaceable>regex [ regex ... ]</replaceable></term>
      <listitem><para><literal>search</literal> performs a full text search on all available package
      lists for the POSIX regex pattern given, see 
-     <refentrytitle><command>regex</command></refentrytitle>
-     <manvolnum>7</manvolnum>.
+     <citerefentry><refentrytitle><command>regex</command></refentrytitle>
+     <manvolnum>7</manvolnum></citerefentry>.
      It searches the package names and the
      descriptions for an occurrence of the regular expression and prints out
      the package name and the short description, including virtual package