Bug#517324: Build-depends on deprecated gdk-pixbuf

[Barry deFreese]

tags 517324 + patch

thank you
Hi,

Attached is a patch that fixes this issue along with the other two bugs 
and some packaging updates.  Hope it helps.

Thanks,

Barry deFreese
Debian QA



diff -u wmdrawer-0.10.5/Makefile wmdrawer-0.10.5/Makefile
--- wmdrawer-0.10.5/Makefile
+++ wmdrawer-0.10.5/Makefile
@@ -16,8 +16,8 @@
 DOCDIR = $(PREFIX)/share/doc
 
 # Image library
-USE_GDKPIXBUF = 1
-#USE_GDKPIXBUF2 = 1
+#USE_GDKPIXBUF = 1
+USE_GDKPIXBUF2 = 1
 #USE_IMLIB = 1
 
 DEFS = $(OS)
@@ -62,7 +62,6 @@
 
 wmdrawer : $(OBJS)
        $(CC) $(LDFLAGS) -o $@ $(OBJS)
-       strip $@
 
 clean :
        $(RM) *.o $(PRGS)
diff -u wmdrawer-0.10.5/debian/changelog wmdrawer-0.10.5/debian/changelog
--- wmdrawer-0.10.5/debian/changelog
+++ wmdrawer-0.10.5/debian/changelog
@@ -1,3 +1,19 @@
+wmdrawer (0.10.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build with Gtk2 instead of libgdk-pixbuf. (Closes: #517324).
+  * Fix menu syntax and section. (Closes: #309555).
+  * Remove strip from Makefile. (Closes: #438269).
+  * Add appropriate copyright holders in debian/copyright.
+  * Make clean not ignore errors.
+  * Convert debian/copyright to UTF-8.
+  * Remove /usr/sbin from dirs.
+  * Bump debhelper build-dep and compat to 5.
+  * Bump Standards Version to 3.8.0.
+    + Menu policy transition.
+
+ -- Barry deFreese <bdefre...@debian.org>  Sun, 01 Mar 2009 21:48:31 -0500
+
 wmdrawer (0.10.5-1) unstable; urgency=low
 
   * Initial Release.
diff -u wmdrawer-0.10.5/debian/compat wmdrawer-0.10.5/debian/compat
--- wmdrawer-0.10.5/debian/compat
+++ wmdrawer-0.10.5/debian/compat
@@ -1 +1 @@
-4
+5
diff -u wmdrawer-0.10.5/debian/wmdrawer.1 wmdrawer-0.10.5/debian/wmdrawer.1
--- wmdrawer-0.10.5/debian/wmdrawer.1
+++ wmdrawer-0.10.5/debian/wmdrawer.1
@@ -56,7 +56,7 @@
 wmdrawer \(em a dockapp providing a drawer to launch applications 
 .SH "SYNOPSIS" 
 .PP 
-\fBwmdrawer\fR [\fB-c, --configfile=\fIFILE\fR\fP [\fB-n, 
--instancename=\fINAME\fR\fP]]  [\fB-w, --windowed\fP]  [\fB-h, --help\fP]  
[\fB-v, --version\fP]  
+\fBwmdrawer\fR [\fB-c, \-\-configfile=\fIFILE\fR\fP [\fB-n, 
\-\-instancename=\fINAME\fR\fP]]  [\fB-w, \-\-windowed\fP]  [\fB-h, 
\-\-help\fP]  [\fB-v, \-\-version\fP]  
 .SH "DESCRIPTION" 
 .PP 
 \fBwmdrawer\fR is a dock application (dockapp) that 
@@ -207,8 +207,8 @@
 # Each button must be defined with this syntax: 
 # (tooltip)  (image)  (command) 
 [column] 
-(X Terminal)   (gnome-term.png)        (xterm -bg black -fg wheat) 
-(Galeon)       (galeon.xpm)            (galeon -s) 
+(X Terminal)   (gnome-term.png)        (xterm \-bg black \-fg wheat) 
+(Galeon)       (galeon.xpm)            (galeon \-s) 
 (Sylpheed)     (sylpheed.png)          (sylpheed) 
 (XChat)                (xchat.png)             (xchat) 
 (MPlayer)      (gnome-multimedia.png)  (mplayer) 
diff -u wmdrawer-0.10.5/debian/dirs wmdrawer-0.10.5/debian/dirs
--- wmdrawer-0.10.5/debian/dirs
+++ wmdrawer-0.10.5/debian/dirs
@@ -2 +1,0 @@
-usr/sbin
diff -u wmdrawer-0.10.5/debian/menu wmdrawer-0.10.5/debian/menu
--- wmdrawer-0.10.5/debian/menu
+++ wmdrawer-0.10.5/debian/menu
@@ -1,2 +1,2 @@
-?package(wmdrawer):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\
+?package(wmdrawer):needs="X11" section="Applications/System/Administration"\
   title="wmdrawer" command="/usr/bin/wmdrawer"
diff -u wmdrawer-0.10.5/debian/copyright wmdrawer-0.10.5/debian/copyright
--- wmdrawer-0.10.5/debian/copyright
+++ wmdrawer-0.10.5/debian/copyright
@@ -3,9 +3,13 @@
 
 It was downloaded from http://people.easter-eggs.org/~valos/wmdrawer/
 
-Upstream Author: Valéry Febvre vfeb...@vfebvre.lautre.net
+Upstream Author: Valéry Febvre vfeb...@vfebvre.lautre.net
+
+Copyright:
+       Copyright (C) 2001 Ren▒ Scharfe     <l.s.r at web dot de>
+       Copyright (C) 2001,1999 Sasha Vasko <sashav at sprintmail dot com>
+       Copyright (C) 2002-2004 by Valery Febvre, FRANCE
 
-Copyright: GPL-2
 
 wmdrawer was written by Val\xe9ry Febvre, and it is distributed under 
 the terms of the GNU General Public License version 2.
diff -u wmdrawer-0.10.5/debian/control wmdrawer-0.10.5/debian/control
--- wmdrawer-0.10.5/debian/control
+++ wmdrawer-0.10.5/debian/control
@@ -2,8 +2,8 @@
 Section: x11
 Priority: optional
 Maintainer: Francois Gurin <mat...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libgdk-pixbuf-dev
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev
+Standards-Version: 3.8.0
 
 Package: wmdrawer
 Architecture: any
diff -u wmdrawer-0.10.5/debian/rules wmdrawer-0.10.5/debian/rules
--- wmdrawer-0.10.5/debian/rules
+++ wmdrawer-0.10.5/debian/rules
@@ -45,7 +45,7 @@
        rm -f build-stamp configure-stamp
 
        # Add here commands to clean up after the build process.
-       -$(MAKE) clean
+       $(MAKE) clean
 
        dh_clean