* doc/apt-verbatim.ent:

  - APT doesn't belong to the product 'Linux', so use 'APT' instead
    as after all APT is a big suite of applications

diff --git a/debian/changelog b/debian/changelog
index cfc87b72b7bf5eeb376b4b86d38e778430bf49b9..f699388206ce5304afda6542f08e7cdac7bdbdfa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   * debian/apt-utils.links:
     - the internal resolver 'apt' is now directly installed in
       /usr/lib/apt/solvers, so don't instruct dh to create a broken link
+  * doc/apt-verbatim.ent:
+    - APT doesn't belong to the product 'Linux', so use 'APT' instead
+      as after all APT is a big suite of applications
 
   [ Justin B Rye ]
   * doc/apt-cdrom.8.xml:
@@ -15,7 +18,6 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   * doc/apt-config.8.xml:
     - review and fix spelling issues
 
-
  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 24 May 2012 19:40:58 +0200
 
 apt (0.9.5.1) unstable; urgency=low

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index ff37f4ae7c5f9732d428bbd53a2a2529dcce451a..6174031168b3c6f4128f2832c99fc754ecb75c1c 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -202,15 +202,18 @@
 ">
 
 <!ENTITY apt-product "
-   <productname>Linux</productname>
+   <productname>APT</productname>
+   <releaseinfo role='version'>&apt-product-version;</releaseinfo>
 ">
 
+<!-- this will be updated by 'prepare-release' -->
+<!ENTITY apt-product-version "0.9.5.1">
+
 <!-- Codenames for debian releases -->
 <!ENTITY oldstable-codename "lenny">
 <!ENTITY stable-codename "squeeze">
 <!ENTITY testing-codename "wheezy">
 
-
 <!-- Arguments -->
 <!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>">
 <!ENTITY synopsis-arg-config "<arg><option>-c=<filename><replaceable>&synopsis-config-file;</replaceable></filename></option></arg>">

diff --git a/prepare-release b/prepare-release
index c5e28edc3af8d312303a721870faf2faf08650c6..73c0be602bd337fc766a186181028cdb23d7eab0 100755 (executable)
--- a/prepare-release
+++ b/prepare-release
@@ -40,6 +40,7 @@ if [ "$1" = 'pre-export' ]; then
        fi
 
        sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.in
+       sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
 elif [ "$1" = 'post-build' ]; then
        if [ "$DISTRIBUTION" != "UNRELEASED" ]; then
                echo >&2 "REMEMBER: Tag this release with »bzr tag ${VERSION}« if you are satisfied"