From 52906f74a82b6d9303033a1d43928a7adde0ef87 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 24 Aug 2017 17:54:52 +0200 Subject: Rebase ubuntu master --- debian/changelog | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/control | 3 ++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8f1f6e867..0c6b70827 100644 --- a/debian/changelog +++ b/debian/changelog @@ -440,6 +440,15 @@ apt (1.3) unstable; urgency=medium -- Julian Andres Klode Tue, 20 Sep 2016 23:53:51 +0200 +apt (1.3~rc4ubuntu1) yakkety; urgency=medium + + * Merge with Debian, remaining changes: + - Hack around Ubuntu rejecting symlink copyright + - Revert "test: Assert multi-arch in the chroot" + - Revert "test: Make sure we always find a dpkg in status file" + + -- Julian Andres Klode Fri, 02 Sep 2016 20:39:36 +0000 + apt (1.3~rc4) unstable; urgency=medium [ Julian Andres Klode ] @@ -461,6 +470,23 @@ apt (1.3~rc4) unstable; urgency=medium -- Julian Andres Klode Fri, 02 Sep 2016 20:26:36 +0200 +apt (1.3~rc3ubuntu2) yakkety; urgency=medium + + * test-apt-cdrom: Fix for gnupg 2.1.15 + * Revert "test: Assert multi-arch in the chroot" + * Revert "test: Make sure we always find a dpkg in status file" + + -- Julian Andres Klode Thu, 01 Sep 2016 13:06:14 +0000 + +apt (1.3~rc3ubuntu1) yakkety; urgency=medium + + * Merge with Debian, remaining changes: + - Hack around Ubuntu rejecting symlink copyright + * Cherry pick commit from master to fix random build failures: + - TagFile: Fix off-by-one errors in comment stripping + + -- Julian Andres Klode Wed, 31 Aug 2016 22:55:32 +0000 + apt (1.3~rc3) unstable; urgency=medium [ Julian Andres Klode ] @@ -515,6 +541,32 @@ apt (1.3~rc3) unstable; urgency=medium -- Julian Andres Klode Tue, 30 Aug 2016 22:20:28 +0200 +apt (1.3~rc2ubuntu3) yakkety; urgency=medium + + [ David Kalnischkies ] + * do dpkg --configure before --remove/--purge --pending (Closes: 835094) + * prevent C++ locale number formatting in text APIs (try 3) (LP: #1611010) + + [ Julian Andres Klode ] + * CMake: Add Large File Support (Closes: #834767) + * prepare-release: Use equivs and gdebi-core for travis deps + + -- Julian Andres Klode Wed, 24 Aug 2016 08:39:04 +0000 + +apt (1.3~rc2ubuntu2) yakkety; urgency=medium + + * tests/control: Handle the gpg1/gpg2 mess a bit better + + -- Julian Andres Klode Thu, 18 Aug 2016 12:24:10 +0000 + +apt (1.3~rc2ubuntu1) yakkety; urgency=medium + + * Merge with Debian, remaining changes (forgotten to merge upstream): + - debian: Install etc/apt if present (e.g., on Ubuntu) + - Hack around Ubuntu rejecting symlink copyright + + -- Julian Andres Klode Thu, 18 Aug 2016 08:05:39 +0000 + apt (1.3~rc2) unstable; urgency=medium [ Julian Andres Klode ] @@ -544,6 +596,22 @@ apt (1.3~rc2) unstable; urgency=medium -- Julian Andres Klode Wed, 17 Aug 2016 23:31:07 +0200 +apt (1.3~rc1ubuntu2) yakkety; urgency=medium + + * Don't build with -O3. See LP: #1473674. + + -- Matthias Klose Fri, 12 Aug 2016 09:44:56 +0200 + +apt (1.3~rc1ubuntu1) yakkety; urgency=medium + + * debian/NEWS: Get rid of 1.3~pre3+cmake1 entry. + Thanks to Axel Beckert for reporting + * CMake: Use COPYONLY instead of @ONLY + * debian: Install etc/apt if present (e.g., on Ubuntu) + * Hack around Ubuntu rejecting symlink copyright + + -- Julian Andres Klode Fri, 12 Aug 2016 00:20:40 +0000 + apt (1.3~rc1) unstable; urgency=medium * Summary: CMake branch merged, socks5h (and tor) support, and fancy diff --git a/debian/control b/debian/control index 0ea6d2b55..8dbbd630f 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode , David Kalnischkies -- cgit v1.2.3