From 8cc62ab670497622582b0f032a43130c8c3df865 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Mon, 9 May 2011 15:03:14 +0200 Subject: [PATCH] Drop HAL package and build-dependencies (Closes: #613197) --- debian/changelog | 3 ++- debian/control | 19 ------------------- debian/nut-hal-drivers.docs | 1 - debian/nut-hal-drivers.install | 3 --- debian/nut-hal-drivers.postinst | 24 ------------------------ debian/nut-hal-drivers.preinst | 18 ------------------ debian/nut.docs | 1 - debian/rules | 1 - 8 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 debian/nut-hal-drivers.docs delete mode 100644 debian/nut-hal-drivers.install delete mode 100644 debian/nut-hal-drivers.postinst delete mode 100644 debian/nut-hal-drivers.preinst diff --git a/debian/changelog b/debian/changelog index f93fa7b..5de4dad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ nut (2.6.0-3) UNRELEASED; urgency=low + * Drop HAL package and build-dependencies (Closes: #613197) * debian/control: - Bump Standards-Version to 3.9.2 (no further changes) - -- Laurent Bigonville Sun, 08 May 2011 21:44:42 +0200 + -- Laurent Bigonville Mon, 09 May 2011 15:02:47 +0200 nut (2.6.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 24479cd..8bc1ab0 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,6 @@ Build-Depends: debhelper (>= 8), libgd2-xpm-dev | libgd2-noxpm-dev, libsnmp-dev | libsnmp9-dev, libusb-dev (>= 0.1.8), - libhal-dev (>= 0.5.8), - hal, libdbus-1-dev, libdbus-glib-1-dev, libglib2.0-dev, @@ -74,23 +72,6 @@ Description: network UPS tools - SNMP driver supports various MIBs including IETF, MGE, and APC. It adds an SNMP Manager interface to the core NUT system. -Package: nut-hal-drivers -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${udev} -Conflicts: nut -Provides: hal-ups-support -Breaks: udev (<< 124-1) -Description: network UPS tools - HAL interface - Network UPS Tools (NUT) is a client/server monitoring system that - allows computers to share uninterruptible power supply (UPS) and - power distribution unit (PDU) hardware. Clients access the hardware - through the server, and are notified whenever the power status - changes. - . - This package provides add-ons for the hardware abstraction layer (HAL) that - allow desktop environments to monitor locally-connected UPS equipment. The - HAL drivers cannot be used at the same time as the normal NUT upsd. - Package: nut-xml Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, nut (>= 2.2.2) diff --git a/debian/nut-hal-drivers.docs b/debian/nut-hal-drivers.docs deleted file mode 100644 index 78279fb..0000000 --- a/debian/nut-hal-drivers.docs +++ /dev/null @@ -1 +0,0 @@ -docs/nut-hal.txt diff --git a/debian/nut-hal-drivers.install b/debian/nut-hal-drivers.install deleted file mode 100644 index 1ef47a2..0000000 --- a/debian/nut-hal-drivers.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/lib/hal/ /usr/lib/ -debian/tmp/usr/share/hal -debian/tmp/*/udev/ diff --git a/debian/nut-hal-drivers.postinst b/debian/nut-hal-drivers.postinst deleted file mode 100644 index 414d5f3..0000000 --- a/debian/nut-hal-drivers.postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - - configure) - # ask udev to check for new udev rules - [ -x /etc/init.d/udev ] && pidof udevd > /dev/null \ - && udevadm trigger --action=change - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - # do nothing - ;; - - *) - echo "$0: incorrect arguments: $*" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# diff --git a/debian/nut-hal-drivers.preinst b/debian/nut-hal-drivers.preinst deleted file mode 100644 index 2de4425..0000000 --- a/debian/nut-hal-drivers.preinst +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = install ] || [ "$1" = upgrade ]; then - # Remove previous rules if unchanged, otherwise move to new filename. - if [ -e "/etc/udev/rules.d/52_nut-usbups.rules" ]; then - if [ "`md5sum \"/etc/udev/rules.d/52_nut-usbups.rules\" | sed -e \"s/ .*//\"`" = \ - "`dpkg-query -W -f='${Conffiles}' nut-hal-drivers | sed -n -e \"\\\\' /etc/udev/rules.d/52_nut-usbups.rules's/.* //p\"`" ] - then - rm -f "/etc/udev/rules.d/52_nut-usbups.rules" - else - mv "/etc/udev/rules.d/52_nut-usbups.rules" "/etc/udev/rules.d/52-nut-usbups.rules" - fi - fi -fi - -#DEBHELPER# diff --git a/debian/nut.docs b/debian/nut.docs index 8f9c4d4..d0026f7 100644 --- a/debian/nut.docs +++ b/debian/nut.docs @@ -9,7 +9,6 @@ docs/download.txt docs/FAQ.txt docs/features.txt docs/history.txt -docs/nut-hal.txt docs/nut-names.txt docs/outlets.txt docs/packager-guide.txt diff --git a/debian/rules b/debian/rules index 39bf66f..e1f2863 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr \ --libdir=/lib \ --includedir=/usr/include \ --without-ssl \ - --with-hal \ --with-cgi \ --with-dev \ --enable-static \