Merge ~lucaskanashiro/ubuntu/+source/nut:merge-focal into ubuntu/+source/nut:debian/sid
- Git
- lp:~lucaskanashiro/ubuntu/+source/nut
- merge-focal
- Merge into debian/sid
Status: | Merged |
---|---|
Approved by: | Christian Ehrhardt |
Approved revision: | cb665d9ae7f68dd068cbf9aa991f687b98eb1cf9 |
Merge reported by: | Christian Ehrhardt |
Merged at revision: | cb665d9ae7f68dd068cbf9aa991f687b98eb1cf9 |
Proposed branch: | ~lucaskanashiro/ubuntu/+source/nut:merge-focal |
Merge into: | ubuntu/+source/nut:debian/sid |
Diff against target: |
1198 lines (+898/-24) 6 files modified
debian/changelog (+891/-3) debian/control (+2/-18) debian/libnutclient0.symbols (+3/-2) debian/nut-cgi.postinst (+1/-0) debian/nut-server.postinst (+1/-0) dev/null (+0/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt (community) | Approve | ||
Ubuntu Core Development Team | Pending | ||
Canonical Server | Pending | ||
Review via email: mp+377255@code.launchpad.net |
Commit message
Description of the change
Merge version 2.7.4-11 from Debian. The following changes were applied by Debian in 2.7.4-10 and so they were dropped from our delta:
- debian/
debian/rules: Install apport hooks for all top-level nut packages.
[Applied in 2.7.4-10]
- debian/
+ 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+
[Applied in 2.7.4-10]
The rest of the delta is kept as is:
- remove Build-Depends on libpowerman0-dev
- remove nut-powerman-pdu
+ debian/control: remove nut-powerman-pdu package
+ debian/
- d/nut-server.
- d/libnutclient0
The build flag -O3 is not used by Debian.
This package was uploaded to this PPA and it built fine in all architectures:
https:/
And the DEP-8 test is still passing successfully:
autopkgtest [11:34:18]: test nut: [------
test_CVE_2012_2944 (__main_
Test CVE-2012-2944 ... ok
test_daemons_pid (__main_
Test daemons using PID files ... ok
test_daemons_
Test daemons using "service status" ... ok
test_upsc_
Test NUT client interface (upsc): device(s) listing ... ok
test_upsd_IPv4 (__main_
Test upsd IPv4 reachability ... ok
test_upsd_IPv6 (__main_
Test upsd IPv6 reachability ... ok
test_upsmon_notif (__main_
Test upsmon notifications ... ok
test_upsrw (__main_
Test upsrw ... ok
-------
Ran 8 tests in 63.275s
OK
Skipping private tests
autopkgtest [11:35:22]: test nut: -------
autopkgtest [11:35:23]: test nut: - - - - - - - - - - results - - - - - - - - - -
nut PASS
autopkgtest [11:35:23]: @@@@@@@
nut PASS
- ae3cd62... by Lucas Kanashiro
-
* Dropped:
- debian/source_ nut.py, debian/ {nut,nut- server, nut-client} .install,
debian/rules: Install apport hooks for all top-level nut packages.
[Applied in 2.7.4-10] - d04290d... by Lucas Kanashiro
-
- 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+
[Applied in 2.7.4-10] - 5197d48... by Lucas Kanashiro
-
merge-changelogs
- 94aba26... by Lucas Kanashiro
-
reconstruct-
changelog - cb665d9... by Lucas Kanashiro
-
update-maintainer
Lucas Kanashiro (lucaskanashiro) wrote : | # |
Thanks for the review Christian. The changelog was fixed and the text you suggested was added. Up for review again.
Christian Ehrhardt (paelzer) wrote : | # |
Thanks for the fixups LGTM now!
Christian Ehrhardt (paelzer) wrote : | # |
Tag pushed
To ssh://git.
* [new tag] upload/
Christian Ehrhardt (paelzer) wrote : | # |
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading nut_2.7.
Uploading nut_2.7.
Uploading nut_2.7.
Uploading nut_2.7.
Uploading nut_2.7.
Successfully uploaded packages.
Christian Ehrhardt (paelzer) wrote : | # |
We are even on the follow-on to bring powerman back already => https:/
This code is in Focal -> merged
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index f999cdd..b8e6803 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,33 @@ |
6 | +nut (2.7.4-11ubuntu1) focal; urgency=medium |
7 | + |
8 | + * Merge with Debian unstable. Remaining changes: |
9 | + - remove Build-Depends on libpowerman0-dev |
10 | + - remove nut-powerman-pdu |
11 | + + debian/control: remove nut-powerman-pdu package |
12 | + + debian/nut-powerman-pdu.{install,manpages}: dropped for now |
13 | + - d/nut-server.postinst, d/nut-cgi.postinst: ensure nut is member of group |
14 | + dialout. Droppable after 20.04: "Going back in time (a lot) this |
15 | + was added in 14.04 for upgrades from hardy. Debian switched in 0.44.1-3 |
16 | + to need the user to chown serials. Maybe we keep it for 20.04 as the |
17 | + last release. But following that new installs (upgraders will still have |
18 | + nut be a dialout member) are very++ unlikely to have classic serials. |
19 | + For ipmi/usb based ports (what you'd expect today) udev rules will set |
20 | + things up correctly (/lib/udev/rules.d/62-nut-usbups.rules shipped in |
21 | + nut-server)." |
22 | + - d/libnutclient0.symbols: Mark more symbols as optional (ppc64el, -O3). |
23 | + The build flag -O3 is not used by Debian. |
24 | + * Dropped: |
25 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
26 | + debian/rules: Install apport hooks for all top-level nut packages. |
27 | + [Applied in 2.7.4-10] |
28 | + - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most |
29 | + + 5 seconds to shut down, instead of expecting it to be shut down |
30 | + immediately after sending the killall. |
31 | + + Additional indication on how to run tests for xenial+ |
32 | + [Applied in 2.7.4-10] |
33 | + |
34 | + -- Lucas Kanashiro <lucas.kanashiro@canonical.com> Wed, 08 Jan 2020 09:02:03 -0300 |
35 | + |
36 | nut (2.7.4-11) unstable; urgency=medium |
37 | |
38 | * Remove python(2) binding and disable nut-monitor package for now as it |
39 | @@ -22,6 +52,39 @@ nut (2.7.4-10) unstable; urgency=medium |
40 | |
41 | -- Laurent Bigonville <bigon@debian.org> Mon, 19 Aug 2019 01:04:36 +0200 |
42 | |
43 | +nut (2.7.4-9ubuntu2) focal; urgency=medium |
44 | + |
45 | + * No-change rebuild to generate dependencies on python2. |
46 | + |
47 | + -- Matthias Klose <doko@ubuntu.com> Tue, 17 Dec 2019 12:38:26 +0000 |
48 | + |
49 | +nut (2.7.4-9ubuntu1) eoan; urgency=medium |
50 | + |
51 | + * Merge with Debian unstable (LP: #1505288). Remaining changes: |
52 | + - remove Build-Depends on libpowerman0-dev |
53 | + - remove nut-powerman-pdu |
54 | + + debian/control: remove nut-powerman-pdu package |
55 | + + debian/nut-powerman-pdu.{install,manpages}: dropped for now |
56 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
57 | + debian/rules: Install apport hooks for all top-level nut packages. |
58 | + - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most |
59 | + + 5 seconds to shut down, instead of expecting it to be shut down |
60 | + immediately after sending the killall. |
61 | + + Additional indication on how to run tests for xenial+ |
62 | + - d/nut-server.postinst, d/nut-cgi.postinst: ensure nut is member of group |
63 | + dialout (This existed, but was missed in the Changelog). |
64 | + - debian/libnutclient0.symbols: Correct symbols file for ppc64el. |
65 | + - Mark more symbols as optional (ppc64el, -O3). |
66 | + * Dropped changes (in Debian now): |
67 | + - debian/tests/control : Fix dep8 test failures: |
68 | + + Drop python-unit from dep8 dependencies since the python-test |
69 | + package has now been removed. The unittest module has shipped with |
70 | + Python since 2.1. |
71 | + + Add dep8 test dependency on python, since Python 2 is required and |
72 | + is not necessarily installed by default any more. |
73 | + |
74 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 05 Aug 2019 12:32:08 +0200 |
75 | + |
76 | nut (2.7.4-9) unstable; urgency=medium |
77 | |
78 | [ Ondřej Nový ] |
79 | @@ -78,6 +141,37 @@ nut (2.7.4-9) unstable; urgency=medium |
80 | |
81 | -- Laurent Bigonville <bigon@debian.org> Sun, 04 Aug 2019 10:34:17 +0200 |
82 | |
83 | +nut (2.7.4-8ubuntu2) eoan; urgency=medium |
84 | + |
85 | + * Mark more symbols as optional (ppc64el, -O3). |
86 | + |
87 | + -- Matthias Klose <doko@ubuntu.com> Mon, 24 Jun 2019 12:31:07 +0200 |
88 | + |
89 | +nut (2.7.4-8ubuntu1) cosmic; urgency=medium |
90 | + |
91 | + * Merge with Debian unstable (LP: #1774147). Remaining changes: |
92 | + - remove Build-Depends on libpowerman0-dev |
93 | + - remove nut-powerman-pdu |
94 | + + debian/control: remove nut-powerman-pdu package |
95 | + + debian/nut-powerman-pdu.{install,manpages}: dropped for now |
96 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
97 | + debian/rules: Install apport hooks for all top-level nut packages. |
98 | + - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most |
99 | + + 5 seconds to shut down, instead of expecting it to be shut down |
100 | + immediately after sending the killall. |
101 | + + Additional indication on how to run tests for xenial+ |
102 | + - debian/tests/control : Fix dep8 test failures: |
103 | + + Drop python-unit from dep8 dependencies since the python-test |
104 | + package has now been removed. The unittest module has shipped with |
105 | + Python since 2.1. |
106 | + + Add dep8 test dependency on python, since Python 2 is required and |
107 | + is not necessarily installed by default any more. |
108 | + - d/nut-server.postinst, d/nut-cgi.postinst: ensure nut is member of group |
109 | + dialout (This existed, but was missed in the Changelog). |
110 | + - debian/libnutclient0.symbols: Correct symbols file for ppc64el. |
111 | + |
112 | + -- dann frazier <dann.frazier@canonical.com> Fri, 03 Aug 2018 12:10:45 -0600 |
113 | + |
114 | nut (2.7.4-8) unstable; urgency=medium |
115 | |
116 | * debian/libnutclient0.symbols: Use arch-bits=32 and arch-bits=64 instead of |
117 | @@ -91,6 +185,38 @@ nut (2.7.4-8) unstable; urgency=medium |
118 | |
119 | -- Laurent Bigonville <bigon@debian.org> Fri, 01 Jun 2018 17:55:25 +0200 |
120 | |
121 | +nut (2.7.4-7ubuntu1) cosmic; urgency=medium |
122 | + |
123 | + * Merge with Debian unstable (LP: #1774147). Remaining changes: |
124 | + - remove Build-Depends on libpowerman0-dev |
125 | + - remove nut-powerman-pdu |
126 | + + debian/control: remove nut-powerman-pdu package |
127 | + + debian/nut-powerman-pdu.{install,manpages}: dropped for now |
128 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
129 | + debian/rules: Install apport hooks for all top-level nut packages. |
130 | + - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most |
131 | + + 5 seconds to shut down, instead of expecting it to be shut down |
132 | + immediately after sending the killall. |
133 | + + Additional indication on how to run tests for xenial+ |
134 | + - debian/tests/control : Fix dep8 test failures: |
135 | + + Drop python-unit from dep8 dependencies since the python-test |
136 | + package has now been removed. The unittest module has shipped with |
137 | + Python since 2.1. |
138 | + + Add dep8 test dependency on python, since Python 2 is required and |
139 | + is not necessarily installed by default any more. |
140 | + - d/nut-server.postinst, d/nut-cgi.postinst: ensure nut is member of group |
141 | + dialout (This existed, but was missed in the Changelog). |
142 | + - debian/libnutclient0.symbols: Correct symbols file for ppc64el. |
143 | + (Reduced as it is partially in Debian now) |
144 | + * Dropped Changes |
145 | + - fix cflags/ldflags mismatch (LP #1711092) |
146 | + (no more needed) |
147 | + - debian/nut-{cgi,server}.postinst: fix 'adduser' logic to be |
148 | + unconditional, since adduser is guaranteed to be idempotent. |
149 | + (was a non functional comment only change) |
150 | + |
151 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 30 May 2018 10:44:42 +0200 |
152 | + |
153 | nut (2.7.4-7) unstable; urgency=medium |
154 | |
155 | * debian/libnutclient0.symbols: Fix symbols file, this should fix FTBFS on |
156 | @@ -119,6 +245,51 @@ nut (2.7.4-6) unstable; urgency=medium |
157 | |
158 | -- Laurent Bigonville <bigon@debian.org> Tue, 20 Feb 2018 13:08:57 +0100 |
159 | |
160 | +nut (2.7.4-5.1ubuntu2) bionic; urgency=medium |
161 | + |
162 | + * Drop change which is no more needed, thereby fixes systemd integration |
163 | + and the availability of /lib/systemd/system-shutdown/nutshutdown |
164 | + (LP: #1603609) |
165 | + - Disable systemd unit; it does not check nut.conf whether nut is |
166 | + configured, and thus fails to start (and the package install). The |
167 | + init.d script works well enough for the time being. |
168 | + |
169 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 15 Nov 2017 16:47:10 +0100 |
170 | + |
171 | +nut (2.7.4-5.1ubuntu1) bionic; urgency=medium |
172 | + |
173 | + * Merge with Debian unstable. Remaining changes: |
174 | + - remove Build-Depends on libpowerman0-dev |
175 | + - remove nut-powerman-pdu |
176 | + + debian/nut-powerman-pdu.{install,manpages}: dropped for now |
177 | + - debian/nut-{cgi,server}.postinst: fix 'adduser' logic to be |
178 | + unconditional, since adduser is guaranteed to be idempotent. |
179 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
180 | + debian/rules: Install apport hooks for all top-level nut packages. |
181 | + - Disable systemd unit; it does not check nut.conf whether nut is |
182 | + configured, and thus fails to start (and the package install). The |
183 | + init.d script works well enough for the time being. |
184 | + - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most |
185 | + + 5 seconds to shut down, instead of expecting it to be shut down |
186 | + immediately after sending the killall. |
187 | + + Additional indication on how to run tests for xenial+ |
188 | + - debian/tests/control : Fix dep8 test failures: |
189 | + + Drop python-unit from dep8 dependencies since the python-test |
190 | + package has now been removed. The unittest module has shipped with |
191 | + Python since 2.1. |
192 | + + Add dep8 test dependency on python, since Python 2 is required and |
193 | + is not necessarily installed by default any more. |
194 | + - debian/libnutclient0.symbols: Correct symbols file for ppc64el. |
195 | + - fix cflags/ldflags mismatch (LP #1711092) |
196 | + * Drop: |
197 | + - udevd is called systemd-udevd (LP #1540008) |
198 | + [ Fixed in Debian 2.7.4-5.1 ] |
199 | + - d/libnutclient0.symbols: fix symbols in regard to gcc-7 |
200 | + (LP #1711091) |
201 | + [ Fixed in Debian 2.7.4-5.1 ] |
202 | + |
203 | + -- Nishanth Aravamudan <nish.aravamudan@canonical.com> Fri, 03 Nov 2017 16:34:18 -0700 |
204 | + |
205 | nut (2.7.4-5.1) unstable; urgency=medium |
206 | |
207 | * Non-maintainer upload. |
208 | @@ -138,6 +309,66 @@ nut (2.7.4-5.1) unstable; urgency=medium |
209 | |
210 | -- Michael Stapelberg <stapelberg@debian.org> Wed, 23 Aug 2017 22:24:57 +0200 |
211 | |
212 | +nut (2.7.4-5ubuntu4) artful; urgency=medium |
213 | + |
214 | + * d/p/fix-snmp-driver-compile-options.patch: fix cflags/ldflags |
215 | + mismatch (LP: #1711092). |
216 | + * d/libnutclient0.symbols: fix symbols in regard to gcc-7 (LP: #1711091). |
217 | + |
218 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 16 Aug 2017 12:44:26 +0200 |
219 | + |
220 | +nut (2.7.4-5ubuntu3) artful; urgency=medium |
221 | + |
222 | + * debian/nut-server.postinst: The udevd process is called systemd-udevd |
223 | + for quite sometimes already, properly detect whether it's running or not, |
224 | + this should fix the devices permissions for USB UPS's (LP: #1540008). |
225 | + |
226 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 09 Aug 2017 10:16:38 +0200 |
227 | + |
228 | +nut (2.7.4-5ubuntu2) zesty; urgency=medium |
229 | + |
230 | + * debian/libnutclient0.symbols: Correct symbols file for ppc64el. |
231 | + |
232 | + -- Adam Conrad <adconrad@ubuntu.com> Fri, 17 Feb 2017 05:38:03 -0700 |
233 | + |
234 | +nut (2.7.4-5ubuntu1) zesty; urgency=medium |
235 | + |
236 | + * Merge with Debian; remaining changes (LP: #1643618) |
237 | + - debian/control: |
238 | + + remove Build-Depends on libpowerman0-dev |
239 | + + remove nut-powerman-pdu |
240 | + - debian/nut-powerman-pdu.{install,manpages}: dropped for now |
241 | + - debian/nut-{cgi,server}.postinst: fix 'adduser' logic to be |
242 | + unconditional, since adduser is guaranteed to be idempotent. |
243 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
244 | + debian/rules: Install apport hooks for all top-level nut packages. |
245 | + - Disable systemd unit; it does not check nut.conf whether nut is |
246 | + configured, and thus fails to start (and the package install). The |
247 | + init.d script works well enough for the time being. |
248 | + - debian/tests/test-nut.py: |
249 | + + In the CVE_2012_2944 test, give nut at most 5 seconds to shut down, |
250 | + instead of expecting it to be shut down immediately after sending the |
251 | + killall. |
252 | + + Additional indication on how to run tests for oneiric, precise to |
253 | + vivid and wily+ |
254 | + - debian/tests/control : Fix dep8 test failures: |
255 | + + Drop python-unit from dep8 dependencies since the python-test |
256 | + package has now been removed. The unittest module has shipped with |
257 | + Python since 2.1. |
258 | + + Add dep8 test dependency on python, since Python 2 is required and |
259 | + is not necessarily installed by default any more. |
260 | + * Dropped changes: |
261 | + - Patch libtool.m4 and configure to support ppc64le. (Fixed upstream) |
262 | + - Remove unnecessary chmod 755 on files introduced by previous merge, |
263 | + assumed to be an error |
264 | + - debian/patches/0006-ups-conf-maxretry.patch: documentation tweaks |
265 | + (unnecessary Ubuntu delta). This was formerly listed as "Move maxretry |
266 | + setting above Examples section" but no longer did this at all. |
267 | + * Replace outdated indictions on how to run tests (Oneric, Precise, Vivid, |
268 | + Wily+) with proper indications for current version (Xenial+) |
269 | + |
270 | + -- Louis Bouchard <louis.bouchard@ubuntu.com> Thu, 15 Dec 2016 15:30:05 +0100 |
271 | + |
272 | nut (2.7.4-5) unstable; urgency=medium |
273 | |
274 | * debian/control: Build-depends against asciidoc-dblatex, Recommends are not |
275 | @@ -204,6 +435,48 @@ nut (2.7.4-1) unstable; urgency=low |
276 | |
277 | -- Laurent Bigonville <bigon@debian.org> Mon, 18 Jul 2016 10:58:49 +0200 |
278 | |
279 | +nut (2.7.2-4ubuntu1) xenial; urgency=low |
280 | + |
281 | + * Merge with Debian; remaining changes (LP: #1522346) : |
282 | + - debian/control: |
283 | + + remove Build-Depends on libpowerman0-dev |
284 | + + remove nut-powerman-pdu |
285 | + - debian/nut-powerman-pdu.{install,manpages}: dropped for now |
286 | + - debian/{nut-cgi,nut-server}.postinst: add nut to the group |
287 | + unconditonally, for compatibility with UPSes connected by serial port. |
288 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
289 | + debian/rules: Install apport hooks for all top-level nut packages. |
290 | + - Patch libtool.m4 and configure to support ppc64le. |
291 | + - Disable systemd unit; it does not check nut.conf whether nut is |
292 | + configured, and thus fails to start (and the package install). The |
293 | + init.d script works well enough for the time being. |
294 | + - debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most |
295 | + + 5 seconds to shut down, instead of expecting it to be shut down |
296 | + immediately after sending the killall. |
297 | + + Additional indication on how to run tests for oneiric, precise to |
298 | + vivid and wily+ |
299 | + - debian/patches/0006-ups-conf-reorder.patch: Move maxretry setting |
300 | + above Examples section. |
301 | + - debian/tests/control : Fix dep8 test failures: |
302 | + + Drop python-unit from dep8 dependencies since the python-test |
303 | + package has now been removed. The unittest module has shipped with |
304 | + Python since 2.1. |
305 | + + Add dep8 test dependency on python, since Python 2 is required and |
306 | + is not necessarily installed by default any more. |
307 | + |
308 | + * Dropped changes: |
309 | + - Fix linking libupsclient : Superseded upstream |
310 | + - debian/patches/backport-fix-lp753661.patch: extraneous end-of-line now |
311 | + fixed differently upstream. |
312 | + - debian/rules: Use udev version for Ubuntu; delta no longer needed as |
313 | + both versions are earlier than the earliest supported udev in Ubuntu. |
314 | + |
315 | + [ Steve Langasek ] |
316 | + * debian/nut-{cgi,server}.postinst: fix 'adduser' logic to be |
317 | + unconditional, since adduser is guaranteed to be idempotent. |
318 | + |
319 | + -- Louis Bouchard <louis.bouchard@ubuntu.com> Thu, 03 Dec 2015 12:37:13 +0100 |
320 | + |
321 | nut (2.7.2-4) unstable; urgency=medium |
322 | |
323 | * Really fix package initial installation when PID1 is systemd (Closes: |
324 | @@ -265,6 +538,59 @@ nut (2.7.2-1) unstable; urgency=low |
325 | |
326 | -- Laurent Bigonville <bigon@debian.org> Tue, 22 Apr 2014 22:46:12 +0200 |
327 | |
328 | +nut (2.7.1-1ubuntu5) wily; urgency=medium |
329 | + |
330 | + * Fix dep8 test failures: |
331 | + - Drop python-unit from dep8 dependencies since the python-test |
332 | + package has now been removed. The unittest module has shipped with |
333 | + Python since 2.1. |
334 | + - Add dep8 test dependency on python, since Python 2 is required and |
335 | + is not necessarily installed by default any more. |
336 | + |
337 | + -- Robie Basak <robie.basak@ubuntu.com> Mon, 12 Oct 2015 10:08:30 +0000 |
338 | + |
339 | +nut (2.7.1-1ubuntu4) vivid; urgency=low |
340 | + |
341 | + * debian/patches/0006-ups-conf-reorder.patch: Move maxretry setting |
342 | + above Examples section, closer to the "outside of a driver definition" |
343 | + comment. (LP: #1405822) |
344 | + |
345 | + -- Tuomas Heino <iheino+ub@cc.hut.fi> Fri, 26 Dec 2014 19:36:45 +0200 |
346 | + |
347 | +nut (2.7.1-1ubuntu3) utopic; urgency=medium |
348 | + |
349 | + * debian/tests/test-nut.py: in the CVE_2012_2944 test, give nut at most 5 |
350 | + seconds to shut down, instead of expecting it to be shut down immediately |
351 | + after sending the killall. (LP: #1291378) |
352 | + |
353 | + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 07 Jul 2014 07:56:43 +0200 |
354 | + |
355 | +nut (2.7.1-1ubuntu2) utopic; urgency=medium |
356 | + |
357 | + * Disable systemd unit; it does not check nut.conf whether nut is |
358 | + configured, and thus fails to start (and the package install). The init.d |
359 | + script works well enough for the time being. (LP: #1313231) |
360 | + |
361 | + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 12 May 2014 13:22:12 +0200 |
362 | + |
363 | +nut (2.7.1-1ubuntu1) trusty; urgency=medium |
364 | + |
365 | + * Merge with Debian; remaining changes: |
366 | + - debian/control: |
367 | + + remove Build-Depends on libpowerman0-dev |
368 | + + remove nut-powerman-pdu |
369 | + - debian/nut-powerman-pdu.{install,manpages}: dropped for now |
370 | + - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut |
371 | + groups unconditonally to handle the upgrade from hardy release. |
372 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
373 | + debian/rules: Install apport hooks for all top-level nut packages. |
374 | + - debian/rules: Use udev version for Ubuntu |
375 | + - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled |
376 | + * Fix linking libupsclient. |
377 | + * Patch libtool.m4 and configure to support ppc64le. |
378 | + |
379 | + -- Matthias Klose <doko@ubuntu.com> Mon, 30 Dec 2013 10:37:07 +0100 |
380 | + |
381 | nut (2.7.1-1) unstable; urgency=low |
382 | |
383 | * New upstream release (Closes: #730183) |
384 | @@ -372,6 +698,46 @@ nut (2.6.5-1) experimental; urgency=low |
385 | |
386 | -- Laurent Bigonville <bigon@debian.org> Mon, 13 Aug 2012 01:59:18 +0200 |
387 | |
388 | +nut (2.6.4-2.3ubuntu2) saucy; urgency=low |
389 | + |
390 | + * Rebuild for libgd3 and libsnmp30. |
391 | + |
392 | + -- Colin Watson <cjwatson@ubuntu.com> Mon, 20 May 2013 00:33:46 +0100 |
393 | + |
394 | +nut (2.6.4-2.3ubuntu1) saucy-proposed; urgency=low |
395 | + |
396 | + * Merge from Debian. Remaining changes: |
397 | + - debian/control: |
398 | + + remove Build-Depends on libpowerman0-dev |
399 | + + remove nut-powerman-pdu |
400 | + - debian/nut-powerman-pdu.{install,manpages}: dropped for now |
401 | + - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut |
402 | + groups unconditonally to handle the upgrade from hardy release. |
403 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
404 | + debian/rules: Install apport hooks for all top-level nut packages. |
405 | + - debian/rules: Use udev version for Ubuntu |
406 | + - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled |
407 | + |
408 | + -- Jamie Strandboge <jamie@ubuntu.com> Thu, 09 May 2013 12:38:31 -0500 |
409 | + |
410 | +nut (2.6.4-2.2ubuntu1) raring-proposed; urgency=low |
411 | + |
412 | + * Merge from Debian. Remaining changes: |
413 | + - debian/control: |
414 | + + remove Build-Depends on libpowerman0-dev |
415 | + + remove nut-powerman-pdu |
416 | + - debian/nut-powerman-pdu.{install,manpages}: dropped for now |
417 | + - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut |
418 | + groups unconditonally to handle the upgrade from hardy release. |
419 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
420 | + debian/rules: Install apport hooks for all top-level nut packages. |
421 | + - debian/rules: Use udev version for Ubuntu |
422 | + - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled |
423 | + * Dropped the following patches, no longer required: |
424 | + - debian/patches/CVE-2012-2944.patch (included upstream) |
425 | + |
426 | + -- Jamie Strandboge <jamie@ubuntu.com> Wed, 23 Jan 2013 07:32:58 -0600 |
427 | + |
428 | nut (2.6.4-2) unstable; urgency=low |
429 | |
430 | * debian/rules: Stop the nut-client before nut-server on systems using static |
431 | @@ -435,6 +801,30 @@ nut (2.6.3-2) unstable; urgency=low |
432 | |
433 | -- Arnaud Quette <aquette@debian.org> Tue, 24 Jan 2012 13:14:59 +0100 |
434 | |
435 | +nut (2.6.3-1ubuntu2) quantal; urgency=low |
436 | + |
437 | + * SECURITY UPDATE: remote denial of service |
438 | + - debian/CVE-2012-2944.patch: limit the set of parsed characters to ' ' |
439 | + through '~' |
440 | + - CVE-2012-2944 |
441 | + |
442 | + -- Jamie Strandboge <jamie@ubuntu.com> Wed, 30 May 2012 13:36:58 -0500 |
443 | + |
444 | +nut (2.6.3-1ubuntu1) precise; urgency=low |
445 | + |
446 | + * Merge from Debian testing. Remaining changes: |
447 | + - debian/control: Drop Build-Depends on libpowerman0-dev (currently in |
448 | + universe) |
449 | + - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut |
450 | + groups unconditonally to handle the upgrade from hardy release. |
451 | + - debian/nut-powerman-pdu.{install,manpages}: dropped for now. |
452 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
453 | + debian/rules: Install apport hooks for all top-level nut packages. |
454 | + - debian/rules: Use udev version for Ubuntu. |
455 | + - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled. |
456 | + |
457 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 06 Feb 2012 09:23:24 -0500 |
458 | + |
459 | nut (2.6.3-1) unstable; urgency=low |
460 | |
461 | * New upstream release (Closes: #635186, #598741, #633756, #638221) |
462 | @@ -449,6 +839,21 @@ nut (2.6.3-1) unstable; urgency=low |
463 | |
464 | -- Arnaud Quette <aquette@debian.org> Tue, 24 Jan 2012 13:14:59 +0100 |
465 | |
466 | +nut (2.6.2-1ubuntu1) precise; urgency=low |
467 | + |
468 | + * Merge from debian unstable. Remaining changes: |
469 | + - debian/control: Drop Build-Depends on libpowerman0-dev (currently in |
470 | + universe) |
471 | + - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut |
472 | + groups unconditonally to handle the upgrade from hardy release. |
473 | + - debian/nut-powerman-pdu.{install,manpages}: dropped for now. |
474 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
475 | + debian/rules: Install apport hooks for all top-level nut packages. |
476 | + - debian/rules: Use udev version for Ubuntu. |
477 | + - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled. |
478 | + |
479 | + -- Chuck Short <zulcss@ubuntu.com> Tue, 04 Oct 2011 05:45:12 +0000 |
480 | + |
481 | nut (2.6.2-1) unstable; urgency=low |
482 | |
483 | * New upstream release (Closes: #594989) |
484 | @@ -468,6 +873,29 @@ nut (2.6.2-1) unstable; urgency=low |
485 | |
486 | -- Arnaud Quette <aquette@debian.org> Thu, 29 Sep 2011 18:39:16 +0200 |
487 | |
488 | +nut (2.6.1-2ubuntu2) oneiric; urgency=low |
489 | + |
490 | + * Fix FTBFS for Ubuntu (LP: #815760): |
491 | + - debian/control: Build-Depends-Indep on docbook-xsl for offline |
492 | + document generation. |
493 | + |
494 | + -- James Page <james.page@ubuntu.com> Mon, 25 Jul 2011 12:02:48 +0100 |
495 | + |
496 | +nut (2.6.1-2ubuntu1) oneiric; urgency=low |
497 | + |
498 | + * Merge from Debian unstable (LP: #811976). Remaining changes: |
499 | + - debian/control: Drop Build-Depends on libpowerman0-dev (currently in |
500 | + universe) |
501 | + - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut |
502 | + groups unconditonally to handle the upgrade from hardy release. |
503 | + - debian/nut-powerman-pdu.{install,manpages}: dropped for now. |
504 | + - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install, |
505 | + debian/rules: Install apport hooks for all top-level nut packages. |
506 | + - debian/rules: Use udev version for Ubuntu. |
507 | + - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled. |
508 | + |
509 | + -- James Page <james.page@ubuntu.com> Fri, 22 Jul 2011 14:12:46 +0100 |
510 | + |
511 | nut (2.6.1-2) unstable; urgency=low |
512 | |
513 | * debian/nut.README.Debian: Adjust udev rules naming for permissions override |
514 | @@ -491,6 +919,21 @@ nut (2.6.1-2) unstable; urgency=low |
515 | |
516 | -- Laurent Bigonville <bigon@debian.org> Sun, 17 Jul 2011 19:03:18 +0200 |
517 | |
518 | +nut (2.6.1-1ubuntu1) oneiric; urgency=low |
519 | + |
520 | + * Merge from debian unstable. Remaining changes: |
521 | + - debian/control: |
522 | + + Drop Build-Depends on libpowerman0-dev (currently in universe) |
523 | + - debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups |
524 | + unconditonally to handle the upgrade from hardy release. |
525 | + - debian/nut-powerman-pdu.{install,manpages}: dropped for now. |
526 | + - debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook. |
527 | + - debian/rules: Use udev version for Ubuntu. |
528 | + * debian/patches/backport-fix-lp753661.patch: Refreshed. |
529 | + * Drop changes due to .pc being not clean. |
530 | + |
531 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 06 Jun 2011 13:38:09 -0400 |
532 | + |
533 | nut (2.6.1-1) unstable; urgency=low |
534 | |
535 | * New upstream release (Closes: #595953, #614842, #595773) |
536 | @@ -506,6 +949,28 @@ nut (2.6.1-1) unstable; urgency=low |
537 | |
538 | -- Arnaud Quette <aquette@debian.org> Wed, 01 Jun 2011 22:34:28 +0200 |
539 | |
540 | +nut (2.6.0-2ubuntu1) oneiric; urgency=low |
541 | + |
542 | + * Merge from debian unstable (LP: #789323). Remaining changes: |
543 | + + debian/control: |
544 | + - Update maintainer as per spec. |
545 | + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. |
546 | + - Drop libpowerman0-dev from the Build-Depends (currently in universe) |
547 | + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups |
548 | + unconditonally to handle the upgrade from hardy release. |
549 | + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped for now. |
550 | + + debian/nul-hal-drivers.{docs,install,postinst,preinst}: Dropped since hal is in universe now |
551 | + + debian/nut.links: must create the init script link, used if the upse needs to be powered down |
552 | + (LP: #357583) |
553 | + + debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook. |
554 | + + debian/patches/backport-fix-lp753661.patch |
555 | + + Dropped: |
556 | + - debian/patches/fix_pc_file.patch: replaced by debian's 0002-fix_libupsclient_pc.patch |
557 | + * debian/patches/fix_pc_file.patch: add DEP3 patch header |
558 | + * debian/patches/debian-changes-2.6.0-1: remove that accidental file |
559 | + |
560 | + -- Scott Moser <smoser@ubuntu.com> Fri, 27 May 2011 16:16:10 -0400 |
561 | + |
562 | nut (2.6.0-2) unstable; urgency=low |
563 | |
564 | * debian/nut-snmp.docs: Distribute snmp.txt doc file (Closes: #548295) |
565 | @@ -522,6 +987,45 @@ nut (2.6.0-2) unstable; urgency=low |
566 | |
567 | -- Laurent Bigonville <bigon@debian.org> Sun, 08 May 2011 21:23:46 +0200 |
568 | |
569 | +nut (2.6.0-1ubuntu3) natty; urgency=low |
570 | + |
571 | + * debian/patches/backport-fix-lp753661.patch: Backport fix |
572 | + to trim extraneous end-of-line, in buggy HID string tables, |
573 | + which results in upsc breaking the communication pipe. |
574 | + (LP: #753661) |
575 | + |
576 | + -- Chuck Short <zulcss@ubuntu.com> Wed, 20 Apr 2011 10:47:05 -0400 |
577 | + |
578 | +nut (2.6.0-1ubuntu2) natty; urgency=low |
579 | + |
580 | + * fix_pc_file.patch: fix .pc source files by using LIBSSL_LIBS instead of |
581 | + LIBSSL_LDFLAGS to avoid a FTBFS in packages that uses libupsclient.pc |
582 | + (LP: #743484) |
583 | + |
584 | + -- Fabrice Coutadeur <fabricesp@ubuntu.com> Sun, 27 Mar 2011 08:21:01 +0200 |
585 | + |
586 | +nut (2.6.0-1ubuntu1) natty; urgency=low |
587 | + |
588 | + * Merge from Debian unstable, remaining changes: |
589 | + + debian/control: |
590 | + - Update maintainer as per spec. |
591 | + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. |
592 | + - Drop libpowerman0-dev from the Build-Depends (currently in universe) |
593 | + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups |
594 | + unconditonally to hanle the upgrade from hardy release. |
595 | + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped for now. |
596 | + + debian/nul-hal-drivers.{docs,install,postinst,preinst}: Dropped since hal is in universe now |
597 | + + debian/nut.links: must create the init script link, used if the upse needs to be powered down |
598 | + (LP: #357583) |
599 | + + debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook. |
600 | + + Dropped: |
601 | + - debian/patches/0002-fix_udev_action.patch: Accepted upstream. |
602 | + - debian/patches/0004-netvision-improvements-lp-600950: no longer needed. |
603 | + - debian/patches/0005-fix-nut-m4.patch: no longer needed. |
604 | + - debian/patches/9999-autoconf.patch: no longer needed. |
605 | + |
606 | + -- Chuck Short <zulcss@ubuntu.com> Wed, 23 Feb 2011 09:01:35 -0500 |
607 | + |
608 | nut (2.6.0-1) unstable; urgency=low |
609 | |
610 | * New upstream release (Closes: #575176, #588648, #609597, #687985) |
611 | @@ -545,6 +1049,59 @@ nut (2.4.3-3) UNRELEASED; urgency=low |
612 | |
613 | -- Laurent Bigonville <bigon@debian.org> Tue, 11 Jan 2011 22:24:07 +0100 |
614 | |
615 | +nut (2.4.3-2ubuntu4) natty; urgency=low |
616 | + |
617 | + * debian/control, debian/rules, |
618 | + debian/nut-hal-drivers.{docs,install,postinst,preinst}: Drop |
619 | + nut-hal-drivers since Nut doesnt go into universe. |
620 | + |
621 | + -- Chuck Short <zulcss@ubuntu.com> Thu, 27 Jan 2011 11:18:14 -0500 |
622 | + |
623 | +nut (2.4.3-2ubuntu3) natty; urgency=low |
624 | + |
625 | + * Split patches/debian-changes-2.4.3-2ubuntu1 into |
626 | + patches/0005-fix-nut-m4.patch and patches/9999-autoconf.patch |
627 | + * Readd lost debian/patches0004-netvision-improvements-lp-600950.patch patch |
628 | + (LP: #707050) |
629 | + * debian/patches/0002-fix_udev_action.patch: |
630 | + Change BUS to SUBSYSTEMS, since the former is deprecated. (LP: #692171) |
631 | + * debian/nut.postinst: Uncomment missing call to adduser |
632 | + |
633 | + -- Laurent Bigonville <bigon@ubuntu.com> Thu, 27 Jan 2011 09:18:20 -0500 |
634 | + |
635 | +nut (2.4.3-2ubuntu2) natty; urgency=low |
636 | + |
637 | + * debian/control: Drop hal build dependency, we don't need the daemon to |
638 | + build the package. Add a hal dependency to nut-hal-drivers, which is the |
639 | + only thing that actually needs it. |
640 | + |
641 | + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 27 Jan 2011 10:00:42 +0100 |
642 | + |
643 | +nut (2.4.3-2ubuntu1) natty; urgency=low |
644 | + |
645 | + * Merge from debian unstable. Remaining changes: |
646 | + + debian/control: |
647 | + - Update maintainer as per spec. |
648 | + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. |
649 | + - Drop libpowerman0-dev from the Build-Depends (currently in universe) |
650 | + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups |
651 | + unconditonally to hanle the upgrade from hardy release. |
652 | + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped for now. |
653 | + + debian/nut.links: must create the init script link, used if the upse needs to be powered down |
654 | + (LP: #357583) |
655 | + + debian/nut.postinst: Update udevadm trigger. |
656 | + "libusb_get_report: error sending control message: |
657 | + Operation not permitted" error on some UPS devices. (LP: #572262) |
658 | + + debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook. |
659 | + + debian/patches/netvision-improvements-lp-600950.patch: Add improvements |
660 | + for netvision UPSes |
661 | + + Fix FTBFS with ld --as-needed. |
662 | + + Dropped: |
663 | + - debian/patches/03_udev_rules_change.dpatch: Use debian's instead. |
664 | + - debian/patches/04_nut_small-buffers.dpatch: Use debian's instead. |
665 | + |
666 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 10 Jan 2011 21:21:02 +0000 |
667 | + |
668 | nut (2.4.3-2) unstable; urgency=medium |
669 | |
670 | * debian/control: |
671 | @@ -586,6 +1143,64 @@ nut (2.4.3-1.1) unstable; urgency=low |
672 | |
673 | -- Tim Retout <diocles@debian.org> Fri, 15 Oct 2010 19:31:39 +0100 |
674 | |
675 | +nut (2.4.3-1ubuntu6) natty; urgency=low |
676 | + |
677 | + * Fix FTBFS with ld --as-needed. |
678 | + |
679 | + -- Matthias Klose <doko@ubuntu.com> Mon, 10 Jan 2011 19:14:35 +0100 |
680 | + |
681 | +nut (2.4.3-1ubuntu5) maverick; urgency=low |
682 | + |
683 | + * debian/patches/netvision-improvements-lp-600950.patch: Add improvements for netvision UPSes |
684 | + (LP: #600950) |
685 | + |
686 | + -- Chuck Short <zulcss@ubuntu.com> Fri, 13 Aug 2010 13:28:10 -0500 |
687 | + |
688 | +nut (2.4.3-1ubuntu4) maverick; urgency=low |
689 | + |
690 | + * debian/source_nut.py, debian/nut.install, debian/rules: Install apport hook. |
691 | + |
692 | + -- Chuck Short <zulcss@ubuntu.com> Thu, 08 Jul 2010 11:06:30 -0400 |
693 | + |
694 | +nut (2.4.3-1ubuntu3.1) lucid-proposed; urgency=low |
695 | + |
696 | + * debian/patches/04_nut-small-buffers.dpatch: Fix "libusb_get_report: error sending control message: |
697 | + Operation not permitted" error on some UPS devices. (LP: #572262) |
698 | + |
699 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 03 May 2010 13:38:37 -0400 |
700 | + |
701 | +nut (2.4.3-1ubuntu3) lucid; urgency=low |
702 | + |
703 | + * debian/nut.postinst: Revert dropping of --action=change. "add" events must |
704 | + not ever be triggered automatically. |
705 | + * Add 03_udev_rules_change.dpatch: Run udev rules on change events, too. |
706 | + |
707 | + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 23 Mar 2010 08:00:53 +0100 |
708 | + |
709 | +nut (2.4.3-1ubuntu2) lucid; urgency=low |
710 | + |
711 | + * debian/control: grr...fix ftbfs. |
712 | + |
713 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 22 Mar 2010 11:48:02 -0400 |
714 | + |
715 | +nut (2.4.3-1ubuntu1) lucid; urgency=low |
716 | + |
717 | + * Merge from debian testing. Remaining changes (LP: #535152): |
718 | + + debian/control: |
719 | + - Update maintainer as per spec. |
720 | + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. |
721 | + - Drop libpowerman0-dev from the Build-Depends (currently in universe) |
722 | + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups |
723 | + unconditonally to hanle the upgrade from hardy release. |
724 | + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped for now. |
725 | + + debian/nut.links: must create the init script link, used if the upse needs to be powered down |
726 | + (LP: #357583) |
727 | + + debian/nut.postinst: Update udevadm trigger. |
728 | + + Dropped: |
729 | + - debian/patches/02-fix-trust-pw4130m.dpatch: No longer needed. |
730 | + |
731 | + -- Chuck Short <zulcss@ubuntu.com> Tue, 16 Mar 2010 06:22:26 +0000 |
732 | + |
733 | nut (2.4.3-1) unstable; urgency=low |
734 | |
735 | * New upstream release (Closes: #544390, #528222, #539747, #526811, |
736 | @@ -630,6 +1245,57 @@ nut (2.4.3-1) unstable; urgency=low |
737 | |
738 | -- Arnaud Quette <aquette@debian.org> Wed, 24 Feb 2010 22:58:53 +0100 |
739 | |
740 | +nut (2.4.1-3.2ubuntu2) lucid; urgency=low |
741 | + |
742 | + * debian/patches/02-fix-trust-pw4130m.dpatch: Fix issues with Trust |
743 | + PW-4130M UPS. (LP: #447586) |
744 | + |
745 | + -- Chuck Short <zulcss@ubuntu.com> Thu, 04 Feb 2010 13:26:33 -0500 |
746 | + |
747 | +nut (2.4.1-3.2ubuntu1) lucid; urgency=low |
748 | + |
749 | + * Resynchronize with debian, remaining changes: |
750 | + + debian/control: |
751 | + - Update maintainer field as per spec. |
752 | + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. |
753 | + - Drop libpowerman0-dev from the Build-Depends (currently in universe). |
754 | + - Remove the nut-powerman-pdu package for now. |
755 | + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups |
756 | + unconditionally, to handle the upgrade from hardy release. |
757 | + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped |
758 | + for now. |
759 | + + debian/nut.links: must create the init script link, used if the ups |
760 | + needs to be powered down. (LP: #357583) |
761 | + + debian/nut.init: Fix status_of_proc messages not to lie to the user (LP: #416182) |
762 | + |
763 | + -- Chuck Short <zulcss@ubuntu.com> Fri, 18 Dec 2009 09:00:45 -0500 |
764 | + |
765 | +nut (2.4.1-3.2) unstable; urgency=low |
766 | + |
767 | + * Non-maintainer upload. |
768 | + * nut.postinst: fix post-processing of nut.conf to avoid overriding |
769 | + user settings (Closes: #531220) |
770 | + |
771 | + -- Stefano Zacchiroli <zack@debian.org> Thu, 26 Nov 2009 09:30:45 +0100 |
772 | + |
773 | +nut (2.4.1-3.1ubuntu1) lucid; urgency=low |
774 | + |
775 | + * Merge from debian testing, remaining changes: |
776 | + + debian/control: |
777 | + - Update maintainer field as per spec. |
778 | + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. |
779 | + - Drop libpowerman0-dev from the Build-Depends (currently in universe) |
780 | + - remove the nut-powerman-pdu package for now |
781 | + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups |
782 | + unconditionally, to handle the upgrade from hardy release. |
783 | + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped |
784 | + for now |
785 | + + debian/nut.links: must create the init script link, used if the ups |
786 | + needs to be powered down (LP: #357583) |
787 | + + debian/nut.init: Fix status_of_proc messages not to lie to the user (LP: #416182) |
788 | + |
789 | + -- Chuck Short <zulcss@ubuntu.com> Fri, 06 Nov 2009 01:34:44 +0000 |
790 | + |
791 | nut (2.4.1-3.2) unstable; urgency=low |
792 | |
793 | * Non-maintainer upload. |
794 | @@ -650,6 +1316,30 @@ nut (2.4.1-3.1) unstable; urgency=low |
795 | |
796 | -- Christian Perrier <bubulle@debian.org> Tue, 20 Oct 2009 21:45:21 +0200 |
797 | |
798 | +nut (2.4.1-3ubuntu2) karmic; urgency=low |
799 | + |
800 | + * debian/nut.init: Fix status_of_proc messages not to lie to |
801 | + the user. (LP: #416182) |
802 | + |
803 | + -- Chuck Short <zulcss@ubuntu.com> Wed, 23 Sep 2009 09:37:16 -0400 |
804 | + |
805 | +nut (2.4.1-3ubuntu1) karmic; urgency=low |
806 | + |
807 | + * Merge from debian unstable, remaining changes: |
808 | + + debian/control: |
809 | + - Update maintainer field as per spec. |
810 | + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. |
811 | + - Drop libpowerman0-dev from the Build-Depends (currently in universe) |
812 | + - remove the nut-powerman-pdu package for now |
813 | + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups |
814 | + unconditionally, to handle the upgrade from hardy release. |
815 | + + debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped |
816 | + for now. |
817 | + + debian/nut.links: must create the init script link, used if the ups |
818 | + needs to be powered down (LP: #357583) |
819 | + |
820 | + -- Chuck Short <zulcss@ubuntu.com> Thu, 28 May 2009 06:55:21 +0100 |
821 | + |
822 | nut (2.4.1-3) unstable; urgency=low |
823 | |
824 | * Debconf templates and debian/control reviewed by the debian-l10n- |
825 | @@ -668,6 +1358,52 @@ nut (2.4.1-3) unstable; urgency=low |
826 | |
827 | -- Christian Perrier <bubulle@debian.org> Sat, 21 Mar 2009 08:08:59 +0100 |
828 | |
829 | +nut (2.4.1-2ubuntu4) jaunty; urgency=low |
830 | + |
831 | + * debian/nut.links: must create the init script link, used if the ups |
832 | + needs to be powered down, LP: #357583 |
833 | + |
834 | + -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 09 Apr 2009 14:01:54 -0700 |
835 | + |
836 | +nut (2.4.1-2ubuntu3) jaunty; urgency=low |
837 | + |
838 | + Fixes for LP: #348454 |
839 | + * debian/control: add dpatch to Build-Depends, |
840 | + * debian/patches/*: back for the below fix |
841 | + * debian/patches/01_epdu_fix.dpatch: fix an upstream problem with Eaton PDUs |
842 | + vs untested PDUs from Raritan |
843 | + * debian/rules: reactivate again dpatch rules |
844 | + |
845 | + -- Arnaud Quette <aquette@debian.org> Wed, 25 Mar 2009 13:17:21 +0100 |
846 | + |
847 | +nut (2.4.1-2ubuntu2) jaunty; urgency=low |
848 | + |
849 | + [ Arnaud Quette <aquette@debian.org> ] |
850 | + * Fix FTBFS |
851 | + * debian/control: |
852 | + - drop libpowerman0-dev from the Build-Depends (currently in universe) |
853 | + - remove the nut-powerman-pdu package for now |
854 | + * debian/nut-powerman-pdu.install, debian/nut-powerman-pdu.manpages: dropped |
855 | + for now |
856 | + |
857 | + -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 05 Mar 2009 14:34:06 -0600 |
858 | + |
859 | +nut (2.4.1-2ubuntu1) jaunty; urgency=low |
860 | + |
861 | + * Acknowledge closed bugs in upstream and Debian: LP: #1568, LP: #221737, |
862 | + LP: #239025, LP: #278495, LP: #332030, LP: #332032 |
863 | + * Merge from debian unstable, remaining changes: |
864 | + + debian/control: |
865 | + - Update maintainer field as per spec. |
866 | + - Add Breaks on nut-hal-drivers to ensure we have correct udev version. |
867 | + + debian/{nut-cgi,nut}.postinst: add nut to the dialout and nut groups |
868 | + unconditionally, to handle the upgrade from the hardy release (simply |
869 | + uncommented). |
870 | + + debian/rules: pre merge the changes for Ubuntu (udev path and version), |
871 | + (simply uncommented). |
872 | + |
873 | + -- Arnaud Quette <aquette@debian.org> Fri, 27 Feb 2009 12:49:24 +0100 |
874 | + |
875 | nut (2.4.1-2) unstable; urgency=low |
876 | |
877 | * debian/control: |
878 | @@ -757,6 +1493,50 @@ nut (2.4.1-1) unstable; urgency=low |
879 | |
880 | -- Arnaud Quette <aquette@debian.org> Tue, 17 Feb 2009 14:15:24 +0100 |
881 | |
882 | +nut (2.2.2-10ubuntu3) jaunty; urgency=low |
883 | + |
884 | + * debian/{nut-cgi,nut}.preinst: don't call adduser or addgroup *at |
885 | + all*, these operations should be handled in the postinst. Since |
886 | + this is the only custom action at all for nut-cgi, remove that |
887 | + preinst completely. |
888 | + * debian/{nut-cgi,nut}.postinst: add nut to the dialout |
889 | + and nut groups unconditionally, to handle the upgrade from the hardy |
890 | + release. LP: #222761, LP: #287781. |
891 | + * debian/control: nut needs Pre-Depends: debconf instead of Depends:, |
892 | + because we use debconf unconditionally in the preinst. |
893 | + * reinstate debian/nut-hal-drivers.postinst, which was lost in a |
894 | + merge; and fix it up to use udevadm trigger --action=change, the |
895 | + safe way to install udev rules. |
896 | + * have nut-hal-drivers Depend: on udev so it can use the above. |
897 | + * fix up nut postinst to also use 'udevadm trigger --action=change' |
898 | + |
899 | + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 30 Jan 2009 01:06:53 +0000 |
900 | + |
901 | +nut (2.2.2-10ubuntu2) jaunty; urgency=low |
902 | + |
903 | + * debian/rules: Install udev rules into /lib/udev/rules, bump versioned |
904 | + dependency on udev. |
905 | + * debian/nut.install, debian/nut-hal-drivers.install: Update path |
906 | + * debian/patches/04-ubuntu-udev-rules-name.dpatch: Use a dash to |
907 | + separate the name, not an underscore. |
908 | + * debian/nut.preinst, debian/nut-hal-drivers.preinst: Remove previous |
909 | + rules if unchanged, otherwise move to new filename. |
910 | + * debian/control: Add Breaks to ensure we have correct udev version. |
911 | + |
912 | + -- Scott James Remnant <scott@ubuntu.com> Tue, 13 Jan 2009 02:50:14 +0000 |
913 | + |
914 | +nut (2.2.2-10ubuntu1) jaunty; urgency=low |
915 | + |
916 | + * Merge from debian unstable, remaining changes: |
917 | + + debian/control: |
918 | + - Update maintainer field as per spec. |
919 | + + debian/nut{-cgi,-hal-drivers}.preinst: |
920 | + - Add nut user to dialout group. |
921 | + + debian/nut.install |
922 | + - Install the configuration files in /etc/nut. |
923 | + |
924 | + -- Chuck Short <zulcss@ubuntu.com> Fri, 28 Nov 2008 23:01:47 +0000 |
925 | + |
926 | nut (2.2.2-10) unstable; urgency=low |
927 | |
928 | * Merge from Ubuntu (Morten Kjeldgaard): |
929 | @@ -797,6 +1577,18 @@ nut (2.2.2-9) unstable; urgency=low |
930 | |
931 | -- Arnaud Quette <aquette@debian.org> Wed, 15 Oct 2008 17:20:29 +0200 |
932 | |
933 | +nut (2.2.2-8ubuntu1) jaunty; urgency=low |
934 | + |
935 | + * Merge from debian unstable, remaining changes: |
936 | + + debian/control: |
937 | + - Update maintainer field as per spec. |
938 | + + debian/nut{-cgi,-hal-drivers}.preinst: |
939 | + - Add nut user to dialout group. |
940 | + + debian/rules: |
941 | + - Move the configuration files to /etc/nut from examples. |
942 | + |
943 | + -- Chuck Short <zulcss@ubuntu.com> Wed, 05 Nov 2008 02:59:59 -0400 |
944 | + |
945 | nut (2.2.2-8) unstable; urgency=high |
946 | |
947 | * debian/nut.links: restored since it's now handled by insserv (Closes: |
948 | @@ -820,6 +1612,18 @@ nut (2.2.2-7) unstable; urgency=high |
949 | |
950 | -- Arnaud Quette <aquette@debian.org> Mon, 15 Sep 2008 17:18:28 +0200 |
951 | |
952 | +nut (2.2.2-6ubuntu1) intrepid; urgency=low |
953 | + |
954 | + * Merge from debian unstable, remaining changes: |
955 | + + debian/control: |
956 | + - Update maintainer field as per spec. |
957 | + + debian/nut{-cgi,-hal-drivers}.preinst: |
958 | + - Add nut user to dialout group. |
959 | + + debian/rules: |
960 | + - Move the configuration files to /etc/nut from examples. |
961 | + |
962 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 14 Jul 2008 00:54:42 +0100 |
963 | + |
964 | nut (2.2.2-6) unstable; urgency=low |
965 | |
966 | * tag this bug as closed by the 2.2.2 release (Closes: #490048) |
967 | @@ -863,6 +1667,18 @@ nut (2.2.2-4) unstabl e; urgency=low |
968 | |
969 | -- Arnaud Quette <aquette@debian.org> Sat, 05 Jul 2008 22:56:35 +0200 |
970 | |
971 | +nut (2.2.2-3ubuntu1) intrepid; urgency=low |
972 | + |
973 | + * Merge from debian unstable, remaining changes: |
974 | + + debian/control: |
975 | + - Update maintainer field as per spec. |
976 | + + debian/nut{-cgi,-hal-drivers}.preinst: |
977 | + - Add nut to user to dialout group. |
978 | + + debian/rules: |
979 | + - Move the configuation files to /etc/nut from examples. |
980 | + |
981 | + -- Chuck Short <zulcss@ubuntu.com> Tue, 01 Jul 2008 11:57:01 +0100 |
982 | + |
983 | nut (2.2.2-3) unstable; urgency=low |
984 | |
985 | * debian/rules: reactivate dpatch support |
986 | @@ -892,6 +1708,20 @@ nut (2.2.2-2) unstable; urgency=low |
987 | |
988 | -- Arnaud Quette <aquette@debian.org> Fri, 20 Jun 2008 21:29:31 +0200 |
989 | |
990 | +nut (2.2.2-1ubuntu1) intrepid; urgency=low |
991 | + |
992 | + * Merge from debian unstable, remaining changes: |
993 | + + debian/control: |
994 | + - Update maintainer field as per spec. |
995 | + + debian/nut{-cgi,-hal-drivers}.preinst: |
996 | + - Add nut to user to dialout group. |
997 | + + debian/rules: |
998 | + - Move the configuration files to /etc/nut from examples |
999 | + + debian/patches/01_fix_megatec_regression.dpatch. |
1000 | + - Dropped no longer since its fixed in this version. |
1001 | + |
1002 | + -- Chuck Short <zulcss@ubuntu.com> Wed, 18 Jun 2008 11:30:10 -0500 |
1003 | + |
1004 | nut (2.2.2-1) unstable; urgency=low |
1005 | |
1006 | * New upstream release (Closes: #471828, #462468, #334105, #463150) |
1007 | @@ -919,6 +1749,59 @@ nut (2.2.2-1) unstable; urgency=low |
1008 | |
1009 | -- Arnaud Quette <aquette@debian.org> Wed, 04 Jun 2008 13:35:41 +0200 |
1010 | |
1011 | +nut (2.2.1-2.1ubuntu7) hardy; urgency=low |
1012 | + |
1013 | + * debian/patches/01_fix_megatec_regression.dpatch |
1014 | + - Fix more megatec_usb driver regressions. (LP: #215389) |
1015 | + |
1016 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 14 Apr 2008 14:25:48 -0400 |
1017 | + |
1018 | +nut (2.2.1-2.1ubuntu6) hardy; urgency=low |
1019 | + |
1020 | + * debian/patches/01_fix_megatec_regression.dpatch |
1021 | + - Updated patch thanks to Alexander I. Gordeev <lasaine -at- |
1022 | + lvk.cs.msu.su>. (LP: #209001) |
1023 | + |
1024 | + -- Chuck Short <zulcss@ubuntu.com> Thu, 10 Apr 2008 09:33:53 -0400 |
1025 | + |
1026 | +nut (2.2.1-2.1ubuntu5) hardy; urgency=low |
1027 | + |
1028 | + * debian/patches/01_fix_megatec_regression.dpatch |
1029 | + - Readded support for various USB devices. (LP: #209001) |
1030 | + |
1031 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 07 Apr 2008 08:46:46 -0400 |
1032 | + |
1033 | +nut (2.2.1-2.1ubuntu4) hardy; urgency=low |
1034 | + |
1035 | + * Use udevtrigger to restart udev. (LP: #204612) |
1036 | + |
1037 | + -- Chuck Short <zulcss@ubuntu.com> Wed, 26 Mar 2008 13:30:24 -0400 |
1038 | + |
1039 | +nut (2.2.1-2.1ubuntu3) hardy; urgency=low |
1040 | + |
1041 | + * Fix FTBFS. |
1042 | + |
1043 | + -- Chuck Short <zulcss@ubuntu.com> Sat, 22 Mar 2008 10:00:06 -0400 |
1044 | + |
1045 | +nut (2.2.1-2.1ubuntu2) hardy; urgency=low |
1046 | + |
1047 | + * Fix udev rules. (LP: #204612). |
1048 | + * Cleaned up debian/control. |
1049 | + |
1050 | + -- Chuck Short <zulcss@ubuntu.com> Fri, 21 Mar 2008 20:30:44 -0400 |
1051 | + |
1052 | +nut (2.2.1-2.1ubuntu1) hardy; urgency=low |
1053 | + |
1054 | + * Merge from debian unstable (LP: #203366), remaining Ubuntu changes: |
1055 | + + debian/rules: |
1056 | + - Move the configuration files to /etc/nut from examples. |
1057 | + + debian/nut{,-cgi,-hal-drivers}.preinst |
1058 | + - Add nut user to dialout group. |
1059 | + + debian/control: |
1060 | + - Updated Maintainer field as per spec. |
1061 | + |
1062 | + -- Luca Falavigna <dktrkranz@ubuntu.com> Mon, 17 Mar 2008 23:59:38 +0100 |
1063 | + |
1064 | nut (2.2.1-2.1) unstable; urgency=low |
1065 | |
1066 | * Non-maintainer upload. |
1067 | @@ -926,6 +1809,14 @@ nut (2.2.1-2.1) unstable; urgency=low |
1068 | |
1069 | -- Joe Nahmias <jello@debian.org> Sun, 09 Mar 2008 13:12:12 -0400 |
1070 | |
1071 | +nut (2.2.1-2ubuntu1) hardy; urgency=low |
1072 | + |
1073 | + * Move the configuration files to /etc/nut from examples. (LP: #85598) |
1074 | + * Add nut user to dialout group. (LP: #157079) |
1075 | + * Updated Maintainer according to specs. |
1076 | + |
1077 | + -- Chuck Short <zulcss@ubuntu.com> Thu, 28 Feb 2008 10:10:24 -0500 |
1078 | + |
1079 | nut (2.2.1-2) unstable; urgency=low |
1080 | |
1081 | * debian/po/de.po: update the German po-debconf translation (Closes: |
1082 | @@ -1890,6 +2781,3 @@ nut (0.43.2-1) unstable; urgency=low |
1083 | |
1084 | -- Luca Filipozzi <lfilipoz@emyr.net> Wed, 3 May 2000 20:50:30 -0700 |
1085 | |
1086 | -Local variables: |
1087 | -mode: debian-changelog |
1088 | -End: |
1089 | diff --git a/debian/control b/debian/control |
1090 | index 8f1ddad..017eb43 100644 |
1091 | --- a/debian/control |
1092 | +++ b/debian/control |
1093 | @@ -1,7 +1,8 @@ |
1094 | Source: nut |
1095 | Section: admin |
1096 | Priority: optional |
1097 | -Maintainer: Arnaud Quette <aquette@debian.org> |
1098 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
1099 | +XSBC-Original-Maintainer: Arnaud Quette <aquette@debian.org> |
1100 | Uploaders: Laurent Bigonville <bigon@debian.org> |
1101 | Build-Depends: debhelper (>= 12), |
1102 | dh-python, |
1103 | @@ -11,7 +12,6 @@ Build-Depends: debhelper (>= 12), |
1104 | libltdl-dev, |
1105 | libneon27-gnutls-dev | libneon27-dev, |
1106 | libnss3-dev, |
1107 | - libpowerman0-dev (>= 2.3.3), |
1108 | libsnmp-dev | libsnmp9-dev, |
1109 | libusb-dev (>= 0.1.8), |
1110 | libwrap0-dev (>= 7.6), |
1111 | @@ -136,22 +136,6 @@ Description: network UPS tools - XML/HTTP driver |
1112 | Eaton or MGE that use an XML/HTTP-based Network Management Card or |
1113 | Proxy. |
1114 | |
1115 | -Package: nut-powerman-pdu |
1116 | -Architecture: any |
1117 | -Depends: nut (>= 2.4.0), |
1118 | - powerman (>= 2.3.3), |
1119 | - ${misc:Depends}, |
1120 | - ${shlibs:Depends} |
1121 | -Description: network UPS tools - PowerMan PDU driver |
1122 | - Network UPS Tools (NUT) is a client/server monitoring system that |
1123 | - allows computers to share uninterruptible power supply (UPS) and |
1124 | - power distribution unit (PDU) hardware. Clients access the hardware |
1125 | - through the server, and are notified whenever the power status |
1126 | - changes. |
1127 | - . |
1128 | - This package provides powerman-pdu, which allows NUT clients to communicate |
1129 | - with the PowerMan daemon to support PDUs. |
1130 | - |
1131 | Package: nut-doc |
1132 | Architecture: all |
1133 | Section: doc |
1134 | diff --git a/debian/libnutclient0.symbols b/debian/libnutclient0.symbols |
1135 | index 8487ec8..4c3ccca 100644 |
1136 | --- a/debian/libnutclient0.symbols |
1137 | +++ b/debian/libnutclient0.symbols |
1138 | @@ -1,6 +1,7 @@ |
1139 | # SymbolsHelper-Confirmed: 2.7.4-9~ amd64 arm64 armel armhf hppa i386 ia64 m68k mips mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32 |
1140 | libnutclient.so.0 libnutclient0 #MINVER# |
1141 | * Build-Depends-Package: libnutclient-dev |
1142 | + (optional=templinst|arch=ppc64el)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_@Base 2.7.4 |
1143 | (c++)"nut::Client::Client()@Base" 2.7.3 |
1144 | (c++)"nut::Client::getDevice(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3 |
1145 | (c++)"nut::Client::getDeviceVariableValues(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 2.7.3 |
1146 | @@ -159,12 +160,12 @@ libnutclient.so.0 libnutclient0 #MINVER# |
1147 | (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 |
1148 | (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 |
1149 | (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 |
1150 | - (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 |
1151 | + (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 |
1152 | (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 |
1153 | (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 |
1154 | (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 |
1155 | (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~ |
1156 | - (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 |
1157 | + (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 |
1158 | (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 |
1159 | (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 |
1160 | (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 |
1161 | diff --git a/debian/nut-cgi.postinst b/debian/nut-cgi.postinst |
1162 | index bdb72a0..5d89f2b 100644 |
1163 | --- a/debian/nut-cgi.postinst |
1164 | +++ b/debian/nut-cgi.postinst |
1165 | @@ -17,6 +17,7 @@ case "$1" in |
1166 | # if ! groups nut | grep -qw dialout; then |
1167 | # adduser nut dialout |
1168 | # fi |
1169 | + adduser --quiet nut dialout |
1170 | |
1171 | # Ensure /etc/nut is readable/crossable for others |
1172 | if [ -d /etc/nut/ ] ; then |
1173 | diff --git a/debian/nut-powerman-pdu.install b/debian/nut-powerman-pdu.install |
1174 | deleted file mode 100644 |
1175 | index f0acaa4..0000000 |
1176 | --- a/debian/nut-powerman-pdu.install |
1177 | +++ /dev/null |
1178 | @@ -1 +0,0 @@ |
1179 | -debian/tmp/lib/nut/powerman-pdu |
1180 | diff --git a/debian/nut-powerman-pdu.manpages b/debian/nut-powerman-pdu.manpages |
1181 | deleted file mode 100644 |
1182 | index 43bbc81..0000000 |
1183 | --- a/debian/nut-powerman-pdu.manpages |
1184 | +++ /dev/null |
1185 | @@ -1 +0,0 @@ |
1186 | -debian/tmp/usr/share/man/man8/powerman-pdu.8 |
1187 | diff --git a/debian/nut-server.postinst b/debian/nut-server.postinst |
1188 | index 41b1d08..81c4d09 100644 |
1189 | --- a/debian/nut-server.postinst |
1190 | +++ b/debian/nut-server.postinst |
1191 | @@ -30,6 +30,7 @@ case "$1" in |
1192 | # if ! groups nut | grep -qw dialout; then |
1193 | # adduser nut dialout |
1194 | # fi |
1195 | + adduser --quiet nut dialout |
1196 | |
1197 | # make sure that conffiles are secured and have the correct ownerships |
1198 | # on first install |
Changelog:
- [√] old content and logical tag match as expected
- [√] changelog entry correct version and targeted codename
- [x] changelog entries correct
=> Minor change-log issue to resolve - see inline comment
- [√] update-maintainer has been run
Actual changes:
- [√] no upstream changes to consider
- [√] no further upstream version to consider
- [√] debian changes look safe
In particular the unsupported py2 drop is good.
Yes one might complain about a lost feature, but better than having broken code.
Old Delta: server. postinst, d/nut-cgi.postinst: /lib/udev/ rules.d/ 62-nut- usbups. rules shipped in nut-server).
- [√] dropped changes are ok to be dropped
- [-] nothing else to drop
These days I'm not sure anymore on 2f085675 "d/nut-
ensure nut is member of group dialout". Going back in time (a lot) this was added in 14.04
for upgrades from hardy. Debian switched in 0.44.1-3 to need the user to chown serials.
Maybe we keep it for 20.04 as the last release. But following that new installs (upgraders
will still have nut be a dialout member) are very++ unlikely to have classic serials.
For ipmi/usb based ports (what you'd expect today) udev rules will set things up correctly
(
When you do the minor update for the changelog, would you mind putting this into the commit
that adds nut to dialout like "Droppable after 20.04 <quote the above>"?
- [√] changes forwarded upstream/debian (if appropriate)
We discussed the O3 ppc symbols yesterday - thanks for adding the hint
New Delta:
- [√] no new patches added
Build/Test:
- [√] build is ok
- [√] sanity checks test fine (thanks for also doing dep8 in advance)