Dear maintainer, I have some free time and I'm offering help.
Here is the NMU diff according to DevRef 5.11.1[1][2] for bug: #549014. See the debian/patches directory for the important fixes. Please let me know it it is ok to proceed with the NMU. Thank you for maintaining the package, Jari Aalto [1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu [2] http://dep.debian.net/deps/dep1.html lsdiff(1) of changes: wmbubble-1.46/debian/rules wmbubble-1.46/debian/control wmbubble-1.46/debian/changelog wmbubble-1.46/debian/copyright wmbubble-1.46/debian/patches/04-default-upsidedown.dpatch wmbubble-1.46/debian/patches/10-gtk2-migration.dpatch wmbubble-1.46/debian/README.source wmbubble-1.46/debian/watch
diffstat for wmbubble_1.46-2 wmbubble_1.46-2.1 debian/README.source | 7 debian/watch | 4 wmbubble-1.46/debian/changelog | 28 +++ wmbubble-1.46/debian/control | 9 - wmbubble-1.46/debian/copyright | 40 +++-- wmbubble-1.46/debian/patches/04-default-upsidedown.dpatch | 25 ++- wmbubble-1.46/debian/patches/10-gtk2-migration.dpatch | 109 ++------------ wmbubble-1.46/debian/rules | 7 8 files changed, 113 insertions(+), 116 deletions(-) diff -u wmbubble-1.46/debian/rules wmbubble-1.46/debian/rules --- wmbubble-1.46/debian/rules +++ wmbubble-1.46/debian/rules @@ -25,15 +25,16 @@ dh_testdir dh_testroot rm -f build-stamp - $(MAKE) clean BINARY=wmbubble + $(MAKE) clean + rm -f wmbubble dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs - + $(MAKE) install PREFIX=$(CURDIR)/debian/wmbubble/usr BINARY=wmbubble dh_install misc/wak.wav misc/wakwak.sh usr/share/wmbubble/ chmod +x $(CURDIR)/debian/wmbubble/usr/share/wmbubble/wakwak.sh diff -u wmbubble-1.46/debian/control wmbubble-1.46/debian/control --- wmbubble-1.46/debian/control +++ wmbubble-1.46/debian/control @@ -2,14 +2,15 @@ Section: x11 Priority: optional Maintainer: John H. Robinson, IV <jaq...@debian.org> -Build-Depends: debhelper (>= 5.0), libgtk2.0-dev, dpatch -Standards-Version: 3.8.0.1 +Build-Depends: debhelper (>= 7), libgtk2.0-dev, dpatch, libx11-dev +Standards-Version: 3.9.1 +Homepage: http://www.ne.jp/asahi/linux/timecop Package: wmbubble Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: sox, x-terminal-emulator -Description: A system-load meter for Window Maker that features a duck +Description: A system-load meter for Window Maker that features a duck A Window Maker dockapp (though it does not specifically require the Window Maker window manager) that indicates the system load. . diff -u wmbubble-1.46/debian/changelog wmbubble-1.46/debian/changelog --- wmbubble-1.46/debian/changelog +++ wmbubble-1.46/debian/changelog @@ -1,3 +1,31 @@ +wmbubble (1.46-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control + - (Build-Depends): Add libx11-dev due to KDE_DOCKAPP. + Sync debhelper with debian/compat (Lintian). + - (Depends): Add ${misc:Depends} (Lintian). + - (Description): Delete extra space (Lintian). + - (Homepage): New field (Lintian). + - (Standards-Version): Update to 3.9.1. + * debian/copyright + - Point to GPL-2 (Lintian). + - Update layout. Add missing FSF preamble. + * debian/patches + - (Number 04): Refresh. Enable KDE_DOCKAPP to make duck appear + on WindowMaker (grave; Closes: #549014). + - (Number 12): Refresh. Update to Gtk 2.x by using --cflags. Add + -lX11 due to KDE_DOCKAPP. + * debian/README.source + - New file. Document dpatch (Lintian). + * debian/rules + - (clean): Delete binary manually. Makefile did not do it. + - (install): Update obsolete "dh_clean -k" to dh_prep (Lintian). + * debian/watch + - New file (Lintian). + + -- Jari Aalto <jari.aa...@cante.net> Thu, 21 Oct 2010 01:25:10 +0300 + wmbubble (1.46-2) unstable; urgency=low * Updated debhelper to compatibility level 7 diff -u wmbubble-1.46/debian/copyright wmbubble-1.46/debian/copyright --- wmbubble-1.46/debian/copyright +++ wmbubble-1.46/debian/copyright @@ -1,15 +1,35 @@ -This is Debian GNU/Linux's prepackaged version of timecop's bubblemon. +This package was debianized by: -This package was debianized by John H. Robinson, IV <jaq...@debian.org>. The -name was changed to wmbubble to prevent confusion between this package, and the -GNOME applet of the name bubblemon. + John H. Robinson, IV <jaq...@debian.org>. -It was downloaded from http://www.ne.jp/asahi/linux/timecop/ + The name was changed to wmbubble to prevent confusion between this + package, and the GNOME applet of the name bubblemon. -Upstream Author: time...@japan.co.jp +It was downloaded from: -Copyright (C) 2001 Tim Copperfield <time...@japan.co.jp> + http://www.ne.jp/asahi/linux/timecop -You are free to distribute this software under the terms of the GNU General -Public License. On Debian systems, the complete text of the GNU General Public -License can be found in /usr/share/common-licenses/GPL file. +Upstream Author: + + <time...@japan.co.jp> + +Copyright: + + Copyright (C) 2001 Tim Copperfield <time...@japan.co.jp> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +On Debian systems, the complete text of the GNU General +Public License can be found in "/usr/share/common-licenses/GPL-2". diff -u wmbubble-1.46/debian/patches/04-default-upsidedown.dpatch wmbubble-1.46/debian/patches/04-default-upsidedown.dpatch --- wmbubble-1.46/debian/patches/04-default-upsidedown.dpatch +++ wmbubble-1.46/debian/patches/04-default-upsidedown.dpatch @@ -1,18 +1,29 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 04-default-upsidedown.dpatch by John H. Robinson, IV <jaq...@debian.org>. +## /tmp/aa+04-refresh.patch.dpatch by jaalto <jari.aa...@cante.net> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: Make the possibility of the upsidedown duck a default +## DP: fb1bfdd +## DP: Author: Jari Aalto <jari.aa...@cante.net> +## DP: +## DP: +## DP: Make upsidedown duck a default. Enable KDE_DOCKAPP by by John H. +## DP: Robinson, IV <jaq...@debian.org> +## DP: +## DP: Signed-off-by: Jari Aalto <jari.aa...@cante.net> @DPATCH@ -diff -urNad wmbubble-1.46~/Makefile wmbubble-1.46/Makefile ---- wmbubble-1.46~/Makefile 2007-09-01 18:50:30.000000000 -0300 -+++ wmbubble-1.46/Makefile 2007-09-01 18:50:30.000000000 -0300 -@@ -3,7 +3,7 @@ + +diff --git a/Makefile b/Makefile +index 0672355..c7a8fce 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,8 +2,8 @@ + EXTRA = -DENABLE_DUCK EXTRA += -DENABLE_CPU EXTRA += -DENABLE_MEMSCREEN - # EXTRA += -DKDE_DOCKAPP +-# EXTRA += -DKDE_DOCKAPP -# EXTRA += -DUPSIDE_DOWN_DUCK ++EXTRA += -DKDE_DOCKAPP +EXTRA += -DUPSIDE_DOWN_DUCK # where to install this program diff -u wmbubble-1.46/debian/patches/10-gtk2-migration.dpatch wmbubble-1.46/debian/patches/10-gtk2-migration.dpatch --- wmbubble-1.46/debian/patches/10-gtk2-migration.dpatch +++ wmbubble-1.46/debian/patches/10-gtk2-migration.dpatch @@ -1,14 +1,23 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 10-gtk2-migration.dpatch by Julien BLACHE <jbla...@debian.org> +## /tmp/aa+10-aa.patch.dpatch by jaalto <jari.aa...@cante.net> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: Migrate wmbubble to use gtk2 instead of gtk1.2 +## DP: +## DP: Author: Jari Aalto <jari.aa...@cante.net> +## DP: +## DP: +## DP: Migrate wmbubble to use gtk2 instead of gtk1.2. Add Xlib by Julien +## DP: BLACHE <jbla...@debian.org> +## DP: +## DP: Signed-off-by: Jari Aalto <jari.aa...@cante.net> @DPATCH@ -diff -urNad wmbubble-1.46~/Makefile wmbubble-1.46/Makefile ---- wmbubble-1.46~/Makefile 2007-09-01 19:05:59.000000000 -0300 -+++ wmbubble-1.46/Makefile 2007-09-01 19:07:09.000000000 -0300 -@@ -16,7 +16,7 @@ + +diff --git a/Makefile b/Makefile +index ee9ad52..2d522d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,7 +16,7 @@ USER_CFLAGS = -O3 -ansi -Wall # USER_CFLAGS = -ansi -Wall -pg -O3 -DPRO # test coverage cflags # USER_CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g -DPRO @@ -17,12 +26,12 @@ CFLAGS = $(USER_CFLAGS) $(BUILD_CFLAGS) ${EXTRA} BINARY=bubblemon -@@ -28,21 +28,21 @@ +@@ -28,21 +28,21 @@ CC = gcc # special things for Linux ifeq ($(OS), Linux) OBJS += sys_linux.o - LIBS = `gtk-config --libs | sed "s/-lgtk//g"` -+ LIBS = `pkg-config gtk+-2.0 --libs | sed "s/-lgtk//g"` ++ LIBS = `pkg-config gtk+-2.0 --libs | sed "s/-lgtk//g"` -lX11 INSTALL = -m 755 endif @@ -45,84 +53,0 @@ -@@ -65,7 +65,7 @@ - endif - CFLAGS = $(USER_CFLAGS) $(BUILD_CFLAGS) ${EXTRA} - OBJS += sys_sunos.o -- LIBS = `gtk-config --libs` -lkstat -lm -+ LIBS = `pkg-config gtk+-2.0 --libs` -lkstat -lm - INSTALL = -m 755 - endif - -diff -urNad wmbubble-1.46~/bubblemon.c wmbubble-1.46/bubblemon.c ---- wmbubble-1.46~/bubblemon.c 2007-09-01 19:05:59.000000000 -0300 -+++ wmbubble-1.46/bubblemon.c 2007-09-01 19:07:40.000000000 -0300 -@@ -92,7 +92,7 @@ - #if defined(ENABLE_CPU) || defined(ENABLE_MEMSCREEN) - /* draw functions for load average / memory screens */ - static void draw_pixel(unsigned int x, unsigned int y, unsigned char *buf, -- unsigned char *c); -+ char *c); - static void draw_history(int num, int size, unsigned int *history, - unsigned char *buf); - static void draw_digit(int srcx, int srcy, int destx, int desty); -@@ -581,7 +581,7 @@ - attri.colormap = gdk_colormap_get_system(); - attri.wmclass_name = NAME; - attri.wmclass_class = NAME; -- attri.window_type = GDK_WINDOW_TOPLEVEL; -+ attri.window_type = GDK_WINDOW_CHILD; - - bm.iconwin = gdk_window_new(bm.win, &attri, - GDK_WA_TITLE | GDK_WA_WMCLASS); -@@ -599,7 +599,6 @@ - wmhints.window_group = win; - wmhints.flags = - StateHint | IconWindowHint | IconPositionHint | WindowGroupHint; -- XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints); - - bm.gc = gdk_gc_new(bm.win); - -@@ -617,6 +616,8 @@ - gdk_window_show(bm.iconwin); - #endif - -+ XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints); -+ - /* We begin with zero bubbles */ - bm.n_bubbles = 0; - -@@ -636,7 +637,8 @@ - static void bubblemon_update(int proximity) - { - Bubble *bubbles = bm.bubbles; -- unsigned int i, loadPercentage, *col, x, y; -+ unsigned int i, loadPercentage, x, y; -+ int *col; - unsigned char *ptr, *buf, *buf_ptr; - unsigned int aircolor, watercolor, aliascolor; - unsigned int waterlevels_goal; -@@ -963,7 +965,7 @@ - static void draw_digit(int srcx, int srcy, int destx, int desty) - { - int i, j; -- char *from, *to; -+ unsigned char *from, *to; - - for (j = 0; j < 8; j++) { - from = mem_screen + 56 * 3 * (srcy + j) + srcx * 3; -@@ -995,7 +997,7 @@ - } - - static void draw_pixel(unsigned int x, unsigned int y, unsigned char *buf, -- unsigned char *c) -+ char *c) - { - unsigned char *ptr; - ptr = buf + y * 56 * 3 + x * 3 + 6; /* +6 = x + 2 */ -@@ -1011,7 +1013,7 @@ - { - int pixels_per_byte; - int j, k; -- int *p; -+ unsigned int *p; - int d; - - pixels_per_byte = 100; only in patch2: unchanged: --- wmbubble-1.46.orig/debian/README.source +++ wmbubble-1.46/debian/README.source @@ -0,0 +1,7 @@ +Sources for Debian +------------------ + +This package uses patch system. See more information at +/usr/share/doc/dpatch/README.source.gz + + -- Jari Aalto <jari.aa...@cante.net>, Thu, 21 Oct 2010 01:19:17 +0300 only in patch2: unchanged: --- wmbubble-1.46.orig/debian/watch +++ wmbubble-1.46/debian/watch @@ -0,0 +1,4 @@ +version=3 +opts="filenamemangle=s/bubblemon-dockapp/wmbubblemon/" \ + http://www.ne.jp/asahi/linux/timecop/ .*bubblemon-dockapp-([\d.]+).*\.tar\.gz +
