diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2008-10-11 09:00:02 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2008-10-11 09:00:02 +0200 |
| commit | b5cd290f23e6933f15fa225fa5f5c6eb23236817 (patch) | |
| tree | 3edeedaa055c8ea2e588d2c65db16e4dc74dadce | |
| parent | 5b42c812e5f689206f5e3ad4196f17c97ca34415 (diff) | |
| parent | a15489ce5d8946c6cf76e24afb5f9288814e49fc (diff) | |
Merge with debian-sid
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | doc/apt-cache.8.xml | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 4d3f557d2..a65c33e66 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.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 ad21f5955..0bb4fcdde 100644 --- 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 7ba004623..6416f4edf 100644 --- 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 |