diff -pruN 0.5-3/debian/changelog 0.5-3ubuntu1/debian/changelog --- 0.5-3/debian/changelog 2017-12-29 02:13:34.000000000 +0000 +++ 0.5-3ubuntu1/debian/changelog 2018-01-04 19:05:45.000000000 +0000 @@ -1,3 +1,11 @@ +rfkill (0.5-3ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/rfkill.maintscript: handle removal of obsolete upstart jobs on + upgrade. This change can be dropped after 18.04 LTS. + + -- Steve Langasek Thu, 04 Jan 2018 11:05:45 -0800 + rfkill (0.5-3) unstable; urgency=medium * Set myself as Maintainer (Closes: #881513) @@ -10,6 +18,18 @@ rfkill (0.5-3) unstable; urgency=medium -- Ben Hutchings Fri, 29 Dec 2017 02:13:34 +0000 +rfkill (0.5-2ubuntu1) bionic; urgency=low + + * Sync from Debian unstable; all previous changes dropped as obsolete, + the minimum required systemd version shipped in xenial and the upstart + jobs can now be dropped. LP: #1732795. + - Fixes problem of rfkill being configured while udev is not configured. + LP: #1647069. + * debian/rfkill.maintscript: handle removal of obsolete upstart jobs on + upgrade. This change can be dropped after 18.04 LTS. + + -- Steve Langasek Tue, 21 Nov 2017 15:41:16 -0800 + rfkill (0.5-2) unstable; urgency=medium * QA upload. @@ -40,6 +60,41 @@ rfkill (0.5-2) unstable; urgency=medium -- Joao Eriberto Mota Filho Mon, 13 Nov 2017 18:17:03 -0200 +rfkill (0.5-1ubuntu4) artful; urgency=medium + + * No-change rebuild to pick up -fPIE compiler default in static + libraries + + -- Steve Langasek Fri, 21 Apr 2017 20:55:49 +0000 + +rfkill (0.5-1ubuntu3) xenial; urgency=medium + + * Drop obsolete and no-op dh_installinit --upstart-only option. + (LP: #1519228) + + -- Martin Pitt Tue, 24 Nov 2015 10:22:23 +0100 + +rfkill (0.5-1ubuntu2) vivid; urgency=medium + + * Ensure that rfkill devices have ID_PATH attribute: + - debian/control: Add dependency for systemd >= 215-5ubuntu2. + - debian/rfkill.postinst: udev-trigger rfkill devices to ensure systemd + 215-5ubuntu2's adjusted 99-systemd.rules are applied on upgrade. + - This upgrade fix needs to be kept until after Ubuntu 16.04 LTS. + * debian/rfkill-{store,restore}.upstart: Use /lib/systemd/systemd-rfkill, to + keep rfkill state between boots synchronized between upstart and systemd. + (LP: #1387282) + + -- Martin Pitt Mon, 03 Nov 2014 07:47:56 +0100 + +rfkill (0.5-1ubuntu1) trusty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add upstart jobs rfkill-store and rfkill-restore to save soft RF kill + state across reboots. + + -- Colin Watson Mon, 21 Oct 2013 14:10:45 +0100 + rfkill (0.5-1) unstable; urgency=low * New upstream release. @@ -50,6 +105,14 @@ rfkill (0.5-1) unstable; urgency=low -- Darren Salt Thu, 26 Sep 2013 15:21:19 +0100 +rfkill (0.4-2ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add upstart jobs rfkill-store and rfkill-restore to save soft RF kill + state across reboots. + + -- Colin Watson Wed, 28 Nov 2012 00:15:44 +0000 + rfkill (0.4-2) unstable; urgency=low * Change of maintainer address. @@ -58,6 +121,26 @@ rfkill (0.4-2) unstable; urgency=low -- Darren Salt Tue, 20 Nov 2012 20:07:03 +0000 +rfkill (0.4-1ubuntu3) quantal; urgency=low + + * Rebuild for new armel compiler default of ARMv5t. + + -- Colin Watson Mon, 08 Oct 2012 22:54:00 +0100 + +rfkill (0.4-1ubuntu2) precise; urgency=low + + * Make upstart jobs more robust for systems that only sometimes have + rfkill entries. + + -- Stéphane Graber Thu, 22 Mar 2012 16:52:27 -0400 + +rfkill (0.4-1ubuntu1) precise; urgency=low + + * Add upstart jobs rfkill-store and rfkill-restore to save + soft RF kill state across reboots. + + -- Stéphane Graber Thu, 19 Jan 2012 10:56:03 -0500 + rfkill (0.4-1) unstable; urgency=low * New upstream release. @@ -103,3 +186,4 @@ rfkill (0.1-4-g9429740-1) UNRELEASED; ur * Initial packaging. -- Darren Salt Sat, 25 Jul 2009 14:45:25 +0100 + diff -pruN 0.5-3/debian/control 0.5-3ubuntu1/debian/control --- 0.5-3/debian/control 2017-12-29 02:13:34.000000000 +0000 +++ 0.5-3ubuntu1/debian/control 2018-01-04 19:05:45.000000000 +0000 @@ -1,7 +1,8 @@ Source: rfkill Section: utils Priority: optional -Maintainer: Ben Hutchings +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ben Hutchings Build-Depends: debhelper (>= 10) Standards-Version: 4.1.2 Homepage: https://wireless.wiki.kernel.org/en/users/Documentation/rfkill diff -pruN 0.5-3/debian/rfkill.maintscript 0.5-3ubuntu1/debian/rfkill.maintscript --- 0.5-3/debian/rfkill.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ 0.5-3ubuntu1/debian/rfkill.maintscript 2017-11-21 23:41:16.000000000 +0000 @@ -0,0 +1,2 @@ +rm_conffile /etc/init/rfkill-store.conf 0.5-2ubuntu1~ +rm_conffile /etc/init/rfkill-restore.conf 0.5-2ubuntu1~