tags 396704 + patch
thanks
Hi,
Attached is the diff for my nut 2.0.4-2.3 NMU.
diff -Nru /tmp/UcyTWRkxv3/nut-2.0.4/debian/changelog
/tmp/8ucH3sh4Yv/nut-2.0.4/debian/changelog
--- /tmp/UcyTWRkxv3/nut-2.0.4/debian/changelog 2006-11-17 01:28:46.000000000
+0100
+++ /tmp/8ucH3sh4Yv/nut-2.0.4/debian/changelog 2006-11-17 01:28:46.000000000
+0100
@@ -1,3 +1,15 @@
+nut (2.0.4-2.3) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Some polish on top of the previous NMU.
+ * Remove the hotplug alternative; we no longer support it, so it's no
+ longer acceptable in place of udev. Correspondingly, rename the
+ substvar to ${udev}. (Closes: #396704)
+ * Drop debian/nut-usbups.rules and use upstream's rules instead. Modify
+ debian/rules correspondigly, patch from Arnaud Quette.
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Fri, 17 Nov 2006 01:12:54 +0100
+
nut (2.0.4-2.2) unstable; urgency=high
* Non-maintainer upload.
diff -Nru /tmp/UcyTWRkxv3/nut-2.0.4/debian/control
/tmp/8ucH3sh4Yv/nut-2.0.4/debian/control
--- /tmp/UcyTWRkxv3/nut-2.0.4/debian/control 2006-11-17 01:28:46.000000000
+0100
+++ /tmp/8ucH3sh4Yv/nut-2.0.4/debian/control 2006-11-17 01:28:46.000000000
+0100
@@ -61,7 +61,7 @@
Package: nut-usb
Architecture: any
-Depends: ${shlibs:Depends}, nut (>= 1.4.1-pre2), ${udev-hotplug}
+Depends: ${shlibs:Depends}, nut (>= 1.4.1-pre2), ${udev}
Conflicts: nut (<= 1.4.1-pre1)
Description: USB Drivers subsystem for the nut - Network UPS Tools
nut is a client/server uninterruptible power supply (UPS) monitoring system
diff -Nru /tmp/UcyTWRkxv3/nut-2.0.4/debian/nut-usbups.rules
/tmp/8ucH3sh4Yv/nut-2.0.4/debian/nut-usbups.rules
--- /tmp/UcyTWRkxv3/nut-2.0.4/debian/nut-usbups.rules 2006-11-17
01:28:46.000000000 +0100
+++ /tmp/8ucH3sh4Yv/nut-2.0.4/debian/nut-usbups.rules 1970-01-01
01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-# udev rules for the NUT USB drivers
-
-ACTION!="add", GOTO="nut-usbups_rules_end"
-SUBSYSTEM!="usb_device", GOTO="nut-usbups_rules_end"
-
-# MGE UPS SYSTEMS - usbhid-ups
-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="ffff", MODE="664", GROUP="nut"
-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="0001", MODE="664", GROUP="nut"
-
-# APC - usbhid-ups
-SYSFS{idVendor}=="051d", SYSFS{idProduct}=="0002", MODE="664", GROUP="nut"
-
-# Powerware - bcmxcp_usb
-SYSFS{idVendor}=="0592", SYSFS{idProduct}=="0002", MODE="664", GROUP="nut"
-
-# Tripp Lite - tripplite_usb
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="0001", MODE="664", GROUP="nut"
-
-LABEL="nut-usbups_rules_end"
-
diff -Nru /tmp/UcyTWRkxv3/nut-2.0.4/debian/rules
/tmp/8ucH3sh4Yv/nut-2.0.4/debian/rules
--- /tmp/UcyTWRkxv3/nut-2.0.4/debian/rules 2006-11-17 01:28:46.000000000
+0100
+++ /tmp/8ucH3sh4Yv/nut-2.0.4/debian/rules 2006-11-17 01:28:46.000000000
+0100
@@ -89,19 +89,9 @@
DESTDIR=$(CURDIR)/debian/nut-snmp RUNUID=65534 RUNGID=65534
$(MAKE) install-usb \
DESTDIR=$(CURDIR)/debian/nut-usb RUNUID=65534 RUNGID=65534
-#ifeq (linux,$(DEB_HOST_GNU_SYSTEM))
- # install hotplug scripts
- mkdir -p $(CURDIR)/debian/nut-usb/etc/hotplug/usb/
- # install the new hotplug script
- install -m 755 -D debian/hotplug
$(CURDIR)/debian/nut-usb/etc/hotplug/usb/libhidups
- #install -m 755 $(CURDIR)/scripts/hotplug/libhidups
$(CURDIR)/debian/nut-usb/etc/hotplug/usb/
- install -m 644 $(CURDIR)/scripts/hotplug/libhid.usermap
$(CURDIR)/debian/nut-usb/etc/hotplug/usb/
- # install udev rules file (FIXME; to be done at postint time if -d
/etc/udev)
- mkdir -p $(CURDIR)/debian/nut-usb/etc/udev/rules.d/
- install -m 644 $(CURDIR)/debian/nut-usbups.rules
$(CURDIR)/debian/nut-usb/etc/udev
- #cd $(CURDIR)/debian/nut-usb/etc/udev/rules.d/
- #ln -sf ../nut-usbups.rules 025_nut-usbups.rules
-#endif
+ mkdir -p $(CURDIR)/debian/nut-usb/etc/udev/rules.d
+ install -m 644 $(CURDIR)/scripts/hotplug-ng/nut-usbups.rules \
+ $(CURDIR)/debian/nut-usb/etc/udev/rules.d/025_nut-usbups.rules
$(MAKE) install-cgi \
DESTDIR=$(CURDIR)/debian/nut-cgi RUNUID=65534 RUNGID=65534
mv $(CURDIR)/debian/nut/lib/nut/upsdrvctl $(CURDIR)/debian/nut/sbin
@@ -128,7 +118,7 @@
dh_installdeb
dh_shlibdeps -Xlibupsclient.a
ifeq (linux,$(DEB_HOST_ARCH_OS))
- dh_gencontrol -- -Vudev-hotplug="udev | hotplug"
+ dh_gencontrol -- -Vudev="udev"
else
dh_gencontrol
endif
