summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog22
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot4
-rw-r--r--po/apt-all.pot4
-rw-r--r--po/nl.po4
6 files changed, 30 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5a78706b..4f5342c9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,7 +187,7 @@ endif()
# Configure some variables like package, version and architecture.
set(PACKAGE ${PROJECT_NAME})
set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
-set(PACKAGE_VERSION "1.5")
+set(PACKAGE_VERSION "1.5.1")
if (NOT DEFINED DPKG_DATADIR)
execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index 324b03678..108418eb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+apt (1.5.1) artful; urgency=medium
+
+ * New microrelease (LP: #1727694)
+
+ [ Julian Andres Klode ]
+ * travis: CI: Test 1.5.y on artful
+ * Fix testsuite for and add new fields from dpkg 1.19
+ * debian/gbp.conf: Switch to 1.5.y branch
+ * debian/tests/control: Add dpkg so we get triggered by it
+
+ [ Mo Zhou ]
+ * zh_CN.po: Update Simplified Chinese programs translation
+
+ [ Frans Spiesschaert ]
+ * Dutch program translation update (Closes: #879137)
+
+ [ David Kalnischkies ]
+ * proper error reporting for v3 onion services
+ * ignore unsupported key formats in apt-key (Closes: #876508)
+
+ -- Julian Andres Klode <juliank@ubuntu.com> Thu, 26 Oct 2017 13:36:39 +0200
+
apt (1.5) unstable; urgency=medium
* Fix translator comment location for legacy target warning
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 05585bd6c..46c1cdbdc 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -245,7 +245,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.5">
+<!ENTITY apt-product-version "1.5.1">
<!-- (Code)names for various things used all over the place -->
<!ENTITY debian-oldstable-codename "jessie">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 2bdca65d1..fde849e2d 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 1.5\n"
+"Project-Id-Version: apt-doc 1.5.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-24 17:54+0200\n"
+"POT-Creation-Date: 2017-10-26 13:37+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/po/apt-all.pot b/po/apt-all.pot
index 7c2a53389..1c548697e 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.5\n"
+"Project-Id-Version: apt 1.5.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-24 17:54+0200\n"
+"POT-Creation-Date: 2017-10-26 13:37+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/po/nl.po b/po/nl.po
index fe3fb4689..44495c2fb 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-10-20 23:00+0200\n"
+"POT-Creation-Date: 2017-10-26 13:37+0200\n"
"PO-Revision-Date: 2017-09-29 22:22+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -3597,7 +3597,7 @@ msgstr "Foute koptekstdata"
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/basehttp.cc methods/ftp.cc methods/http.cc
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
#, c-format
msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
msgstr ""