From ba627733517475db3dbd3d2ee3d3b3e63980043b Mon Sep 17 00:00:00 2001 From: Arnaud Quette Date: Tue, 24 Jan 2012 11:28:33 +0100 Subject: [PATCH] Update patches list --- debian/changelog | 7 ++- .../patches/0001-fix_spelling_and_typo.patch | 46 ------------------- .../patches/0003-libupsclient-version.patch | 20 -------- debian/patches/series | 2 - 4 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 debian/patches/0001-fix_spelling_and_typo.patch delete mode 100644 debian/patches/0003-libupsclient-version.patch diff --git a/debian/changelog b/debian/changelog index 1e5b064..b25cefa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -nut (2.6.2-2) UNRELEASED; urgency=low +nut (2.6.3-1) unstable; urgency=low + * New upstream release * debian/nut-server.{install,manpages}: add richcomm_usb * debian/nut-server.install, debian/rules: install Avahi service file * debian/rules, nut-client.install: install Augeas lenses * debian/nut-server.README.Debian: clarify udev explanation (Closes: #529664) + * debian/patches/0001-fix_spelling_and_typo.patch, + debian/patches/0003-libupsclient-version.patch: removed since these are now + fixed upstream + * debian/patches/series: updated -- Arnaud Quette Thu, 03 Nov 2011 21:34:14 -0400 diff --git a/debian/patches/0001-fix_spelling_and_typo.patch b/debian/patches/0001-fix_spelling_and_typo.patch deleted file mode 100644 index 8d9bc86..0000000 --- a/debian/patches/0001-fix_spelling_and_typo.patch +++ /dev/null @@ -1,46 +0,0 @@ -Description: Fix several spelling errors -Author: Laurent Bigonville -Last-Update: 2011-06-03 - ---- a/docs/man/bcmxcp.8 -+++ b/docs/man/bcmxcp.8 -@@ -103,7 +103,7 @@ - .RE - .SH "TODO LIST" - .PP --Report UPS statistics informations -+Report UPS statistics information - .RS 4 - BCM/XCP supports reporting of UPS statistics data\&. - .RE ---- a/docs/man/blazer.8 -+++ b/docs/man/blazer.8 -@@ -264,7 +264,7 @@ - .RE - .\} - .sp --There is a way to get better readings without disconnecting the load but this requires to keep track on how much (and how fast) current is going in\- and out of the battery\&. If you specified the \fBruntimecal\fR, the driver will attempt to do this\&. Note however, that this heavily relies on the values you enter and that the UPS must be able to report the load as well\&. There are quite a couple of devices that report 0 % (or any other fixed value) at all times, in which case this obviously doesn\(cqt work\&. -+There is a way to get better readings without disconnecting the load but this requires one to keep track on how much (and how fast) current is going in\- and out of the battery\&. If you specified the \fBruntimecal\fR, the driver will attempt to do this\&. Note however, that this heavily relies on the values you enter and that the UPS must be able to report the load as well\&. There are quite a couple of devices that report 0 % (or any other fixed value) at all times, in which case this obviously doesn\(cqt work\&. - .sp - The driver also has no way of determining the degradation of the battery capacity over time, so you\(cqll have to deal with this yourself (by adjusting the values in \fBruntimecal\fR)\&. Also note that the driver guesses the initial state of charge based on the battery voltage, so this may be less than 100 %, even when you are certain that they are full\&. There is just no way to reliably measure this between 0 and 100 % full charge\&. - .sp ---- a/docs/man/dummy-ups.8 -+++ b/docs/man/dummy-ups.8 -@@ -37,7 +37,7 @@ - This program is a multi\-purpose UPS emulation tool\&. Its behavior depends on the running mode: - .SS "Dummy Mode" - .sp --\fBdummy\-ups\fR looks like a standard device driver to \fBupsd\fR(8) and allows to change any value for testing purposes\&. It is both interactive, controllable through the \fBupsrw\fR(1) and \fBupscmd\fR(1) commands (or equivalent graphical tool), and batchable through script files\&. It can be configured, launched and used as any other real driver\&. This mode is mostly useful for development and testing purposes\&. -+\fBdummy\-ups\fR looks like a standard device driver to \fBupsd\fR(8) and allows one to change any value for testing purposes\&. It is both interactive, controllable through the \fBupsrw\fR(1) and \fBupscmd\fR(1) commands (or equivalent graphical tool), and batchable through script files\&. It can be configured, launched and used as any other real driver\&. This mode is mostly useful for development and testing purposes\&. - .SS "Repeater Mode" - .sp - \fBdummy\-ups\fR acts as a NUT client, simply forwarding data\&. This can be useful for supervision purposes\&. This can also allow some load sharing between several UPS instances, using a point\-to\-point communication with the UPS\&. -@@ -130,7 +130,7 @@ - .sp - It also helps the NUT Quality Assurance effort, by automating some tests on the NUT framework\&. - .sp --It now offers a repeater mode\&. This will help in building the Meta UPS approach, which allows to build a virtual device, composed of several other devices (either UPS, PDUs)\&. -+It now offers a repeater mode\&. This will help in building the Meta UPS approach, which allows one to build a virtual device, composed of several other devices (either UPS, PDUs)\&. - .SH "BUGS" - .sp - Instant commands are not yet supported in Dummy Mode, and data need name/value checking enforcement, as well as boundaries or enumeration definition\&. diff --git a/debian/patches/0003-libupsclient-version.patch b/debian/patches/0003-libupsclient-version.patch deleted file mode 100644 index 4b02835..0000000 --- a/debian/patches/0003-libupsclient-version.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/clients/Makefile.am -+++ b/clients/Makefile.am -@@ -50,4 +50,4 @@ - if WITH_SSL - libupsclient_la_LIBADD += $(LIBSSL_LIBS) - endif --libupsclient_la_LDFLAGS = -version-info 1:0:0 -+libupsclient_la_LDFLAGS = -version-info 2:0:1 -diff -ru nut-2.6.2.orig/clients/Makefile.in nut-2.6.2/clients/Makefile.in ---- a/clients/Makefile.in -+++ b/clients/Makefile.in -@@ -384,7 +384,7 @@ - # not LDADD. - libupsclient_la_SOURCES = upsclient.c upsclient.h - libupsclient_la_LIBADD = ../common/libparseconf.la $(am__append_4) --libupsclient_la_LDFLAGS = -version-info 1:0:0 -+libupsclient_la_LDFLAGS = -version-info 2:0:1 - all: all-am - - .SUFFIXES: diff --git a/debian/patches/series b/debian/patches/series index 6ea723f..2024d93 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -0001-fix_spelling_and_typo.patch 0002-nut-monitor-paths.patch -0003-libupsclient-version.patch