merge the 0.7.20.2 upload

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644 (file)
index f9bbb82..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-autom4te.cache
-aclocal.m4
-configure
-build

diff --git a/configure.in b/configure.in
index fa4ddfc6a897386755c46b9ae6350ea5958d6c5d..b6e5d6bbd5406a8085db5c4f66cc701e201125b4 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_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.20.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/.cvsignore b/debian/.cvsignore
deleted file mode 100644 (file)
index d9f9836..0000000
--- a/debian/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-copyright
-apt
-apt-doc
-apt-utils
-apt-utils.substvars
-apt.substvars
-files
-libapt-pkg-dev
-libapt-pkg-doc
-shlibs.local
-shlibs.local.apt
-shlibs.local.apt-utils
-*.debhelper

diff --git a/debian/changelog b/debian/changelog
index 21a9ba87c5e95ce440e434032c5551a67017fa65..dfc18316b68b2677f157e88fb1e97dcbc7e2915b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,15 @@ apt (0.7.20.3) UNRELEASED; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Sun, 08 Feb 2009 11:47:48 +0100
 
 
  -- Michael Vogt <mvo@debian.org>  Sun, 08 Feb 2009 11:47:48 +0100
 

+apt (0.7.20.2) unstable; urgency=medium
+
+  [ Eugene V. Lyubimkin ]
+  * Urgency set to medium due to RC bug fix.
+  * doc/apt.ent, apt-get.8.xml:
+    - Fix invalid XML entities. (Closes: #514402)
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 07 Feb 2009 16:48:21 +0200
+

 apt (0.7.20.1) unstable; urgency=low
 
   [ Michael Vogt ]
 apt (0.7.20.1) unstable; urgency=low
 
   [ Michael Vogt ]

diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644 (file)
index 94d80ad..0000000
--- a/doc/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-apt-cache.8
-apt-get.8
-apt-cdrom.8
-apt.conf.5
-sources.list.5
-apt-config.8
-apt-sortpkgs.1
-apt-ftparchive.1
-manpage.links
-manpage.refs
-manpage.log
-apt_preferences.5
-apt-extracttemplates.1
-vendors.list.5

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index ace7f9e1b81d81fcb2be6ada6c2f822274c03adf..c1b3470ef83c290a11b838a1502da79b904cbd6f 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -581,8 +581,8 @@
         <title>CURRENT AUTHORS</title>
         <para>
                 &apt-author.team;
         <title>CURRENT AUTHORS</title>
         <para>
                 &apt-author.team;

-                &apt-qapage;

         </para>
         </para>

+                &apt-qapage;

  </refsect1>
  &manbugs;
 </refentry>
  </refsect1>
  &manbugs;
 </refentry>

diff --git a/doc/apt.ent b/doc/apt.ent
index 6594ba1b31f0b1646d498958e57b8da3dea31078..4cfc0006963ee45e1d24df12da7beef0e0d3dc7e 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -179,6 +179,13 @@
    </author>
 ">
 
    </author>
 ">
 

+<!ENTITY apt-author.moconnor "
+   <author>
+    <firstname>Mike</firstname>
+    <surname>O'Connor</surname>
+   </author>
+">
+

 <!ENTITY apt-author.team "
    <author>
     <othername>APT team</othername>
 <!ENTITY apt-author.team "
    <author>
     <othername>APT team</othername>

diff --git a/doc/es/.cvsignore b/doc/es/.cvsignore
deleted file mode 100644 (file)
index ce36346..0000000
--- a/doc/es/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-apt-cache.es.8
-apt-get.es.8
-apt-cdrom.es.8
-apt.conf.es.5
-sources.list.es.5
-apt-config.es.8
-apt-sortpkgs.es.1
-apt-ftparchive.es.1
-manpage.links
-manpage.refs
-manpage.log
-apt_preferences.es.5
-apt-extracttemplates.es.1
-vendors.list.es.5

diff --git a/doc/fr/.cvsignore b/doc/fr/.cvsignore
deleted file mode 100644 (file)
index cfa8962..0000000
--- a/doc/fr/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-apt-cdrom.fr.8
-apt-config.fr.8
-apt-extracttemplates.fr.1
-apt-ftparchive.fr.1
-apt-sortpkgs.fr.1
-apt.conf.fr.5
-apt_preferences.fr.5
-manpage.links
-manpage.refs
-sources.list.fr.5
-apt-cache.fr.8
-apt-get.fr.8
-vendors.list.fr.5

diff --git a/doc/pt_BR/.cvsignore b/doc/pt_BR/.cvsignore
deleted file mode 100644 (file)
index 8d11bcc..0000000
--- a/doc/pt_BR/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-apt_preferences.pt_BR.5
-manpage.links
-manpage.refs