Release 1.2.9

diff --git a/configure.ac b/configure.ac
index cd23764f53426a53f4ec33cfb188916a1d95c575..33b933ed886638046be91a9a05b373091909ed93 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,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"
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"

-PACKAGE_VERSION="1.2.8"
+PACKAGE_VERSION="1.2.9"

 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
 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 407ebf316ea90dff2b386428e9c6f9500eeec746..d4f5a3fe9cb4e7becedf25f484424450e0a35637 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apt (1.2.9) unstable; urgency=high
+
+  [ David Kalnischkies ]
+  * drop confusing comma from no strong hash message
+
+  [ Julian Andres Klode ]
+  * Do not mark packages for keep that we want to remove (LP: #1562402)
+    (This fixes some upgrades involving renames where the old package
+     is removed)
+
+ -- Julian Andres Klode <jak@debian.org>  Sun, 27 Mar 2016 01:26:51 +0100
+

 apt (1.2.8) unstable; urgency=medium
 
   [ Michael Vogt ]
 apt (1.2.8) unstable; urgency=medium
 
   [ Michael Vogt ]

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index e3d8e7bde179a899f821cae346e2f9b5fae6ff4c..a7491c96c2421c755a0c04e1b0fd44d3b63806a8 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -237,7 +237,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
 ">
 
 <!-- this will be updated by 'prepare-release' -->

-<!ENTITY apt-product-version "1.2.8">
+<!ENTITY apt-product-version "1.2.9">

 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "wheezy">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "wheezy">

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index c6d257996ea40bd0748afb806ca23f5cd0002579..b5c1a85a1da36f010fbd04652de2720c3d25c447 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: apt-doc 1.2.8\n"
+"Project-Id-Version: apt-doc 1.2.9\n"

 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\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"
 "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 5e06761181ee7f7f0ab4fab950c7deb0c27f755d..d4e9d2efd388c03b7c9d8ca3fefac63e1064d07e 100644 (file)
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\n"

 "PO-Revision-Date: 2014-09-14 14:46+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "PO-Revision-Date: 2014-09-14 14:46+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 cdf60c918ec39ad5cb6672b17452102341e13f4d..ee818098f5addd2fb84695a250f43966d7f0a126 100644 (file)
--- 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"
 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: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\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"
 "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 0f5a919436234a693bd50b2499734437101f9543..21786040d8fcd081f1a539e917bd738ae9ec820d 100644 (file)
--- a/doc/po/fr.po
+++ b/doc/po/fr.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"
 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: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\n"

 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "PO-Revision-Date: 2014-11-15 17:26+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 2155f95d04da4009c0255462789ea4a5b91eaa3d..2adb094978d354be5a2e24b705299ad8c3dfa963 100644 (file)
--- 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"
 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: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\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"
 "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 52f9bb8a1b093dd5795856f025893f45952a5abb..1d876b7080af6fb1150a1c5b5f8a660377914308 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\n"

 "PO-Revision-Date: 2016-03-23 09:39+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "PO-Revision-Date: 2016-03-23 09:39+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 b595d75a38677818f1f54a7aa48ce5d6e2ac8800..09c328c88192ddc177c7c1ca3a906542267c73e1 100644 (file)
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.1.10-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.1.10-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\n"

 "PO-Revision-Date: 2016-02-01 16:17+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "PO-Revision-Date: 2016-02-01 16:17+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 869a0a3b08045f5102c83ff079d7ef0b83c19cfc..8d30ebaf05b19e7706661cbd8fd6ba3a051433a4 100644 (file)
--- 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"
 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: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\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"
 "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 e845eba38cf9f629578d975d43c4953e221f9d19..282426fbcf0ddd29150d80b5ef7a19db0cad518a 100644 (file)
--- 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"
 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: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\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"
 "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 dba159a40ba2933430fb0f6357a11e2a99e42d99..514ced50a7295283fd6b194798d5588b07835221 100644 (file)
--- 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"
 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: 2016-03-24 19:31+0100\n"
+"POT-Creation-Date: 2016-03-27 01:30+0100\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"
 "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"