From 18de36389b10ac8cc7400442627b0db46748aec9 Mon Sep 17 00:00:00 2001
From: Arnaud Quette <aquette@debian.org>
Date: Thu, 29 Sep 2011 20:17:51 +0200
Subject: [PATCH] Debian release 2.6.2-1

---
 debian/changelog          | 15 +++++++++++++++
 debian/control            |  4 +---
 debian/nut-server.init    | 10 ++--------
 debian/nut-server.install |  1 +
 debian/nut.TODO.Debian    | 19 +++++++++----------
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71dc1ca..6124fed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+nut (2.6.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #594989)
+  * debian/control:
+    - remove legacy Build-Depends for nut-hal-drivers on libdbus and libglib
+    - Build-Depends-Indep on docbook-xsl for offline document
+      generation (Closes: #635347)
+  * debian/nut-server.install: add apcsmart-old
+  * debian/nut-server.init:
+    - add udev as Required-Start/Stop (Closes: #642412)
+    - remove legacy support for /etc/default/nut (Closes: #638021)
+  * debian/nut.TODO.Debian: update and complete the TODO list
+
+ -- Arnaud Quette <aquette@debian.org>  Thu, 29 Sep 2011 18:39:16 +0200
+
 nut (2.6.1-2) unstable; urgency=low
 
   * debian/nut.README.Debian: Adjust udev rules naming for permissions override
diff --git a/debian/control b/debian/control
index 2696b7c..b0e8188 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,12 @@ Build-Depends: debhelper (>= 8),
                libgd2-xpm-dev | libgd2-noxpm-dev,
                libsnmp-dev | libsnmp9-dev,
                libusb-dev (>= 0.1.8),
-               libdbus-1-dev,
-               libdbus-glib-1-dev,
-               libglib2.0-dev,
                libneon27-gnutls-dev | libneon27-dev,
                libpowerman0-dev (>= 2.3.3),
                libwrap0-dev (>= 7.6),
                python (>= 2.6.6-3~)
 Build-Depends-Indep: asciidoc (>= 8.6.3),
+                     docbook-xsl,
                      dblatex (>= 0.2.5),
                      libxml2-utils
 Standards-Version: 3.9.2
diff --git a/debian/nut-server.init b/debian/nut-server.init
index 50706ed..158e127 100644
--- a/debian/nut-server.init
+++ b/debian/nut-server.init
@@ -1,8 +1,8 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          nut
-# Required-Start:    $local_fs $syslog $network $remote_fs
-# Required-Stop:     $local_fs $syslog $network $remote_fs
+# Required-Start:    $local_fs $syslog $network $remote_fs udev
+# Required-Stop:     $local_fs $syslog $network $remote_fs udev
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Network UPS Tools initscript
@@ -17,7 +17,6 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin
 
 NAME=nut
 DESC="Network UPS Tools"
-DEFAULT=/etc/default/nut
 CONFIG=/etc/nut/nut.conf
 
 . /lib/lsb/init-functions
@@ -28,11 +27,6 @@ UPSD_OPTIONS=""
 # set upsmon specific options. use "man upsmon" for more info
 UPSMON_OPTIONS=""
 
-# Include defaults if available (transition period)
-if [ -f $DEFAULT ] ; then
-	. $DEFAULT
-fi
-
 # Include NUT nut.conf
 if [ -f $CONFIG ] ; then
 	. $CONFIG
diff --git a/debian/nut-server.install b/debian/nut-server.install
index 034e307..3c0c086 100644
--- a/debian/nut-server.install
+++ b/debian/nut-server.install
@@ -12,6 +12,7 @@ debian/tmp/lib/nut/bestups
 debian/tmp/lib/nut/bestfortress
 debian/tmp/lib/nut/usbhid-ups
 debian/tmp/lib/nut/apcsmart
+debian/tmp/lib/nut/apcsmart-old
 debian/tmp/lib/nut/belkin
 debian/tmp/lib/nut/blazer_ser
 debian/tmp/lib/nut/blazer_usb
diff --git a/debian/nut.TODO.Debian b/debian/nut.TODO.Debian
index 3a35bbc..4efc003 100644
--- a/debian/nut.TODO.Debian
+++ b/debian/nut.TODO.Debian
@@ -1,11 +1,10 @@
-- address the /var/www issue with upstream
-- rewrite and enhance the init script (log output, LSB, ...)
-- audit and solve the lintian reports...
-- factorise install rules (possibly use CDBS)
+- split nut-server.init into nut-server.init + nut-client.init (upsmon)
+- how to distribute the nut-scanner and its library? Ie, a single package,
+  or using the nut-{xml,snmp,...} packages.
+  this requires libusb (0.1), Net SNMP, FreeIPMi, Avahi, libupsclient and Neon!
 - consider an SSL/TLS set of packages (ie nut-ssl, ...)
-  or help the port to NSS 
-- apply when available the NUT Packaging Standard (NPS)
-  ie create a nut-client package
-- install the device-recorder.sh script (with nut-client or nut-dev?)
-- consider joining the powermgt effort:
-  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=55123
+  or help the port to NSS
+- install the device-recorder.sh script (with libupsclient-dev or a more
+  generic nut-dev that depends?)
+- address the /var/www issue with upstream
+- audit and solve the lintian reports...