diff -Nru nut-2.7.1/debian/changelog nut-2.7.1/debian/changelog --- nut-2.7.1/debian/changelog 2017-08-17 13:26:30.000000000 +0000 +++ nut-2.7.1/debian/changelog 2017-08-28 06:49:39.000000000 +0000 @@ -1,3 +1,10 @@ +nut (2.7.1-1ubuntu1.2) trusty; urgency=medium + + * Drop d/p/Fix-USB-permission-issues-related-to-Linux-udev.patch: this issue + seems fixed via other updates and is no more reproducible (LP 1099947). + + -- Christian Ehrhardt Mon, 28 Aug 2017 08:48:47 +0200 + nut (2.7.1-1ubuntu1.1) trusty; urgency=medium * debian/nut-server.postinst: The udevd process is called systemd-udevd for diff -Nru nut-2.7.1/debian/patches/Fix-USB-permission-issues-related-to-Linux-udev.patch nut-2.7.1/debian/patches/Fix-USB-permission-issues-related-to-Linux-udev.patch --- nut-2.7.1/debian/patches/Fix-USB-permission-issues-related-to-Linux-udev.patch 2017-08-17 13:26:30.000000000 +0000 +++ nut-2.7.1/debian/patches/Fix-USB-permission-issues-related-to-Linux-udev.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -From 040c800efad46ead9670077c9764360802d7aaf5 Mon Sep 17 00:00:00 2001 -From: Arnaud Quette -Date: Fri, 1 Aug 2014 19:34:07 +0200 -Subject: [PATCH] Fix USB permission issues related to Linux / udev - -Rename udev rules file to 62-nut-usbups.rules, to prevent NUT USB -privileges from being overwritten - -Closes #140 - -Forwarded: no (backport) -Author: Christian Ehrhardt -Original-Author: Arnaud Quette -Origin: https://github.com/networkupstools/nut/commit/040c800efad46ead9670077c9764360802d7aaf5 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1099947 -Last-Update: 2017-08-17 ---- - scripts/udev/Makefile.am | 10 +++++----- - scripts/udev/README | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/scripts/udev/Makefile.am b/scripts/udev/Makefile.am -index fcd6eeb..1973ccf 100644 ---- a/scripts/udev/Makefile.am -+++ b/scripts/udev/Makefile.am -@@ -3,7 +3,7 @@ if WITH_UDEV - udevrulesdir = $(udevdir)/rules.d - udevrules_DATA = - if WITH_USB -- udevrules_DATA += 52-nut-usbups.rules -+ udevrules_DATA += 62-nut-usbups.rules - endif - if WITH_IPMI - udevrules_DATA += 52-nut-ipmipsu.rules -@@ -12,13 +12,13 @@ endif - - EXTRA_DIST = README - --52-nut-usbups.rules: nut-usbups.rules -- cp nut-usbups.rules 52-nut-usbups.rules -+62-nut-usbups.rules: nut-usbups.rules -+ cp nut-usbups.rules $@ - - 52-nut-ipmipsu.rules: nut-ipmipsu.rules -- cp nut-ipmipsu.rules 52-nut-ipmipsu.rules -+ cp nut-ipmipsu.rules $@ - - DISTCLEANFILES = nut-usbups.rules nut-ipmipsu.rules --CLEANFILES = 52-nut-usbups.rules 52-nut-ipmipsu.rules -+CLEANFILES = 62-nut-usbups.rules 52-nut-ipmipsu.rules - # we should never remove this one, apart from a distclean-check - #MAINTAINERCLEANFILES = nut-usbups.rules.in -diff --git a/scripts/udev/README b/scripts/udev/README -index a3b5567..ff6a1a0 100644 ---- a/scripts/udev/README -+++ b/scripts/udev/README -@@ -1,6 +1,6 @@ - Desc: Udev script for NUT USB and IPMI drivers - File: scripts/udev/README --Date: 25 July 2011 -+Date: 31 July 2014 - Auth: Arnaud Quette - - This document introduces the Linux udev script for NUT USB -@@ -32,7 +32,7 @@ Manual installation - To install them manually, copy the rules file(s) to /etc/udev/rules.d - (or /lib/udev/rules.d on newer systems) using the command(s): - --$ cp -f nut-usbups.rules /etc/udev/rules.d/52-nut-usbups.rules -+$ cp -f nut-usbups.rules /etc/udev/rules.d/62-nut-usbups.rules - $ cp -f nut-ipmipsu.rules /etc/udev/rules.d/52-nut-ipmipsu.rules - - You will need to refresh the bus to avoid a reboot for these rules to be --- -2.7.4 - diff -Nru nut-2.7.1/debian/patches/series nut-2.7.1/debian/patches/series --- nut-2.7.1/debian/patches/series 2017-08-17 13:26:30.000000000 +0000 +++ nut-2.7.1/debian/patches/series 2017-08-28 06:48:34.000000000 +0000 @@ -7,4 +7,3 @@ backport-fix-lp753661.patch link-fixes.diff ppc64el.diff -Fix-USB-permission-issues-related-to-Linux-udev.patch