diff -Nru wmbattery-2.48/acpi.c wmbattery-2.50/acpi.c --- wmbattery-2.48/acpi.c 2015-05-14 15:02:44.000000000 +0000 +++ wmbattery-2.50/acpi.c 2015-08-30 23:58:13.000000000 +0000 @@ -226,6 +226,7 @@ acpi_labels[label_info]); snprintf(statusarray[i], sizeof(statusarray[i]), SYSFS_PATH "/%s/%s", devices[i], acpi_labels[label_status]); + free(devices[i]); } free(devices); diff -Nru wmbattery-2.48/ChangeLog wmbattery-2.50/ChangeLog --- wmbattery-2.48/ChangeLog 2015-05-14 15:02:44.000000000 +0000 +++ wmbattery-2.50/ChangeLog 2015-08-30 23:58:13.000000000 +0000 @@ -1,3 +1,20 @@ +wmbattery (2.50) + * Free memory allocated by strdup. This corrects a mistake in [1] noticed by + Andrew Shadura [2]. + + [1] http://repo.or.cz/dockapps.git/commitdiff/29e5012 + [2] https://github.com/d-torrance/wmbattery/commit/ + 9f7be30#commitcomment-12965145 + +wmbattery (2.49) + * Add config.h.in to `make distclean`. Its absence created a problem for the + Debian package. During the build, dh_auto_clean results in a call to + autoheader, which creates config.h.in. If this isn't then removed, we get + a dpkg-source error. Obtained from [1]. + + [1] https://sources.debian.net/src/wmbattery/2.48-1/debian/patches/ + clean_config.h.in.patch/ + wmbattery (2.48) * Escape hyphen in manpage. Fixes hyphen-used-as-minus-sign Lintian warning in the Debian package. Patch from [1]. diff -Nru wmbattery-2.48/configure.ac wmbattery-2.50/configure.ac --- wmbattery-2.48/configure.ac 2015-05-14 15:02:44.000000000 +0000 +++ wmbattery-2.50/configure.ac 2015-08-30 23:58:13.000000000 +0000 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(wmbattery.c, 2.48) +AC_INIT(wmbattery.c, 2.50) AC_CONFIG_HEADER(config.h) AC_CONFIG_AUX_DIR(autoconf) diff -Nru wmbattery-2.48/debian/changelog wmbattery-2.50/debian/changelog --- wmbattery-2.48/debian/changelog 2015-05-14 15:58:37.000000000 +0000 +++ wmbattery-2.50/debian/changelog 2015-08-30 21:31:19.000000000 +0000 @@ -1,3 +1,17 @@ +wmbattery (2.50-1) unstable; urgency=medium + + * New upstream release. + * debian/control + - Update Vcs-* fields. + - Set Debian Window Maker Team as Maintainer; move myself to + Uploaders with updated email address. + * debian/copyright + - Update email address. + * debian/patches + - Remove directory; patch applied upstream. + + -- Doug Torrance Sun, 30 Aug 2015 17:31:19 -0400 + wmbattery (2.48-1) unstable; urgency=medium * New upstream release. @@ -6,7 +20,7 @@ * debian/patches/escape_manpage_hyphens.patch - Remove patch; applied upstream. * debian/control - - Tidy using wrap-and-sort. + - Tidy up using wrap-and-sort. -- Doug Torrance Thu, 14 May 2015 10:06:49 -0500 diff -Nru wmbattery-2.48/debian/control wmbattery-2.50/debian/control --- wmbattery-2.48/debian/control 2015-05-14 15:03:06.000000000 +0000 +++ wmbattery-2.50/debian/control 2015-08-30 21:29:45.000000000 +0000 @@ -7,11 +7,12 @@ libupower-glib-dev, libxext-dev, libxpm-dev -Maintainer: Doug Torrance +Maintainer: Debian Window Maker Team +Uploaders: Doug Torrance Standards-Version: 3.9.6 Homepage: http://windowmaker.org/dockapps/?name=wmbattery -Vcs-Browser: https://github.com/d-torrance/wmbattery -Vcs-Git: https://github.com/d-torrance/wmbattery.git +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-wmaker/wmbattery.git +Vcs-Git: https://anonscm.debian.org/git/pkg-wmaker/wmbattery.git Package: wmbattery Architecture: any diff -Nru wmbattery-2.48/debian/copyright wmbattery-2.50/debian/copyright --- wmbattery-2.48/debian/copyright 2015-05-14 15:03:06.000000000 +0000 +++ wmbattery-2.50/debian/copyright 2015-08-30 21:29:45.000000000 +0000 @@ -14,7 +14,7 @@ Files: debian/* Copyright: 1998-2014 Joey Hess - 2014 Doug Torrance + 2014 Doug Torrance License: GPL-2 License: GPL-2 diff -Nru wmbattery-2.48/debian/patches/clean_config.h.in.patch wmbattery-2.50/debian/patches/clean_config.h.in.patch --- wmbattery-2.48/debian/patches/clean_config.h.in.patch 2015-05-14 15:48:52.000000000 +0000 +++ wmbattery-2.50/debian/patches/clean_config.h.in.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: Add config.h.in to `make distclean`. - Note that dh_auto_clean results in a call to autoheader, which creates - config.h.in. If this isn't then removed, we get a dpkg-source error. -Author: Doug Torrance -Last-Update: 2015-05-14 - ---- a/Makefile -+++ b/Makefile -@@ -6,7 +6,8 @@ - rm -f wmbattery *.o - - distclean: clean -- rm -f config.status config.cache config.log makeinfo config.h configure -+ rm -f config.status config.cache config.log makeinfo config.h \ -+ config.h.in configure - - install: all - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(icondir) diff -Nru wmbattery-2.48/debian/patches/series wmbattery-2.50/debian/patches/series --- wmbattery-2.48/debian/patches/series 2015-05-14 15:31:32.000000000 +0000 +++ wmbattery-2.50/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -clean_config.h.in.patch diff -Nru wmbattery-2.48/Makefile wmbattery-2.50/Makefile --- wmbattery-2.48/Makefile 2015-05-14 15:02:44.000000000 +0000 +++ wmbattery-2.50/Makefile 2015-08-30 23:58:13.000000000 +0000 @@ -6,7 +6,8 @@ rm -f wmbattery *.o distclean: clean - rm -f config.status config.cache config.log makeinfo config.h configure + rm -f config.status config.cache config.log makeinfo config.h \ + config.h.in configure install: all $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(icondir)