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: #602122.
See the debian/patches directory for the important fixes.
with other Lintian fixes according to newest policy standard.
Please let me know if it is ok to proceed with the NMU. Feel free to
contact if you have any questions.
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/changelog
wmbubble-1.46/debian/copyright
wmbubble-1.46/debian/rules
wmbubble-1.46/debian/control
wmbubble-1.46/debian/patches/00list
wmbubble-1.46/debian/README.source
wmbubble-1.46/debian/patches/11-gtk2-fix.dpatch
diffstat for wmbubble_1.46-2.1 wmbubble_1.46-2.2
debian/README.source | 7 ++++++
debian/patches/11-gtk2-fix.dpatch | 42 ++++++++++++++++++++++++++++++++++++
wmbubble-1.46/debian/changelog | 23 +++++++++++++++++++
wmbubble-1.46/debian/control | 9 ++++---
wmbubble-1.46/debian/copyright | 40 +++++++++++++++++++++++++---------
wmbubble-1.46/debian/patches/00list | 1
wmbubble-1.46/debian/rules | 4 +--
7 files changed, 110 insertions(+), 16 deletions(-)
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,26 @@
+wmbubble (1.46-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/changelog
+ - Remove obsolete Emacs variables form the end.
+ * debian/control
+ - (Build-Depends): Sync debhelper with debian/compat (Lintian).
+ - (Depends): Add ${misc:Depends} (Lintian).
+ - (Description): Delete extra space (Lintian).
+ - (Homepage): New field (Lintian).
+ * debian/copyright
+ - Point to GPL-2 (Lintian).
+ - Update layout. Add missing FSF preamble.
+ * debian/README.source
+ - New file. Document dpatch (Lintian).
+ * debian/rules
+ - (install): Update obsolete "dh_clean -k" to dh_prep (Lintian).
+ * debian/patches/11-gtk2-fix.dpatch
+ - Correct docking problem. Patch thanks to Tommaso Parisi
+ <tommasop...@libero.it> (Closes: #602122).
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 17 Mar 2011 13:34:30 +0200
+
wmbubble (1.46-2.1) unstable; urgency=low
* debian/control
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/rules wmbubble-1.46/debian/rules
--- wmbubble-1.46/debian/rules
+++ wmbubble-1.46/debian/rules
@@ -32,9 +32,9 @@
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, libx11-dev
-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/patches/00list wmbubble-1.46/debian/patches/00list
--- wmbubble-1.46/debian/patches/00list
+++ wmbubble-1.46/debian/patches/00list
@@ -10,0 +11 @@
+11-gtk2-fix
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/patches/11-gtk2-fix.dpatch
+++ wmbubble-1.46/debian/patches/11-gtk2-fix.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-gtk2-fix.dpatch by <tomm...@parisi.pisa.iol.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix bugs
+
+@DPATCH@
+--- wmbubble-1.46~/bubblemon.c 2011-03-16 09:35:40.000000000 +0100
++++ wmbubble-1.46/bubblemon.c 2011-03-16 09:43:41.000000000 +0100
+@@ -281,6 +281,7 @@
+
+ int main(int argc, char **argv)
+ {
++ setenv("GDK_NATIVE_WINDOWS", "1", 0);
+ char execute[256];
+ int proximity = 0;
+ int ch;
+@@ -581,7 +582,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 +600,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);
+
+@@ -616,6 +616,7 @@
+ /* makes the dockapp visible inside KDE wm */
+ gdk_window_show(bm.iconwin);
+ #endif
++ XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
+
+ /* We begin with zero bubbles */
+ bm.n_bubbles = 0;
