summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-02-11 09:36:10 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-02-11 09:36:10 +0100
commit38eeaec814307aa0b6dc39ee9119235c13333acf (patch)
tree95876cfdc6bc410349804a7892ed26999a85cfb0 /debian
parent08fe18cccff68fbaf35bd3251f37cee524c073f6 (diff)
parent3b169b6d1d2111765f57e2f5e6279e99ae523cde (diff)
Merge tag '1.8.0_rc3'
apt Debian release 1.8.0~rc3
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.install2
-rw-r--r--debian/changelog25
-rw-r--r--debian/gbp.conf2
3 files changed, 26 insertions, 3 deletions
diff --git a/debian/apt.install b/debian/apt.install
index 705ea12d2..f12eb240d 100644
--- a/debian/apt.install
+++ b/debian/apt.install
@@ -27,6 +27,8 @@ usr/share/man/*/*/apt-mark.*
usr/share/man/*/*/apt-secure.*
usr/share/man/*/*/apt.*
usr/share/man/*/*/apt_preferences.*
+usr/share/man/*/*/apt_auth.*
+usr/share/man/*/*/apt-transport-*.*
usr/share/man/*/*/sources.list.*
usr/share/man/*/apt-cache.*
usr/share/man/*/apt-cdrom.*
diff --git a/debian/changelog b/debian/changelog
index 0fbddb2f4..f223349ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,27 @@
+apt (1.8.0~rc3) unstable; urgency=medium
+
+ [ Julian Andres Klode ]
+ * aptmethod.h: Do not have gcc warning about ignoring write() result
+ * Fix issues in previous two debian/changelog entries
+ * json-hooks-protocol: The "pin" field is optional
+ * debian/gbp.conf: Set debian-branch to 1.8.y
+ * Install translated apt_auth and apt-transport-* manpages
+
+ [ Алексей Шилин ]
+ * Russian program translation update.
+ Thanks to Vladimir Zhbanov <vzhbanov@gmail.com> (Closes: #921830)
+
+ [ Jakub Wilk ]
+ * Fix various typos in the documentation
+
+ [ Frans Spiesschaert ]
+ * Dutch program translation update (Closes: #921934)
+ * Dutch manpages translation update (Closes: #921941)
+
+ -- Julian Andres Klode <jak@debian.org> Mon, 11 Feb 2019 09:33:46 +0100
+
apt (1.8.0~rc2) unstable; urgency=medium
- * Bump SONAMEs in preparation for ABI breaks
* Correctly handle feature detection for sse4.2 and crc32
-- Julian Andres Klode <jak@debian.org> Mon, 04 Feb 2019 18:15:07 +0100
@@ -38,7 +59,7 @@ apt (1.8.0~rc1) unstable; urgency=medium
[ Baptiste Jammet ]
* French program translation update (Closes: #921008)
- -- Julian Andres Klode <julian.klode@canonical.com> Mon, 04 Feb 2019 15:32:27 +0100
+ -- Julian Andres Klode <jak@debian.org> Mon, 04 Feb 2019 15:32:27 +0100
apt (1.8.0~beta1) unstable; urgency=medium
diff --git a/debian/gbp.conf b/debian/gbp.conf
index a5e885896..058530b00 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,7 +3,7 @@
;preexport = ./prepare-release pre-export
prebuild = ./prepare-release pre-build
postbuild = ./prepare-release post-build
-debian-branch = master
+debian-branch = 1.8.y
debian-tag = %(version)s
export-dir = ../build-area
sign-tags = True