merged from donkult

diff --cc configure.in
index 460892983b098d20959e2dd72dcb2496f97fe53a,460892983b098d20959e2dd72dcb2496f97fe53a..56eeaccbed5d9f661f230f082544a164ae008b08
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -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)
  
  PACKAGE="apt"
--PACKAGE_VERSION="0.9.7"
++PACKAGE_VERSION="0.9.7.1"
  PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

diff --cc debian/changelog
index 1e63657bc55bcc64690b0277a25f122fc500ec61,c8b48cc4f67ed2f6fdef2b00e37be81d469cf95c..1505aad5388b139fcae9da6f494d218b9dca3dbc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
--apt (0.9.7.1) UNRELEASED; urgency=low
++apt (0.9.7.1) unstable; urgency=low
  
    [ Program translation updates ]
    * Bulgarian (Damyan Ivanov) (Closes: #678983)
@@@ -14,8 -14,12 +14,12 @@@
    * debian/control:
      - libapt-{pkg,inst} packages should be in section 'libs' instead
        of 'admin' as by ftp-master override request in #677596
+     - demote debiandoc-sgml to Build-Depends-Indep
+   * doc/makefile:
+     - separate translation building of debiandoc from manpages
+       so that we don't need to build debiandoc for binary packages
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 25 Jun 2012 18:07:13 +0200
 - -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 29 Jun 2012 13:52:30 +0200
++ -- Michael Vogt <mvo@debian.org>  Fri, 29 Jun 2012 14:26:32 +0200
  
  apt (0.9.7) unstable; urgency=low
  

diff --cc doc/apt-verbatim.ent
index ab068fa93dfcfe601b8d0c9f4af7e2bb31ef546b,ab068fa93dfcfe601b8d0c9f4af7e2bb31ef546b..d69087db368666ba3a1470fe4b73eb6276c99d25
--- 1/doc/apt-verbatim.ent
--- 2/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@@ -213,7 -213,7 +213,7 @@@
  ">
  
  <!-- this will be updated by 'prepare-release' -->
--<!ENTITY apt-product-version "0.9.7">
++<!ENTITY apt-product-version "0.9.7.1">
  
  <!-- Codenames for debian releases -->
  <!ENTITY oldstable-codename "lenny">

diff --cc doc/po/apt-doc.pot
index 017fc69824c30863c0c227006c96e43e4225d967,017fc69824c30863c0c227006c96e43e4225d967..a9c5b24f9ef87f880b8e09eaf2dbf402dea9e636
--- 1/doc/po/apt-doc.pot
--- 2/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt-doc 0.9.7\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
--"POT-Creation-Date: 2012-06-25 09:17+0300\n"
++"POT-Creation-Date: 2012-06-29 14:26+0300\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"