diff options
| -rw-r--r-- | debian/changelog | 59 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r--[l---------] | debian/copyright | 24 | ||||
| -rw-r--r-- | test/integration/framework | 18 |
4 files changed, 93 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index feb812889..0043bfc88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,23 @@ apt (1.3~rc4) unstable; urgency=medium -- Julian Andres Klode <jak@debian.org> 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 <juliank@ubuntu.com> 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 <juliank@ubuntu.com> Wed, 31 Aug 2016 22:55:32 +0000 + apt (1.3~rc3) unstable; urgency=medium [ Julian Andres Klode ] @@ -73,6 +90,32 @@ apt (1.3~rc3) unstable; urgency=medium -- Julian Andres Klode <jak@debian.org> 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 <juliank@ubuntu.com> 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 <juliank@ubuntu.com> 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 <juliank@ubuntu.com> Thu, 18 Aug 2016 08:05:39 +0000 + apt (1.3~rc2) unstable; urgency=medium [ Julian Andres Klode ] @@ -102,6 +145,22 @@ apt (1.3~rc2) unstable; urgency=medium -- Julian Andres Klode <jak@debian.org> 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 <doko@ubuntu.com> 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 <juliank@ubuntu.com> 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 72a8837e7..772339511 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team <deity@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>, David Kalnischkies <donkult@debian.org> diff --git a/debian/copyright b/debian/copyright index 012065c85..c0e89b51a 120000..100644 --- a/debian/copyright +++ b/debian/copyright @@ -1 +1,23 @@ -../COPYING
\ No newline at end of file +Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. +Apt is currently developed by APT Development Team <deity@lists.debian.org>. + +License: GPLv2+ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +See /usr/share/common-licenses/GPL-2, or +<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version +of the GNU General Public License. + diff --git a/test/integration/framework b/test/integration/framework index 067cc6e8a..ff994549c 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -530,15 +530,7 @@ configdpkg() { fi fi rm -f rootdir/etc/apt/apt.conf.d/00foreigndpkg - # if multi-arch make sure dpkg can detect itself as capable of it - if getarchitectures | grep -E -q '[^ ]+ [^ ]+'; then - if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then - # dpkg doesn't really check the version as long as it is fully installed, - # but just to be sure we choose one above the required version - insertinstalledpackage 'dpkg' "all" '1.16.2+fake' - fi - fi - if dpkg --assert-multi-arch >/dev/null 2>&1 ; then + if command dpkg --assert-multi-arch >/dev/null 2>&1 ; then local ARCHS="$(getarchitectures)" local DPKGARCH="$(dpkg --print-architecture)" # this ensures that even if multi-arch isn't active in the view @@ -553,6 +545,14 @@ configdpkg() { fi fi done + # if multi-arch make sure dpkg can detect itself as capable of it + if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then + if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then + # dpkg doesn't really check the version as long as it is fully installed, + # but just to be sure we choose one above the required version + insertinstalledpackage 'dpkg' "all" '1.16.2+fake' + fi + fi fi } |