summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2017-06-30 09:51:38 +0200
committerJulian Andres Klode <jak@debian.org>2017-06-30 09:51:38 +0200
commitaf56ad0bc2e28854b682f66b72793a84abe6f6d9 (patch)
tree99c5673b28692cfd56de8cf93fdfcc600a7dabfd
parent425e2dff0e4013edac6663a34a6359c98f4e8477 (diff)
Upload 1.5~alpha3 to experimental1.5_alpha3
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog7
-rw-r--r--doc/apt-get.8.xml2
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot4
-rw-r--r--doc/po/de.po2
-rw-r--r--doc/po/es.po2
-rw-r--r--doc/po/fr.po2
-rw-r--r--doc/po/it.po2
-rw-r--r--doc/po/ja.po2
-rw-r--r--doc/po/nl.po2
-rw-r--r--doc/po/pl.po2
-rw-r--r--doc/po/pt.po2
-rw-r--r--doc/po/pt_BR.po2
-rw-r--r--po/apt-all.pot4
15 files changed, 23 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d8fdc379..bc15851ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,7 +182,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~alpha2")
+set(PACKAGE_VERSION "1.5~alpha3")
if (NOT DEFINED DPKG_DATADIR)
execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index 415b4440a..deb751c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (1.5~alpha3) experimental; urgency=medium
+
+ * Don't read CaInfo if not specified (missing else)
+ This fixes a regression from ~alpha2. (Closes: #866559)
+
+ -- Julian Andres Klode <jak@debian.org> Fri, 30 Jun 2017 09:50:13 +0200
+
apt (1.5~alpha2) experimental; urgency=medium
[ David Kalnischkies ]
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 9c86ae2d2..8895e934f 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2017-06-28T00:00:00Z</date>
+ <date>2017-06-29T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 5c555a421..4e0079366 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -239,7 +239,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.5~alpha2">
+<!ENTITY apt-product-version "1.5~alpha3">
<!-- (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 d648cefc1..bd02da5bc 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~alpha2\n"
+"Project-Id-Version: apt-doc 1.5~alpha3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+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/doc/po/de.po b/doc/po/de.po
index 91b72a4f5..babc0aae4 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+0200\n"
"PO-Revision-Date: 2016-11-15 21:51+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
diff --git a/doc/po/es.po b/doc/po/es.po
index 04a9ef207..1122b4eed 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+0200\n"
"PO-Revision-Date: 2014-07-04 01:31+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 968d2b83a..31b526325 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+0200\n"
"PO-Revision-Date: 2017-01-24 22:43+0100\n"
"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
diff --git a/doc/po/it.po b/doc/po/it.po
index f5872e033..206deed2e 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+0200\n"
"PO-Revision-Date: 2015-12-27 21:26+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 0f3453e52..fd319478c 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+0200\n"
"PO-Revision-Date: 2017-01-06 04:50+0900\n"
"Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 5dab23177..c21f12d98 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.4~beta4-nl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+0200\n"
"PO-Revision-Date: 2017-01-19 17:53+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index ee5278954..2a79498c1 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+0200\n"
"PO-Revision-Date: 2014-07-04 02:13+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 284c61b21..b8102762e 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+0200\n"
"PO-Revision-Date: 2014-08-29 00:34+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 94a93f445..e42b1806b 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+0200\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
diff --git a/po/apt-all.pot b/po/apt-all.pot
index aaf8c29e5..b136c4b84 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.5~alpha2\n"
+"Project-Id-Version: apt 1.5~alpha3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-06-29 17:52+0200\n"
+"POT-Creation-Date: 2017-06-30 09:51+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"