diff -Nru aufs-tools-4.9+20170918/debian/changelog aufs-tools-4.9+20170918/debian/changelog --- aufs-tools-4.9+20170918/debian/changelog 2018-01-04 17:47:23.000000000 +0000 +++ aufs-tools-4.9+20170918/debian/changelog 2018-05-26 12:35:47.000000000 +0000 @@ -1,9 +1,14 @@ -aufs-tools (1:4.9+20170918-1ubuntu1) bionic; urgency=low +aufs-tools (1:4.9+20170918-2) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - Remove the Recommends: on aufs-dkms. - - -- Steve Langasek Thu, 04 Jan 2018 09:47:23 -0800 + * debian/control: + - Change Maintainer mail address to j.naumann@fu-berlin.de. + (Closes: #899451) + - Switch to Debian Salsa as Git hoster. + - Update to Debian policy 4.1.4, no changes needed. + * debian/compat: + - Update to debhelper compat level 11. + + -- Jan Luca Naumann Sat, 26 May 2018 14:35:47 +0200 aufs-tools (1:4.9+20170918-1) unstable; urgency=medium @@ -13,17 +18,6 @@ -- Jan Luca Naumann Sat, 02 Dec 2017 12:46:15 +0100 -aufs-tools (1:4.1+20161219-1ubuntu1) bionic; urgency=medium - - * Remove the Recommends: on aufs-dkms; our kernels in 17.10 have started - to provide this virtual package, but this means apt on upgrade will pick - a kernel at random to satisfy the Recommends. Since all of our kernel - packages logically satisfy this relationship, the explicit declaration - only causes trouble. This change can be dropped for the 18.10 release. - (LP: 1728760) - - -- Steve Langasek Tue, 07 Nov 2017 10:58:54 -0800 - aufs-tools (1:4.1+20161219-1) unstable; urgency=medium * New upstream release. @@ -245,4 +239,3 @@ * Initial release. -- Daniel Baumann Sun, 27 Dec 2009 11:14:34 +0100 - diff -Nru aufs-tools-4.9+20170918/debian/compat aufs-tools-4.9+20170918/debian/compat --- aufs-tools-4.9+20170918/debian/compat 2017-12-03 22:16:00.000000000 +0000 +++ aufs-tools-4.9+20170918/debian/compat 2018-05-26 12:35:47.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru aufs-tools-4.9+20170918/debian/control aufs-tools-4.9+20170918/debian/control --- aufs-tools-4.9+20170918/debian/control 2017-12-03 22:16:00.000000000 +0000 +++ aufs-tools-4.9+20170918/debian/control 2018-05-26 12:35:47.000000000 +0000 @@ -1,18 +1,17 @@ Source: aufs-tools Section: kernel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Filesystems Group -Uploaders: Jan Luca Naumann -Build-Depends: debhelper (>= 9), linux-libc-dev, aufs-dev -Standards-Version: 4.1.2 +Maintainer: Jan Luca Naumann +Build-Depends: debhelper (>= 11), linux-libc-dev, aufs-dev +Standards-Version: 4.1.4 Homepage: http://aufs.sourceforge.net/ -Vcs-Browser: https://github.com/JanLuca/aufs-tools-debian -Vcs-Git: https://github.com/JanLuca/aufs-tools-debian.git +Vcs-Browser: https://salsa.debian.org/janluca-guest/aufs-tools-debian +Vcs-Git: https://salsa.debian.org/janluca-guest/aufs-tools-debian.git Package: aufs-tools Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: aufs-dkms Description: Tools to manage aufs filesystems The aufs driver provides a union mount for Linux filesystems. It allows one to virtually merge the contents of several directories and/or stack them, so diff -Nru aufs-tools-4.9+20170918/debian/patches/series aufs-tools-4.9+20170918/debian/patches/series --- aufs-tools-4.9+20170918/debian/patches/series 2017-12-03 22:16:00.000000000 +0000 +++ aufs-tools-4.9+20170918/debian/patches/series 2018-05-26 12:35:47.000000000 +0000 @@ -1,4 +1,5 @@ 0001-static.patch 0002-manpage.patch 0003-libau-Makefile-ensure-shared-overwrite-pie-flag.patch +# 0003-xino.patch 0004-libau-Makefile-disable-strip.patch