diff --git a/debian/changelog b/debian/changelog index 75123ce..fcbef96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,10 +7,11 @@ nut (2.6.5-1) UNRELEASED; urgency=low [ Laurent Bigonville ] * New upstream release + - Drop debian/patches/0001-fix-upsmon-regression.patch, applied upstream * Follow multi-arch policy * Install systemd .service files (Closes: #679450) - -- Laurent Bigonville Sun, 12 Aug 2012 23:39:33 +0200 + -- Laurent Bigonville Sun, 12 Aug 2012 23:43:02 +0200 nut (2.6.4-2) unstable; urgency=low diff --git a/debian/patches/0001-fix-upsmon-regression.patch b/debian/patches/0001-fix-upsmon-regression.patch deleted file mode 100644 index aa8c13e..0000000 --- a/debian/patches/0001-fix-upsmon-regression.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fix upsmon/upssched regression -Origin: upstream, http://trac.networkupstools.org/projects/nut/changeset/3670 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679513 - -Index: /trunk/clients/upssched.c -=================================================================== ---- a/clients/upssched.c (revision 3555) -+++ b/clients/upssched.c (revision 3670) -@@ -695,5 +695,5 @@ - pconf_encode(arg2, enc, sizeof(enc))); - -- snprintfcat(enc, sizeof(enc), "%s\n", buf); -+ snprintf(enc, sizeof(enc), "%s\n", buf); - - /* see if the parent needs to be started (and maybe start it) */ diff --git a/debian/patches/series b/debian/patches/series index f80396c..2024d93 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -0001-fix-upsmon-regression.patch 0002-nut-monitor-paths.patch