merge fix from david for warning during xml build

diff --git a/debian/changelog b/debian/changelog
index 982238870d54cbe9120f408ca324f10c6851c6bb..a41380cdf1b69cfbe58f74ae57fcff48b4ec3f99 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.9.4) UNRELEASED; urgency=low
+apt (0.9.4) unstable; urgency=low

 
   [ David Kalnischkies ]
   * methods/http.cc:
 
   [ David Kalnischkies ]
   * methods/http.cc:


@@ -62,7 +62,7 @@ apt (0.9.4) UNRELEASED; urgency=low
   * apt-pkg/algorithms.cc:
     - fix memory leak of Flags in pkgSimulate by a proper destructor
 
   * apt-pkg/algorithms.cc:
     - fix memory leak of Flags in pkgSimulate by a proper destructor
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 11 May 2012 23:26:59 +0200
+ -- Michael Vogt <mvo@debian.org>  Mon, 21 May 2012 12:29:05 +0200

 
 apt (0.9.3) unstable; urgency=low
 
 
 apt (0.9.3) unstable; urgency=low
 

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 926a0712e1866982fe30e9009b4128225582bed5..a44f37ab8631dbcc995847297f1c02572aae948b 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -180,7 +180,6 @@
 <!ENTITY apt-name.dburrows "
      <firstname>Daniel</firstname>
      <surname>Burrows</surname>
 <!ENTITY apt-name.dburrows "
      <firstname>Daniel</firstname>
      <surname>Burrows</surname>

-     <email>dburrows@debian.org</email>

 ">
 
 <!ENTITY apt-copyright "
 ">
 
 <!ENTITY apt-copyright "

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 6e9bbfbfe4ebd7fd237c6033b5fbeb48c4d08d1e..3de22e0984acaf3cc7061322f2611bfbf1d5019d 100644 (file)
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -18,6 +18,7 @@
    <author>
      &apt-name.dburrows;
      <contrib>Initial documentation of Debug::*.</contrib>
    <author>
      &apt-name.dburrows;
      <contrib>Initial documentation of Debug::*.</contrib>

+     <email>dburrows@debian.org</email>

    </author>
    &apt-email;
    &apt-product;
    </author>
    &apt-email;
    &apt-product;