Manually merge Arnaud release

This commit is contained in:
Laurent Bigonville 2011-06-27 17:28:00 +02:00
parent 85d2d1a10a
commit 1106c880a1

21
debian/changelog vendored
View file

@ -1,8 +1,17 @@
nut (2.6.1-1) UNRELEASED; urgency=low nut (2.6.1-2) UNRELEASED; urgency=low
* New upstream release (Closes: #614842, #595773, #616104) * debian/nut.README.Debian: Adjust udev rules naming for permissions override
- Refresh debian/patches/0001-fix_spelling_and_typo.patch (Closes: #529664)
- Drop debian/patches/0002-fix_libupsclient_pc.patch, applied upstream * Re-add and refresh debian/patches/0001-fix_spelling_and_typo.patch:
Some typos and spelling errors remain.
-- Laurent Bigonville <bigon@debian.org> Mon, 27 Jun 2011 17:26:59 +0200
nut (2.6.1-1) unstable; urgency=low
* New upstream release (Closes: #595953, #614842, #595773)
* debian/patches/*.patch: removed since these are now fixed upstream
[Laurent Bigonville]
* Drop HAL package and build-dependencies (Closes: #613197) * Drop HAL package and build-dependencies (Closes: #613197)
* debian/control: * debian/control:
- Bump Standards-Version to 3.9.2 (no further changes) - Bump Standards-Version to 3.9.2 (no further changes)
@ -10,10 +19,8 @@ nut (2.6.1-1) UNRELEASED; urgency=low
- Drop non-existing build-dependencies - Drop non-existing build-dependencies
* debian/rules: * debian/rules:
- Correctly pass flags to configure - Correctly pass flags to configure
* debian/nut.README.Debian: Adjust udev rules naming for permissions override
(Closes: #529664)
-- Laurent Bigonville <bigon@debian.org> Fri, 03 Jun 2011 10:56:08 +0200 -- Arnaud Quette <aquette@debian.org> Wed, 01 Jun 2011 22:34:28 +0200
nut (2.6.0-2) unstable; urgency=low nut (2.6.0-2) unstable; urgency=low