Merge ~paelzer/ubuntu/+source/nut:merge-eoan-2.4.7-9 into ubuntu/+source/nut:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

A ppa build is available at [1] PPA.

I did a component mismatch check and nut-monitor would trigger some dependencies that are demoted since Bionic (python-gtk2 python-gobject-2 python-glade2) but nut-monitor itself isn't in main so that will be ok.

[1]: https://launchpad.net/~paelzer/+archive/ubuntu/merge-nut-eoan-2.4.7-9/+packages

[Christian Ehrhardt  (paelzer)]

Hmm, this has a test so I also put it into https://bileto.ubuntu.com/#/ticket/3778

[Christian Ehrhardt  (paelzer)]

Bileto ticket https://bileto.ubuntu.com/excuses/3778/eoan.html shows that dep8 tests are successful

[Andreas Hasenack (ahasenack)]

I think you didn't push the tags, or for some reason I'm not seeing them. Since the delta is large, it would help a lot here.

[Christian Ehrhardt  (paelzer)]

Sure, I pushed again and in fact tey were not there :-/?
Sorry, but well now they are ...

 * [new tag] lp1814314/logical/2.7.4-8ubuntu2 -> lp1814314/logical/2.7.4-8ubuntu2
 * [new tag] lp1814314/new/debian -> lp1814314/new/debian
 * [new tag] lp1814314/old/debian -> lp1814314/old/debian
 * [new tag] lp1814314/old/ubuntu -> lp1814314/old/ubuntu
 * [new tag] lp1814314/reconstruct/2.7.4-8ubuntu2 -> lp1814314/reconstruct/2.7.4-8ubuntu2
 * [new tag] lp1814314/split/2.7.4-8ubuntu2 -> lp1814314/split/2.7.4-8ubuntu2

[Andreas Hasenack (ahasenack)]

ack to carried delta
ack to dropped delta
package installs, upgrades
ack to d/changelog

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

Tagged and uploaded

diff --git a/debian/changelog b/debian/changelog
index a5da2b7..074ace2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+nut (2.7.4-9ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable (LP: #1505288). Remaining changes:
+    - remove Build-Depends on libpowerman0-dev
+    - remove nut-powerman-pdu
+      + debian/control: remove nut-powerman-pdu package
+      + debian/nut-powerman-pdu.{install,manpages}: dropped for now
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most
+      + 5 seconds to shut down, instead of expecting it to be shut down
+        immediately after sending the killall.
+      + Additional indication on how to run tests for xenial+
+    - d/nut-server.postinst, d/nut-cgi.postinst: ensure nut is member of group
+      dialout (This existed, but was missed in the Changelog).
+    - debian/libnutclient0.symbols: Correct symbols file for ppc64el.
+    - Mark more symbols as optional (ppc64el, -O3).
+  * Dropped changes (in Debian now):
+    - debian/tests/control : Fix dep8 test failures:
+       + Drop python-unit from dep8 dependencies since the python-test
+         package has now been removed. The unittest module has shipped with
+         Python since 2.1.
+       + Add dep8 test dependency on python, since Python 2 is required and
+         is not necessarily installed by default any more.
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 05 Aug 2019 12:32:08 +0200
+
 nut (2.7.4-9) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -54,6 +81,37 @@ nut (2.7.4-9) unstable; urgency=medium
 
  -- Laurent Bigonville <[e-mail]>  Sun, 04 Aug 2019 10:34:17 +0200
 
+nut (2.7.4-8ubuntu2) eoan; urgency=medium
+
+  * Mark more symbols as optional (ppc64el, -O3).
+
+ -- Matthias Klose <[e-mail]>  Mon, 24 Jun 2019 12:31:07 +0200
+
+nut (2.7.4-8ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1774147). Remaining changes:
+    - remove Build-Depends on libpowerman0-dev
+    - remove nut-powerman-pdu
+      + debian/control: remove nut-powerman-pdu package
+      + debian/nut-powerman-pdu.{install,manpages}: dropped for now
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most
+      + 5 seconds to shut down, instead of expecting it to be shut down
+        immediately after sending the killall.
+      + Additional indication on how to run tests for xenial+
+    - debian/tests/control : Fix dep8 test failures:
+       + Drop python-unit from dep8 dependencies since the python-test
+         package has now been removed. The unittest module has shipped with
+         Python since 2.1.
+       + Add dep8 test dependency on python, since Python 2 is required and
+         is not necessarily installed by default any more.
+    - d/nut-server.postinst, d/nut-cgi.postinst: ensure nut is member of group
+      dialout (This existed, but was missed in the Changelog).
+    - debian/libnutclient0.symbols: Correct symbols file for ppc64el.
+
+ -- dann frazier <[e-mail]>  Fri, 03 Aug 2018 12:10:45 -0600
+
 nut (2.7.4-8) unstable; urgency=medium
 
   * debian/libnutclient0.symbols: Use arch-bits=32 and arch-bits=64 instead of
@@ -67,6 +125,38 @@ nut (2.7.4-8) unstable; urgency=medium
 
  -- Laurent Bigonville <[e-mail]>  Fri, 01 Jun 2018 17:55:25 +0200
 
+nut (2.7.4-7ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1774147). Remaining changes:
+    - remove Build-Depends on libpowerman0-dev
+    - remove nut-powerman-pdu
+      + debian/control: remove nut-powerman-pdu package
+      + debian/nut-powerman-pdu.{install,manpages}: dropped for now
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most
+      + 5 seconds to shut down, instead of expecting it to be shut down
+        immediately after sending the killall.
+      + Additional indication on how to run tests for xenial+
+    - debian/tests/control : Fix dep8 test failures:
+       + Drop python-unit from dep8 dependencies since the python-test
+         package has now been removed. The unittest module has shipped with
+         Python since 2.1.
+       + Add dep8 test dependency on python, since Python 2 is required and
+         is not necessarily installed by default any more.
+    - d/nut-server.postinst, d/nut-cgi.postinst: ensure nut is member of group
+      dialout (This existed, but was missed in the Changelog).
+    - debian/libnutclient0.symbols: Correct symbols file for ppc64el.
+      (Reduced as it is partially in Debian now)
+  * Dropped Changes
+    - fix cflags/ldflags mismatch (LP #1711092)
+      (no more needed)
+    - debian/nut-{cgi,server}.postinst: fix 'adduser' logic to be
+      unconditional, since adduser is guaranteed to be idempotent.
+      (was a non functional comment only change)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 30 May 2018 10:44:42 +0200
+
 nut (2.7.4-7) unstable; urgency=medium
 
   * debian/libnutclient0.symbols: Fix symbols file, this should fix FTBFS on
@@ -95,6 +185,51 @@ nut (2.7.4-6) unstable; urgency=medium
 
  -- Laurent Bigonville <[e-mail]>  Tue, 20 Feb 2018 13:08:57 +0100
 
+nut (2.7.4-5.1ubuntu2) bionic; urgency=medium
+
+  * Drop change which is no more needed, thereby fixes systemd integration
+    and the availability of /lib/systemd/system-shutdown/nutshutdown
+    (LP: #1603609)
+    - Disable systemd unit; it does not check nut.conf whether nut is
+      configured, and thus fails to start (and the package install).  The
+      init.d script works well enough for the time being.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 15 Nov 2017 16:47:10 +0100
+
+nut (2.7.4-5.1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - remove Build-Depends on libpowerman0-dev
+    - remove nut-powerman-pdu
+      + debian/nut-powerman-pdu.{install,manpages}: dropped for now
+    - debian/nut-{cgi,server}.postinst: fix 'adduser' logic to be
+      unconditional, since adduser is guaranteed to be idempotent.
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - Disable systemd unit; it does not check nut.conf whether nut is
+      configured, and thus fails to start (and the package install).  The
+      init.d script works well enough for the time being.
+    - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most
+      + 5 seconds to shut down, instead of expecting it to be shut down
+        immediately after sending the killall.
+      + Additional indication on how to run tests for xenial+
+    - debian/tests/control : Fix dep8 test failures:
+       + Drop python-unit from dep8 dependencies since the python-test
+         package has now been removed. The unittest module has shipped with
+         Python since 2.1.
+       + Add dep8 test dependency on python, since Python 2 is required and
+         is not necessarily installed by default any more.
+    - debian/libnutclient0.symbols: Correct symbols file for ppc64el.
+    - fix cflags/ldflags mismatch (LP #1711092)
+  * Drop:
+    - udevd is called systemd-udevd (LP #1540008)
+      [ Fixed in Debian 2.7.4-5.1 ]
+    - d/libnutclient0.symbols: fix symbols in regard to gcc-7
+      (LP #1711091)
+      [ Fixed in Debian 2.7.4-5.1 ]
+
+ -- Nishanth Aravamudan <[e-mail]>  Fri, 03 Nov 2017 16:34:18 -0700
+
 nut (2.7.4-5.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -114,6 +249,66 @@ nut (2.7.4-5.1) unstable; urgency=medium
 
  -- Michael Stapelberg <[e-mail]>  Wed, 23 Aug 2017 22:24:57 +0200
 
+nut (2.7.4-5ubuntu4) artful; urgency=medium
+
+  * d/p/fix-snmp-driver-compile-options.patch: fix cflags/ldflags
+    mismatch (LP: #1711092).
+  * d/libnutclient0.symbols: fix symbols in regard to gcc-7 (LP: #1711091).
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 16 Aug 2017 12:44:26 +0200
+
+nut (2.7.4-5ubuntu3) artful; urgency=medium
+
+  * debian/nut-server.postinst: The udevd process is called systemd-udevd
+    for quite sometimes already, properly detect whether it's running or not,
+    this should fix the devices permissions for USB UPS's (LP: #1540008).
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 09 Aug 2017 10:16:38 +0200
+
+nut (2.7.4-5ubuntu2) zesty; urgency=medium
+
+  * debian/libnutclient0.symbols: Correct symbols file for ppc64el.
+
+ -- Adam Conrad <[e-mail]>  Fri, 17 Feb 2017 05:38:03 -0700
+
+nut (2.7.4-5ubuntu1) zesty; urgency=medium
+
+  * Merge with Debian; remaining changes (LP: #1643618)
+    - debian/control:
+      + remove Build-Depends on libpowerman0-dev
+      + remove nut-powerman-pdu
+    - debian/nut-powerman-pdu.{install,manpages}: dropped for now
+    - debian/nut-{cgi,server}.postinst: fix 'adduser' logic to be
+      unconditional, since adduser is guaranteed to be idempotent.
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - Disable systemd unit; it does not check nut.conf whether nut is
+      configured, and thus fails to start (and the package install).  The
+      init.d script works well enough for the time being.
+    - debian/tests/test-nut.py:
+      + In the CVE_2012_2944 test, give nut at most 5 seconds to shut down,
+        instead of expecting it to be shut down immediately after sending the
+        killall.
+      + Additional indication on how to run tests for oneiric, precise to
+        vivid and wily+
+    - debian/tests/control : Fix dep8 test failures:
+      + Drop python-unit from dep8 dependencies since the python-test
+        package has now been removed. The unittest module has shipped with
+        Python since 2.1.
+      + Add dep8 test dependency on python, since Python 2 is required and
+        is not necessarily installed by default any more.
+  * Dropped changes:
+    - Patch libtool.m4 and configure to support ppc64le. (Fixed upstream)
+    - Remove unnecessary chmod 755 on files introduced by previous merge,
+      assumed to be an error
+    - debian/patches/0006-ups-conf-maxretry.patch: documentation tweaks
+      (unnecessary Ubuntu delta). This was formerly listed as "Move maxretry
+      setting above Examples section" but no longer did this at all.
+  * Replace outdated indictions on how to run tests (Oneric, Precise, Vivid,
+    Wily+) with proper indications for current version (Xenial+)
+
+ -- Louis Bouchard <[e-mail]>  Thu, 15 Dec 2016 15:30:05 +0100
+
 nut (2.7.4-5) unstable; urgency=medium
 
   * debian/control: Build-depends against asciidoc-dblatex, Recommends are not
@@ -180,6 +375,48 @@ nut (2.7.4-1) unstable; urgency=low
 
  -- Laurent Bigonville <[e-mail]>  Mon, 18 Jul 2016 10:58:49 +0200
 
+nut (2.7.2-4ubuntu1) xenial; urgency=low
+
+  * Merge with Debian; remaining changes (LP: #1522346) :
+    - debian/control:
+      + remove Build-Depends on libpowerman0-dev
+      + remove nut-powerman-pdu
+    - debian/nut-powerman-pdu.{install,manpages}: dropped for now
+    - debian/{nut-cgi,nut-server}.postinst: add nut to the group
+      unconditonally, for compatibility with UPSes connected by serial port.
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - Patch libtool.m4 and configure to support ppc64le.
+    - Disable systemd unit; it does not check nut.conf whether nut is
+      configured, and thus fails to start (and the package install).  The
+      init.d script works well enough for the time being.
+    - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most
+      + 5 seconds to shut down, instead of expecting it to be shut down
+        immediately after sending the killall.
+      + Additional indication on how to run tests for oneiric, precise to 
+        vivid and wily+
+    - debian/patches/0006-ups-conf-reorder.patch: Move maxretry setting
+      above Examples section.
+    - debian/tests/control : Fix dep8 test failures:
+       + Drop python-unit from dep8 dependencies since the python-test
+         package has now been removed. The unittest module has shipped with
+         Python since 2.1.
+       + Add dep8 test dependency on python, since Python 2 is required and
+         is not necessarily installed by default any more.
+
+   * Dropped changes:
+     - Fix linking libupsclient : Superseded upstream
+     - debian/patches/backport-fix-lp753661.patch: extraneous end-of-line now
+       fixed differently upstream.
+     - debian/rules: Use udev version for Ubuntu; delta no longer needed as
+       both versions are earlier than the earliest supported udev in Ubuntu.
+
+  [ Steve Langasek ]
+  * debian/nut-{cgi,server}.postinst: fix 'adduser' logic to be
+    unconditional, since adduser is guaranteed to be idempotent.
+
+ -- Louis Bouchard <[e-mail]>  Thu, 03 Dec 2015 12:37:13 +0100
+
 nut (2.7.2-4) unstable; urgency=medium
 
   * Really fix package initial installation when PID1 is systemd (Closes:
@@ -241,6 +478,59 @@ nut (2.7.2-1) unstable; urgency=low
 
  -- Laurent Bigonville <[e-mail]>  Tue, 22 Apr 2014 22:46:12 +0200
 
+nut (2.7.1-1ubuntu5) wily; urgency=medium
+
+  * Fix dep8 test failures:
+    - Drop python-unit from dep8 dependencies since the python-test
+      package has now been removed. The unittest module has shipped with
+      Python since 2.1.
+    - Add dep8 test dependency on python, since Python 2 is required and
+      is not necessarily installed by default any more.
+
+ -- Robie Basak <[e-mail]>  Mon, 12 Oct 2015 10:08:30 +0000
+
+nut (2.7.1-1ubuntu4) vivid; urgency=low
+
+  * debian/patches/0006-ups-conf-reorder.patch: Move maxretry setting
+    above Examples section, closer to the "outside of a driver definition"
+    comment. (LP: #1405822)
+
+ -- Tuomas Heino <[e-mail]>  Fri, 26 Dec 2014 19:36:45 +0200
+
+nut (2.7.1-1ubuntu3) utopic; urgency=medium
+
+  * debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most 5
+    seconds to shut down, instead of expecting it to be shut down immediately
+    after sending the killall. (LP: #1291378)
+
+ -- Martin Pitt <[e-mail]>  Mon, 07 Jul 2014 07:56:43 +0200
+
+nut (2.7.1-1ubuntu2) utopic; urgency=medium
+
+  * Disable systemd unit; it does not check nut.conf whether nut is
+    configured, and thus fails to start (and the package install). The init.d
+    script works well enough for the time being. (LP: #1313231)
+
+ -- Martin Pitt <[e-mail]>  Mon, 12 May 2014 13:22:12 +0200
+
+nut (2.7.1-1ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - debian/control:
+      + remove Build-Depends on libpowerman0-dev
+      + remove nut-powerman-pdu
+    - debian/nut-powerman-pdu.{install,manpages}: dropped for now
+    - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut
+      groups unconditonally to handle the upgrade from hardy release.
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - debian/rules: Use udev version for Ubuntu
+    - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled
+  * Fix linking libupsclient.
+  * Patch libtool.m4 and configure to support ppc64le.
+
+ -- Matthias Klose <[e-mail]>  Mon, 30 Dec 2013 10:37:07 +0100
+
 nut (2.7.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #730183)
@@ -348,6 +638,46 @@ nut (2.6.5-1) experimental; urgency=low
 
  -- Laurent Bigonville <[e-mail]>  Mon, 13 Aug 2012 01:59:18 +0200
 
+nut (2.6.4-2.3ubuntu2) saucy; urgency=low
+
+  * Rebuild for libgd3 and libsnmp30.
+
+ -- Colin Watson <[e-mail]>  Mon, 20 May 2013 00:33:46 +0100
+
+nut (2.6.4-2.3ubuntu1) saucy-proposed; urgency=low
+
+  * Merge from Debian.  Remaining changes:
+    - debian/control:
+      + remove Build-Depends on libpowerman0-dev
+      + remove nut-powerman-pdu
+    - debian/nut-powerman-pdu.{install,manpages}: dropped for now
+    - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut
+      groups unconditonally to handle the upgrade from hardy release.
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - debian/rules: Use udev version for Ubuntu
+    - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 09 May 2013 12:38:31 -0500
+
+nut (2.6.4-2.2ubuntu1) raring-proposed; urgency=low
+
+  * Merge from Debian.  Remaining changes:
+    - debian/control:
+      + remove Build-Depends on libpowerman0-dev
+      + remove nut-powerman-pdu
+    - debian/nut-powerman-pdu.{install,manpages}: dropped for now
+    - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut
+      groups unconditonally to handle the upgrade from hardy release.
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - debian/rules: Use udev version for Ubuntu
+    - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled
+  * Dropped the following patches, no longer required:
+    - debian/patches/CVE-2012-2944.patch (included upstream)
+
+ -- Jamie Strandboge <[e-mail]>  Wed, 23 Jan 2013 07:32:58 -0600
+
 nut (2.6.4-2) unstable; urgency=low
 
   * debian/rules: Stop the nut-client before nut-server on systems using static
@@ -411,6 +741,30 @@ nut (2.6.3-2) unstable; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Tue, 24 Jan 2012 13:14:59 +0100
 
+nut (2.6.3-1ubuntu2) quantal; urgency=low
+
+  * SECURITY UPDATE: remote denial of service
+   - debian/CVE-2012-2944.patch: limit the set of parsed characters to ' '
+     through '~'
+   - CVE-2012-2944
+
+ -- Jamie Strandboge <[e-mail]>  Wed, 30 May 2012 13:36:58 -0500
+
+nut (2.6.3-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing.  Remaining changes:
+    - debian/control: Drop Build-Depends on libpowerman0-dev (currently in 
+      universe)
+    - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut 
+      groups unconditonally to handle the upgrade from hardy release.
+    - debian/nut-powerman-pdu.{install,manpages}: dropped for now.
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, 
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - debian/rules: Use udev version for Ubuntu.
+    - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled.
+
+ -- Chuck Short <[e-mail]>  Mon, 06 Feb 2012 09:23:24 -0500
+
 nut (2.6.3-1) unstable; urgency=low
 
   * New upstream release (Closes: #635186, #598741, #633756, #638221)
@@ -425,6 +779,21 @@ nut (2.6.3-1) unstable; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Tue, 24 Jan 2012 13:14:59 +0100
 
+nut (2.6.2-1ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/control: Drop Build-Depends on libpowerman0-dev (currently in 
+      universe)
+    - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut 
+      groups unconditonally to handle the upgrade from hardy release.
+    - debian/nut-powerman-pdu.{install,manpages}: dropped for now.
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, 
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - debian/rules: Use udev version for Ubuntu.
+    - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled.
+
+ -- Chuck Short <[e-mail]>  Tue, 04 Oct 2011 05:45:12 +0000
+
 nut (2.6.2-1) unstable; urgency=low
 
   * New upstream release (Closes: #594989)
@@ -444,6 +813,29 @@ nut (2.6.2-1) unstable; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Thu, 29 Sep 2011 18:39:16 +0200
 
+nut (2.6.1-2ubuntu2) oneiric; urgency=low
+
+  * Fix FTBFS for Ubuntu (LP: #815760):
+    - debian/control: Build-Depends-Indep on docbook-xsl for offline 
+      document generation.
+
+ -- James Page <[e-mail]>  Mon, 25 Jul 2011 12:02:48 +0100
+
+nut (2.6.1-2ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable (LP: #811976). Remaining changes:
+    - debian/control: Drop Build-Depends on libpowerman0-dev (currently in 
+      universe)
+    - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut 
+      groups unconditonally to handle the upgrade from hardy release.
+    - debian/nut-powerman-pdu.{install,manpages}: dropped for now.
+    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, 
+      debian/rules: Install apport hooks for all top-level nut packages.
+    - debian/rules: Use udev version for Ubuntu.
+    - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled.
+
+ -- James Page <[e-mail]>  Fri, 22 Jul 2011 14:12:46 +0100
+
 nut (2.6.1-2) unstable; urgency=low
 
   * debian/nut.README.Debian: Adjust udev rules naming for permissions override
@@ -467,6 +859,21 @@ nut (2.6.1-2) unstable; urgency=low
 
  -- Laurent Bigonville <[e-mail]>  Sun, 17 Jul 2011 19:03:18 +0200
 
+nut (2.6.1-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/control:
+      + Drop Build-Depends on libpowerman0-dev (currently in universe)
+    - debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups
+      unconditonally to handle the upgrade from hardy release.
+    - debian/nut-powerman-pdu.{install,manpages}: dropped for now.
+    - debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook.
+    - debian/rules: Use udev version for Ubuntu.
+  * debian/patches/backport-fix-lp753661.patch: Refreshed.
+  * Drop changes due to .pc being not clean.
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 06 Jun 2011 13:38:09 -0400
+
 nut (2.6.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #595953, #614842, #595773)
@@ -482,6 +889,28 @@ nut (2.6.1-1) unstable; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Wed, 01 Jun 2011 22:34:28 +0200
 
+nut (2.6.0-2ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable (LP: #789323).  Remaining changes:
+    + debian/control:
+      - Update maintainer as per spec.
+      - Add Breaks on nut-hal-drivers to ensure we have correct udev version.
+      - Drop libpowerman0-dev from the Build-Depends (currently in universe)
+    + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups
+      unconditonally to handle the upgrade from hardy release.
+    + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped for now.
+    + debian/nul-hal-drivers.{docs,install,postinst,preinst}: Dropped since hal is in universe now
+    + debian/nut.links: must create the init script link, used if the upse needs to be powered down
+      (LP: #357583)
+    + debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook.
+    + debian/patches/backport-fix-lp753661.patch
+    + Dropped:
+      - debian/patches/fix_pc_file.patch: replaced by debian's 0002-fix_libupsclient_pc.patch
+  * debian/patches/fix_pc_file.patch: add DEP3 patch header
+  * debian/patches/debian-changes-2.6.0-1: remove that accidental file
+
+ -- Scott Moser <[e-mail]>  Fri, 27 May 2011 16:16:10 -0400
+
 nut (2.6.0-2) unstable; urgency=low
 
   * debian/nut-snmp.docs: Distribute snmp.txt doc file (Closes: #548295)
@@ -498,6 +927,45 @@ nut (2.6.0-2) unstable; urgency=low
 
  -- Laurent Bigonville <[e-mail]>  Sun, 08 May 2011 21:23:46 +0200
 
+nut (2.6.0-1ubuntu3) natty; urgency=low
+
+  * debian/patches/backport-fix-lp753661.patch: Backport fix 
+    to trim extraneous end-of-line, in buggy HID string tables, 
+    which results in upsc breaking the communication pipe.
+    (LP: #753661)
+
+ -- Chuck Short <[e-mail]>  Wed, 20 Apr 2011 10:47:05 -0400
+
+nut (2.6.0-1ubuntu2) natty; urgency=low
+
+  * fix_pc_file.patch: fix .pc source files by using LIBSSL_LIBS instead of
+    LIBSSL_LDFLAGS to avoid a FTBFS in packages that uses libupsclient.pc
+    (LP: #743484)
+
+ -- Fabrice Coutadeur <[e-mail]>  Sun, 27 Mar 2011 08:21:01 +0200
+
+nut (2.6.0-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    + debian/control:
+      - Update maintainer as per spec.
+      - Add Breaks on nut-hal-drivers to ensure we have correct udev version.
+      - Drop libpowerman0-dev from the Build-Depends (currently in universe)
+    + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups
+      unconditonally to hanle the upgrade from hardy release.
+    + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped for now.
+    + debian/nul-hal-drivers.{docs,install,postinst,preinst}: Dropped since hal is in universe now
+    + debian/nut.links: must create the init script link, used if the upse needs to be powered down
+      (LP: #357583)
+    + debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook.
+    + Dropped:
+      - debian/patches/0002-fix_udev_action.patch: Accepted upstream.
+      - debian/patches/0004-netvision-improvements-lp-600950: no longer needed.
+      - debian/patches/0005-fix-nut-m4.patch: no longer needed.
+      - debian/patches/9999-autoconf.patch: no longer needed.
+
+ -- Chuck Short <[e-mail]>  Wed, 23 Feb 2011 09:01:35 -0500
+
 nut (2.6.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #575176, #588648, #609597, #687985)
@@ -521,6 +989,59 @@ nut (2.4.3-3) UNRELEASED; urgency=low
 
  -- Laurent Bigonville <[e-mail]>  Tue, 11 Jan 2011 22:24:07 +0100
 
+nut (2.4.3-2ubuntu4) natty; urgency=low
+
+  * debian/control, debian/rules, 
+    debian/nut-hal-drivers.{docs,install,postinst,preinst}: Drop
+    nut-hal-drivers since Nut doesnt go into universe.
+
+ -- Chuck Short <[e-mail]>  Thu, 27 Jan 2011 11:18:14 -0500
+
+nut (2.4.3-2ubuntu3) natty; urgency=low
+
+  * Split patches/debian-changes-2.4.3-2ubuntu1 into
+    patches/0005-fix-nut-m4.patch and patches/9999-autoconf.patch
+  * Readd lost debian/patches0004-netvision-improvements-lp-600950.patch patch
+    (LP: #707050)
+  * debian/patches/0002-fix_udev_action.patch:
+    Change BUS to SUBSYSTEMS, since the former is deprecated. (LP: #692171)
+  * debian/nut.postinst: Uncomment missing call to adduser
+
+ -- Laurent Bigonville <[e-mail]>  Thu, 27 Jan 2011 09:18:20 -0500
+
+nut (2.4.3-2ubuntu2) natty; urgency=low
+
+  * debian/control: Drop hal build dependency, we don't need the daemon to
+    build the package. Add a hal dependency to nut-hal-drivers, which is the
+    only thing that actually needs it.
+
+ -- Martin Pitt <[e-mail]>  Thu, 27 Jan 2011 10:00:42 +0100
+
+nut (2.4.3-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    + debian/control:
+      - Update maintainer as per spec.
+      - Add Breaks on nut-hal-drivers to ensure we have correct udev version.
+      - Drop libpowerman0-dev from the Build-Depends (currently in universe)
+    + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups
+      unconditonally to hanle the upgrade from hardy release.
+    + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped for now.
+    + debian/nut.links: must create the init script link, used if the upse needs to be powered down
+      (LP: #357583)
+    + debian/nut.postinst: Update udevadm trigger.
+      "libusb_get_report: error sending control message: 
+       Operation not permitted" error on some UPS devices. (LP: #572262)
+    + debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook.
+    + debian/patches/netvision-improvements-lp-600950.patch: Add improvements
+      for netvision UPSes
+    + Fix FTBFS with ld --as-needed.
+    + Dropped:
+      - debian/patches/03_udev_rules_change.dpatch: Use debian's instead.
+      - debian/patches/04_nut_small-buffers.dpatch: Use debian's instead.
+
+ -- Chuck Short <[e-mail]>  Mon, 10 Jan 2011 21:21:02 +0000
+
 nut (2.4.3-2) unstable; urgency=medium
 
   * debian/control:
@@ -562,6 +1083,64 @@ nut (2.4.3-1.1) unstable; urgency=low
 
  -- Tim Retout <[e-mail]>  Fri, 15 Oct 2010 19:31:39 +0100
 
+nut (2.4.3-1ubuntu6) natty; urgency=low
+
+  * Fix FTBFS with ld --as-needed.
+
+ -- Matthias Klose <[e-mail]>  Mon, 10 Jan 2011 19:14:35 +0100
+
+nut (2.4.3-1ubuntu5) maverick; urgency=low
+
+  * debian/patches/netvision-improvements-lp-600950.patch: Add improvements for netvision UPSes 
+    (LP: #600950) 
+
+ -- Chuck Short <[e-mail]>  Fri, 13 Aug 2010 13:28:10 -0500
+
+nut (2.4.3-1ubuntu4) maverick; urgency=low
+
+  * debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook. 
+
+ -- Chuck Short <[e-mail]>  Thu, 08 Jul 2010 11:06:30 -0400
+
+nut (2.4.3-1ubuntu3.1) lucid-proposed; urgency=low
+
+  * debian/patches/04_nut-small-buffers.dpatch: Fix "libusb_get_report: error sending control message: 
+    Operation not permitted" error on some UPS devices. (LP: #572262)
+
+ -- Chuck Short <[e-mail]>  Mon, 03 May 2010 13:38:37 -0400
+
+nut (2.4.3-1ubuntu3) lucid; urgency=low
+
+  * debian/nut.postinst: Revert dropping of --action=change. "add" events must
+    not ever be triggered automatically.
+  * Add 03_udev_rules_change.dpatch: Run udev rules on change events, too.
+
+ -- Martin Pitt <[e-mail]>  Tue, 23 Mar 2010 08:00:53 +0100
+
+nut (2.4.3-1ubuntu2) lucid; urgency=low
+
+  * debian/control: grr...fix ftbfs. 
+
+ -- Chuck Short <[e-mail]>  Mon, 22 Mar 2010 11:48:02 -0400
+
+nut (2.4.3-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes (LP: #535152):
+    + debian/control:
+      - Update maintainer as per spec.
+      - Add Breaks on nut-hal-drivers to ensure we have correct udev version.
+      - Drop libpowerman0-dev from the Build-Depends (currently in universe)
+    + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups
+      unconditonally to hanle the upgrade from hardy release.
+    + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped for now.
+    + debian/nut.links: must create the init script link, used if the upse needs to be powered down
+      (LP: #357583)
+    + debian/nut.postinst: Update udevadm trigger.
+    + Dropped:
+      - debian/patches/02-fix-trust-pw4130m.dpatch: No longer needed.
+
+ -- Chuck Short <[e-mail]>  Tue, 16 Mar 2010 06:22:26 +0000
+
 nut (2.4.3-1) unstable; urgency=low
 
   * New upstream release (Closes: #544390, #528222, #539747, #526811,
@@ -606,6 +1185,57 @@ nut (2.4.3-1) unstable; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Wed, 24 Feb 2010 22:58:53 +0100
 
+nut (2.4.1-3.2ubuntu2) lucid; urgency=low
+
+  * debian/patches/02-fix-trust-pw4130m.dpatch: Fix issues with Trust
+    PW-4130M UPS. (LP: #447586) 
+
+ -- Chuck Short <[e-mail]>  Thu, 04 Feb 2010 13:26:33 -0500
+
+nut (2.4.1-3.2ubuntu1) lucid; urgency=low
+
+  * Resynchronize with debian, remaining changes:
+    + debian/control:
+      - Update maintainer field as per spec.
+      - Add Breaks on nut-hal-drivers to ensure we have correct udev version.
+      - Drop libpowerman0-dev from the Build-Depends (currently in universe).
+      - Remove the nut-powerman-pdu package for now.
+    + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups
+      unconditionally, to handle the upgrade from  hardy release.
+    + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped
+      for now.
+    + debian/nut.links: must create the init script link, used if the ups
+      needs to be powered down. (LP: #357583)
+    + debian/nut.init: Fix status_of_proc messages not to lie to the user (LP: #416182)
+
+ -- Chuck Short <[e-mail]>  Fri, 18 Dec 2009 09:00:45 -0500
+
+nut (2.4.1-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * nut.postinst: fix post-processing of nut.conf to avoid overriding
+    user settings (Closes: #531220)
+
+ -- Stefano Zacchiroli <[e-mail]>  Thu, 26 Nov 2009 09:30:45 +0100
+
+nut (2.4.1-3.1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:
+    + debian/control:
+      - Update maintainer field as per spec.
+      - Add Breaks on nut-hal-drivers to ensure we have correct udev version.
+      - Drop libpowerman0-dev from the Build-Depends (currently in universe)
+      - remove the nut-powerman-pdu package for now
+    + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups
+      unconditionally, to handle the upgrade from  hardy release.
+    + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped
+      for now
+    + debian/nut.links: must create the init script link, used if the ups
+      needs to be powered down (LP: #357583)
+    + debian/nut.init: Fix status_of_proc messages not to lie to the user (LP: #416182)
+
+ -- Chuck Short <[e-mail]>  Fri, 06 Nov 2009 01:34:44 +0000
+
 nut (2.4.1-3.2) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -626,6 +1256,30 @@ nut (2.4.1-3.1) unstable; urgency=low
 
  -- Christian Perrier <[e-mail]>  Tue, 20 Oct 2009 21:45:21 +0200
 
+nut (2.4.1-3ubuntu2) karmic; urgency=low
+
+  * debian/nut.init: Fix status_of_proc messages not to lie to 
+    the user. (LP: #416182)
+
+ -- Chuck Short <[e-mail]>  Wed, 23 Sep 2009 09:37:16 -0400
+
+nut (2.4.1-3ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/control:
+      - Update maintainer field as per spec.
+      - Add Breaks on nut-hal-drivers to ensure we have correct udev version.
+      - Drop libpowerman0-dev from the Build-Depends (currently in universe)
+      - remove the nut-powerman-pdu package for now
+    + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups
+      unconditionally, to handle the upgrade from  hardy release.
+    + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped
+      for now.
+    + debian/nut.links: must create the init script link, used if the ups
+      needs to be powered down (LP: #357583)
+  
+ -- Chuck Short <[e-mail]>  Thu, 28 May 2009 06:55:21 +0100
+
 nut (2.4.1-3) unstable; urgency=low
 
   * Debconf templates and debian/control reviewed by the debian-l10n-
@@ -644,6 +1298,52 @@ nut (2.4.1-3) unstable; urgency=low
 
  -- Christian Perrier <[e-mail]>  Sat, 21 Mar 2009 08:08:59 +0100
 
+nut (2.4.1-2ubuntu4) jaunty; urgency=low
+
+  * debian/nut.links: must create the init script link, used if the ups
+    needs to be powered down, LP: #357583
+
+ -- Dustin Kirkland <[e-mail]>  Thu, 09 Apr 2009 14:01:54 -0700
+
+nut (2.4.1-2ubuntu3) jaunty; urgency=low
+
+  Fixes for LP: #348454
+  * debian/control: add dpatch to Build-Depends,
+  * debian/patches/*: back for the below fix
+  * debian/patches/01_epdu_fix.dpatch: fix an upstream problem with Eaton PDUs
+    vs untested PDUs from Raritan
+  * debian/rules: reactivate again dpatch rules
+
+ -- Arnaud Quette <[e-mail]>  Wed, 25 Mar 2009 13:17:21 +0100
+
+nut (2.4.1-2ubuntu2) jaunty; urgency=low
+
+  [ Arnaud Quette <[e-mail]> ]
+  * Fix FTBFS
+  * debian/control:
+    - drop libpowerman0-dev from the Build-Depends (currently in universe)
+    - remove the nut-powerman-pdu package for now
+  * debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped
+    for now
+
+ -- Dustin Kirkland <[e-mail]>  Thu, 05 Mar 2009 14:34:06 -0600
+
+nut (2.4.1-2ubuntu1) jaunty; urgency=low
+
+  * Acknowledge closed bugs in upstream and Debian: LP: #1568, LP: #221737,
+    LP: #239025, LP: #278495, LP: #332030, LP: #332032
+  * Merge from debian unstable, remaining changes:
+    + debian/control:
+      - Update maintainer field as per spec.
+      - Add Breaks on nut-hal-drivers to ensure we have correct udev version.
+    + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups
+      unconditionally, to handle the upgrade from the hardy release (simply
+      uncommented).
+    + debian/rules: pre merge the changes for Ubuntu (udev path and version),
+      (simply uncommented).
+
+ -- Arnaud Quette <[e-mail]>  Fri, 27 Feb 2009 12:49:24 +0100
+
 nut (2.4.1-2) unstable; urgency=low
 
   * debian/control:
@@ -733,6 +1433,50 @@ nut (2.4.1-1) unstable; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Tue, 17 Feb 2009 14:15:24 +0100
 
+nut (2.2.2-10ubuntu3) jaunty; urgency=low
+
+  * debian/{nut-cgi,nut}.preinst: don't call adduser or addgroup *at
+    all*, these operations should be handled in the postinst.  Since 
+    this is the only custom action at all for nut-cgi, remove that
+    preinst completely.
+  * debian/{nut-cgi,nut}.postinst: add nut to the dialout
+    and nut groups unconditionally, to handle the upgrade from the hardy
+    release.  LP: #222761, LP: #287781.
+  * debian/control: nut needs Pre-Depends: debconf instead of Depends:,
+    because we use debconf unconditionally in the preinst.
+  * reinstate debian/nut-hal-drivers.postinst, which was lost in a
+    merge; and fix it up to use udevadm trigger --action=change, the
+    safe way to install udev rules.
+  * have nut-hal-drivers Depend: on udev so it can use the above.
+  * fix up nut postinst to also use 'udevadm trigger --action=change'
+
+ -- Steve Langasek <[e-mail]>  Fri, 30 Jan 2009 01:06:53 +0000
+
+nut (2.2.2-10ubuntu2) jaunty; urgency=low
+
+  * debian/rules: Install udev rules into /lib/udev/rules, bump versioned
+    dependency on udev.
+  * debian/nut.install, debian/nut-hal-drivers.install: Update path
+  * debian/patches/04-ubuntu-udev-rules-name.dpatch: Use a dash to
+    separate the name, not an underscore.
+  * debian/nut.preinst, debian/nut-hal-drivers.preinst: Remove previous
+    rules if unchanged, otherwise move to new filename.
+  * debian/control: Add Breaks to ensure we have correct udev version.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 13 Jan 2009 02:50:14 +0000
+
+nut (2.2.2-10ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/control:
+      - Update maintainer field as per spec.
+    + debian/nut{-cgi,-hal-drivers}.preinst:
+      - Add nut user to dialout group.
+    + debian/nut.install
+      - Install the configuration files in /etc/nut.
+
+ -- Chuck Short <[e-mail]>  Fri, 28 Nov 2008 23:01:47 +0000
+
 nut (2.2.2-10) unstable; urgency=low
 
   * Merge from Ubuntu (Morten Kjeldgaard):
@@ -773,6 +1517,18 @@ nut (2.2.2-9) unstable; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Wed, 15 Oct 2008 17:20:29 +0200
 
+nut (2.2.2-8ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/control:
+      - Update maintainer field as per spec.
+    + debian/nut{-cgi,-hal-drivers}.preinst:
+      - Add nut user to dialout group.
+    + debian/rules:
+      - Move the configuration files to /etc/nut from examples.
+
+ -- Chuck Short <[e-mail]>  Wed, 05 Nov 2008 02:59:59 -0400
+
 nut (2.2.2-8) unstable; urgency=high
 
   * debian/nut.links: restored since it's now handled by insserv (Closes:
@@ -796,6 +1552,18 @@ nut (2.2.2-7) unstable; urgency=high
 
  -- Arnaud Quette <[e-mail]>  Mon, 15 Sep 2008 17:18:28 +0200
 
+nut (2.2.2-6ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/control:
+      - Update maintainer field as per spec.
+    + debian/nut{-cgi,-hal-drivers}.preinst:
+      - Add nut user to dialout group.
+    + debian/rules:
+      - Move the configuration files to /etc/nut from examples.
+
+ -- Chuck Short <[e-mail]>  Mon, 14 Jul 2008 00:54:42 +0100
+
 nut (2.2.2-6) unstable; urgency=low
 
   * tag this bug as closed by the 2.2.2 release (Closes: #490048)
@@ -839,6 +1607,18 @@ nut (2.2.2-4) unstabl e; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Sat, 05 Jul 2008 22:56:35 +0200
 
+nut (2.2.2-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/control:
+      - Update maintainer field as per spec.
+    + debian/nut{-cgi,-hal-drivers}.preinst:
+      - Add nut to user to dialout group.
+    + debian/rules:
+      - Move the configuation files to /etc/nut from examples.
+
+ -- Chuck Short <[e-mail]>  Tue, 01 Jul 2008 11:57:01 +0100
+
 nut (2.2.2-3) unstable; urgency=low
 
   * debian/rules: reactivate dpatch support
@@ -868,6 +1648,20 @@ nut (2.2.2-2) unstable; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Fri, 20 Jun 2008 21:29:31 +0200
 
+nut (2.2.2-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/control:
+      - Update maintainer field as per spec.
+    + debian/nut{-cgi,-hal-drivers}.preinst:
+      - Add nut to user to dialout group.
+    + debian/rules:
+      - Move the configuration files to /etc/nut from examples
+    + debian/patches/01_fix_megatec_regression.dpatch.
+      - Dropped no longer since its fixed in this version.
+
+ -- Chuck Short <[e-mail]>  Wed, 18 Jun 2008 11:30:10 -0500
+
 nut (2.2.2-1) unstable; urgency=low
 
   * New upstream release (Closes: #471828, #462468, #334105, #463150)
@@ -895,6 +1689,59 @@ nut (2.2.2-1) unstable; urgency=low
 
  -- Arnaud Quette <[e-mail]>  Wed, 04 Jun 2008 13:35:41 +0200
 
+nut (2.2.1-2.1ubuntu7) hardy; urgency=low
+
+  * debian/patches/01_fix_megatec_regression.dpatch
+    - Fix more megatec_usb driver regressions. (LP: #215389) 
+
+ -- Chuck Short <[e-mail]>  Mon, 14 Apr 2008 14:25:48 -0400
+
+nut (2.2.1-2.1ubuntu6) hardy; urgency=low
+
+  * debian/patches/01_fix_megatec_regression.dpatch
+   - Updated patch thanks to Alexander I. Gordeev <lasaine -at-
+     lvk.cs.msu.su>. (LP: #209001)
+
+ -- Chuck Short <[e-mail]>  Thu, 10 Apr 2008 09:33:53 -0400
+
+nut (2.2.1-2.1ubuntu5) hardy; urgency=low
+
+  * debian/patches/01_fix_megatec_regression.dpatch
+    - Readded support for various USB devices. (LP: #209001) 
+
+ -- Chuck Short <[e-mail]>  Mon, 07 Apr 2008 08:46:46 -0400
+
+nut (2.2.1-2.1ubuntu4) hardy; urgency=low
+
+  * Use udevtrigger to restart udev. (LP: #204612)
+
+ -- Chuck Short <[e-mail]>  Wed, 26 Mar 2008 13:30:24 -0400
+
+nut (2.2.1-2.1ubuntu3) hardy; urgency=low
+
+  * Fix FTBFS. 
+
+ -- Chuck Short <[e-mail]>  Sat, 22 Mar 2008 10:00:06 -0400
+
+nut (2.2.1-2.1ubuntu2) hardy; urgency=low
+
+  * Fix udev rules. (LP: #204612).
+  * Cleaned up debian/control.
+
+ -- Chuck Short <[e-mail]>  Fri, 21 Mar 2008 20:30:44 -0400
+
+nut (2.2.1-2.1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable (LP: #203366), remaining Ubuntu changes:
+    + debian/rules:
+      - Move the configuration files to /etc/nut from examples.
+    + debian/nut{,-cgi,-hal-drivers}.preinst
+      - Add nut user to dialout group.
+    + debian/control:
+      - Updated Maintainer field as per spec.
+
+ -- Luca Falavigna <[e-mail]>  Mon, 17 Mar 2008 23:59:38 +0100
+
 nut (2.2.1-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -902,6 +1749,14 @@ nut (2.2.1-2.1) unstable; urgency=low
 
  -- Joe Nahmias <[e-mail]>  Sun, 09 Mar 2008 13:12:12 -0400
 
+nut (2.2.1-2ubuntu1) hardy; urgency=low
+
+  * Move the configuration files to /etc/nut from examples. (LP: #85598)
+  * Add nut user to dialout group. (LP: #157079)
+  * Updated Maintainer according to specs.
+
+ -- Chuck Short <[e-mail]>  Thu, 28 Feb 2008 10:10:24 -0500
+
 nut (2.2.1-2) unstable; urgency=low
 
   * debian/po/de.po: update the German po-debconf translation (Closes:
@@ -1866,6 +2721,3 @@ nut (0.43.2-1) unstable; urgency=low
 
  -- Luca Filipozzi <[e-mail]>  Wed,  3 May 2000 20:50:30 -0700
 
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/control b/debian/control
index f6b838d..76c6294 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: nut
 Section: admin
 Priority: optional
-Maintainer: Arnaud Quette <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Arnaud Quette <[e-mail]>
 Uploaders: Laurent Bigonville <[e-mail]>
 Build-Depends: debhelper (>= 12),
                dh-python,
@@ -11,7 +12,6 @@ Build-Depends: debhelper (>= 12),
                libltdl-dev,
                libneon27-gnutls-dev | libneon27-dev,
                libnss3-dev,
-               libpowerman0-dev (>= 2.3.3),
                libsnmp-dev | libsnmp9-dev,
                libusb-dev (>= 0.1.8),
                libwrap0-dev (>= 7.6),
@@ -137,22 +137,6 @@ Description: network UPS tools - XML/HTTP driver
  Eaton or MGE that use an XML/HTTP-based Network Management Card or
  Proxy.
 
-Package: nut-powerman-pdu
-Architecture: any
-Depends: nut (>= 2.4.0),
-         powerman (>= 2.3.3),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: network UPS tools - PowerMan PDU driver
- 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 powerman-pdu, which allows NUT clients to communicate
- with the PowerMan daemon to support PDUs.
-
 Package: nut-doc
 Architecture: all
 Section: doc
diff --git a/debian/libnutclient0.symbols b/debian/libnutclient0.symbols
index 6501d69..073133a 100644
--- a/debian/libnutclient0.symbols
+++ b/debian/libnutclient0.symbols
@@ -1,6 +1,7 @@
 # SymbolsHelper-Confirmed: 2.7.4-9~ amd64 armel armhf hppa i386 ia64 m68k mips mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64
 libnutclient.so.0 libnutclient0 #MINVER#
 * Build-Depends-Package: libnutclient-dev
+ (optional=templinst|arch=ppc64el)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_@Base 2.7.4
  (c++)"nut::Client::Client()@Base" 2.7.3
  (c++)"nut::Client::getDevice(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3
  (c++)"nut::Client::getDeviceVariableValues(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3
@@ -159,12 +160,12 @@ libnutclient.so.0 libnutclient0 #MINVER#
  (c++)"std::_Rb_tree<nut::Device, nut::Device, std::_Identity<nut::Device>, std::less<nut::Device>, std::allocator<nut::Device> >::_M_erase(std::_Rb_tree_node<nut::Device>*)@Base" 2.7.3
  (c++)"std::_Rb_tree<nut::Variable, nut::Variable, std::_Identity<nut::Variable>, std::less<nut::Variable>, std::allocator<nut::Variable> >::_M_erase(std::_Rb_tree_node<nut::Variable>*)@Base" 2.7.3
  (c++)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::_Identity<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_erase(std::_Rb_tree_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >*)@Base" 2.7.3
- (c++)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::_Identity<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::find(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3
+ (c++|arch=!ppc64el)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::_Identity<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::find(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3
  (c++)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > > >::_M_erase(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > >*)@Base" 2.7.3
  (c++|optional=templinst|arch=amd64 arm64 hppa ia64 m68k mips64el ppc64el riscv64 sh4 sparc64 x32)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > > >::_M_get_insert_hint_unique_pos(std::_Rb_tree_const_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.4
  (c++)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > > >::_M_get_insert_unique_pos(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3
  (c++|optional=templinst)"std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > > std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > > >::_M_emplace_hint_unique<std::piecewise_construct_t const&, std::tuple<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>, std::tuple<> >(std::_Rb_tree_const_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > >, std::piecewise_construct_t const&, std::tuple<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>&&, std::tuple<>&&)@Base" 2.7.4-9~
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > std::operator+<char, std::char_traits<char>, std::allocator<char> >(char const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3
+ (c++|optional=templinst)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > std::operator+<char, std::char_traits<char>, std::allocator<char> >(char const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3
  (c++)"std::pair<std::_Rb_tree_iterator<nut::Variable>, bool> std::_Rb_tree<nut::Variable, nut::Variable, std::_Identity<nut::Variable>, std::less<nut::Variable>, std::allocator<nut::Variable> >::_M_insert_unique<nut::Variable>(nut::Variable&&)@Base" 2.7.3
  (c++)"std::pair<std::_Rb_tree_iterator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, bool> std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::_Identity<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_insert_unique<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3
  (c++)"std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::operator=(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 2.7.3
diff --git a/debian/nut-cgi.postinst b/debian/nut-cgi.postinst
index bdb72a0..5d89f2b 100644
--- a/debian/nut-cgi.postinst
+++ b/debian/nut-cgi.postinst
@@ -17,6 +17,7 @@ case "$1" in
 #    if ! groups nut | grep -qw dialout; then
 #    adduser nut dialout
 #    fi
+    adduser --quiet nut dialout
 
     # Ensure /etc/nut is readable/crossable for others
     if [ -d /etc/nut/ ] ; then
diff --git a/debian/nut-client.install b/debian/nut-client.install
index 318c1e8..f11a362 100644
--- a/debian/nut-client.install
+++ b/debian/nut-client.install
@@ -18,6 +18,7 @@ debian/tmp/usr/share/augeas/lenses/nutupsmonconf.aug
 debian/tmp/usr/share/augeas/lenses/nutupsschedconf.aug
 debian/tmp/usr/share/augeas/lenses/nutupssetconf.aug
 debian/tmp/usr/share/augeas/lenses/tests/test_nut.aug
+debian/tmp/usr/share/apport/package-hooks/source_nut-client.py
 debian/tmp/usr/share/bash-completion/completions/nut
 debian/tmp/lib/systemd/system/nut-monitor.service
 debian/tmp/lib/systemd/system/nut-client.service
diff --git a/debian/nut-powerman-pdu.install b/debian/nut-powerman-pdu.install
deleted file mode 100644
index f0acaa4..0000000
--- a/debian/nut-powerman-pdu.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/lib/nut/powerman-pdu
diff --git a/debian/nut-powerman-pdu.manpages b/debian/nut-powerman-pdu.manpages
deleted file mode 100644
index 43bbc81..0000000
--- a/debian/nut-powerman-pdu.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man8/powerman-pdu.8
diff --git a/debian/nut-server.install b/debian/nut-server.install
index 25864f2..c1acec4 100644
--- a/debian/nut-server.install
+++ b/debian/nut-server.install
@@ -1,4 +1,5 @@
 debian/tmp/*/udev/rules.d/62-nut-usbups.rules
+debian/tmp/usr/share/apport/package-hooks/source_nut-server.py
 debian/tmp/etc/avahi/services/nut.service
 debian/tmp/etc/nut/ups.conf
 debian/tmp/etc/nut/upsd.conf
diff --git a/debian/nut-server.postinst b/debian/nut-server.postinst
index 41b1d08..81c4d09 100644
--- a/debian/nut-server.postinst
+++ b/debian/nut-server.postinst
@@ -30,6 +30,7 @@ case "$1" in
 #    if ! groups nut | grep -qw dialout; then
 #	adduser nut dialout
 #    fi
+    adduser --quiet nut dialout
 
     # make sure that conffiles are secured and have the correct ownerships
     # on first install
diff --git a/debian/nut.install b/debian/nut.install
new file mode 100644
index 0000000..281f143
--- /dev/null
+++ b/debian/nut.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/apport/package-hooks/source_nut.py
diff --git a/debian/rules b/debian/rules
index 07ba4e3..f8482c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,6 +93,10 @@ override_dh_auto_install-arch:
 	ln -s nut-monitor.service $(CURDIR)/debian/tmp/lib/systemd/system/nut-client.service
 	ln -s /dev/null $(CURDIR)/debian/tmp/lib/systemd/system/ups-monitor.service
 
+	# install apport hooks
+	install -D -m 644 debian/source_nut.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_nut-server.py
+	install -D -m 644 debian/source_nut.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_nut-client.py
+
 override_dh_auto_install-indep:
 	#install documentation
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/nut-doc/pdf
@@ -105,6 +109,9 @@ override_dh_auto_install-indep:
 		cp -a $${f} $(CURDIR)/debian/tmp/usr/share/doc/nut-doc/html/$${nf}/; \
 	done
 
+	# install apport hooks
+	install -D -m 644 debian/source_nut.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_nut.py
+
 override_dh_installinit:
 	dh_installinit --error-handler=handle_start_failure
 
diff --git a/debian/source_nut.py b/debian/source_nut.py
new file mode 100644
index 0000000..1dd5fd5
--- /dev/null
+++ b/debian/source_nut.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+
+'''nut Apport interface
+
+Copyright (C) 2010 Canonical Ltd.
+Author: Chuck Short <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+from apport.hookutils import *
+
+
+def add_info(report,ui):
+
+	response = ui.yesno("The contents of your nut configuration files may help developers diagnose your bug more quickly, however, it may contain sensitive information. Do you want to include it in your bug report?")
+
+	if response == None: #use cancelled
+		raise StropIteration
+
+	elif response == True:
+		attach_file(report, '/etc/nut/ups.conf', 'UpsConf')
+
+	elif response == False:
+		ui.information("The contents of your nut configuration files will NOT be included in the bug report")
+
+	report['USBDevices'] = command_output(['lsusb'])
+	packages = ['nut', 'nut-client','nut-server', 'nut-cgi', 'nut-snmp', 'nut-hal-drivers', 'nut-xml', 'libupsclient1',
+		'libupsclient1-dev', 'python-nut', 'nut-monitor']
+	versions = ''
+	for package in packages:
+		try:
+			version = packaging.get_version(package)
+		except ValueError:
+			version = 'N/A'
+		if version is None:
+			version = 'N/A'
+		versions += '%s %s\n' %(package, version)
+	report['NutInstalledVersions'] = versions
+	report['KernelVersion'] = command_output(['uname', '-a'])
diff --git a/debian/tests/test-nut.py b/debian/tests/test-nut.py
old mode 100644
new mode 100755
index 068caeb..d010605
--- a/debian/tests/test-nut.py
+++ b/debian/tests/test-nut.py
@@ -22,13 +22,10 @@
   DO NOT RUN ON A PRODUCTION SERVER.
   *** IMPORTANT ***
 
-  How to run (up to natty):
-    $ sudo apt-get -y install python-unit nut
+  How to run (xenial+):
+    $ sudo apt-get -y install nut-server nut-client python
     $ sudo ./test-nut.py -v
 
-  How to run (oneiric+):
-    $ sudo apt-get -y install python-unit nut-server nut-client
-    $ sudo ./test-nut.py -v
 
   NOTE:
     - NUT architecture (helps understanding):
@@ -59,7 +56,7 @@
       http://www.networkupstools.org/nut-qa.html
 '''
 
-# QRT-Packages: python-unit netcat-openbsd
+# QRT-Packages: netcat-openbsd python
 # QRT-Alternates: nut-server nut
 # QRT-Alternates: nut-client nut
 # nut-dev is needed for the dummy driver on hardy
@@ -393,6 +390,10 @@ dd if=/dev/urandom count=64 | nc -q 1 127.0.0.1 3493
         # still around, it is hung
         testlib.cmd(['killall', 'upsd'])
         pidfile = os.path.join(self.rundir, 'upsd.pid')
+        timeout = 50
+        while timeout > 0 and os.path.exists(pidfile):
+            time.sleep(0.1)
+            timeout -= 1
         self.assertFalse(os.path.exists(pidfile), "Found %s" % pidfile)
         self.assertFalse(testlib.check_pidfile('upsd', pidfile), 'upsd is hung')
         #subprocess.call(['bash'])