summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2013-05-16 14:31:14 +0200
committerMichael Vogt <mvo@ubuntu.com>2013-05-16 14:31:14 +0200
commit14e8d0257c83938612afb2981fc72428c9c7f59b (patch)
tree1ae7563d64f2f555d448c6640e497c7c43cd5c86
parent1af6a591aeadb837b76d89dace9badf2d4fe5a0d (diff)
parent3bd93b6f774db001674da74bc6e316927da20262 (diff)
downloadapt-14e8d0257c83938612afb2981fc72428c9c7f59b.tar.gz
merged previous bzr commit
-rw-r--r--configure.in2
-rw-r--r--debian/changelog4
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot4
-rw-r--r--doc/po/fr.po2
-rw-r--r--po/apt-all.pot4
-rw-r--r--test/libapt/uri_test.cc2
7 files changed, 10 insertions, 10 deletions
diff --git a/configure.in b/configure.in
index fb58174d5..541d0e95f 100644
--- 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 f6ff44578..625519fff 100644
--- 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 3b9426f25..1ab7b6056 100644
--- 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 f7734dbe8..d329a1be1 100644
--- 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 d2128c342..54f666372 100644
--- 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 bc001e3df..a19328105 100644
--- 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 16fde503f..8216ade71 100644
--- 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;