merged previous bzr commit

diff --git a/configure.in b/configure.in
index fb58174d5c50ae273d3c225cf1f6e6bfc0a9e26c..541d0e95fac2c43edc1a4500cbfb9680603a19cb 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)
 
 PACKAGE="apt"
-PACKAGE_VERSION="0.9.8~20130516"
+PACKAGE_VERSION="0.9.8.1"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

diff --git a/debian/changelog b/debian/changelog
index f6ff4457887e1a52943f6d6738b0082366036f5d..625519fffae0d28f5bed720ce0dff78f62a1a817 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ apt (0.9.8.1) UNRELEASED; urgency=low
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 11 May 2013 09:53:59 +0200
 
-apt (0.9.8) UNRELEASED; urgency=low
+apt (0.9.8) unstable; urgency=low
 
   [ Ludovico Cavedon ]
   * properly handle if-modfied-since with libcurl/https 
@@ -79,7 +79,7 @@ apt (0.9.8) UNRELEASED; urgency=low
       directive ("DIRECT") in apt.conf
     - disregard all_proxy environment variable, like other methods
   
- -- Michael Vogt <mvo@debian.org>  Mon, 08 Apr 2013 08:43:21 +0200
+ -- Michael Vogt <mvo@debian.org>  Wed, 08 May 2013 18:43:28 +0200
 
 apt (0.9.7.9~exp2) experimental; urgency=low
 

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 3b9426f250728742d7f89acd2e9659eb03b6489f..1ab7b605659ff56d0e2547e85b0fefbbc695c6bc 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.8~20130516">
+<!ENTITY apt-product-version "0.9.8">
 
 <!-- Codenames for debian releases -->
 <!ENTITY oldstable-codename "squeeze">

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index f7734dbe86aca5898fdcebe2373e756d7c6769c3..d329a1be1018e9d1a759f859b206ced46d844f37 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.7.9~exp3\n"
+"Project-Id-Version: apt-doc 0.9.8~20130508\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-05-16 11:28+0300\n"
+"POT-Creation-Date: 2013-05-08 18:12+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"

diff --git a/doc/po/fr.po b/doc/po/fr.po
index d2128c3424ee6c4b44b921ccc69dec701d76d2ac..54f666372556ba9d095422e539a02d0db10e9296 100644 (file)
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-05-16 11:28+0300\n"
+"POT-Creation-Date: 2013-05-08 18:12+0300\n"
 "PO-Revision-Date: 2013-04-09 07:56+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"

diff --git a/po/apt-all.pot b/po/apt-all.pot
index bc001e3df4cc69f6f700e23d2cf6b620b5318e42..a19328105fef1926e1081852d964bbef5e664db3 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.7.9~exp3\n"
+"Project-Id-Version: apt 0.9.8~20130508\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-05-16 11:28+0200\n"
+"POT-Creation-Date: 2013-05-08 18:12+0200\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"

diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc
index 16fde503fbb9b87ec6f27c63b1e2a74b135a0893..8216ade71c9572cd16f768f4b8158f9168041093 100644 (file)
--- a/test/libapt/uri_test.cc
+++ b/test/libapt/uri_test.cc
@@ -113,7 +113,7 @@ int main() {
         URI U("ftp://foo:b%40r@example.org");
         equals("foo", U.User);
         equals("b@r", U.Password);
-        equals("ftp://foo:b%40r@example.org", (std::string) U);
+        equals("ftp://foo:b%40r@example.org/", (std::string) U);
         }
 
        return 0;