Hi,
Here is a big NMU that I will probably upload around the end of January
if you do not get a chance to get to it.
Thanks,
Barry deFreese
diff -u cccd-0.3beta4/Makefile cccd-0.3beta4/Makefile
--- cccd-0.3beta4/Makefile
+++ cccd-0.3beta4/Makefile
@@ -14,18 +14,18 @@
-CFLAGS = -O2 -Wall `gtk-config --cflags`
+CFLAGS = -O2 -Wall `pkg-config --cflags gtk+-2.0`
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g -DDEBUG
endif
-#LDFLAGS = -lefence `gtk-config --libs`
-LDFLAGS = `gtk-config --libs`
+#LDFLAGS = -lefence `pkg-config --libs gtk+-2.0`
+LDFLAGS = -L/usr/lib `pkg-config --libs gtk+-2.0`
# production flags (no debugging)
-#CFLAGS = -O2 -Wall `gtk-config --cflags`
-#LDFLAGS = -s `gtk-config --libs`
+#CFLAGS = -O2 -Wall `pkg-config --cflags gtk+-2.0`
+#LDFLAGS = -s `pkg-config --libs gtk+-2.0`
prefix=/usr/local
bindir=$(prefix)/bin
diff -u cccd-0.3beta4/debian/changelog cccd-0.3beta4/debian/changelog
--- cccd-0.3beta4/debian/changelog
+++ cccd-0.3beta4/debian/changelog
@@ -1,3 +1,17 @@
+cccd (0.3beta4-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with Gtk2.
+ + Build-dep libgtk2.0-dev instead of libgtk1.2-dev.
+ + Thanks to Lars Friedrichs for the patch.
+ * Bump debhelper build-dep and compat to 5.
+ * Make clean not ignore errors.
+ * Fix copyright holders in debian/copyright.
+ * Bump Standards Version to 3.8.0.
+ + Menu policy transition.
+
+ -- Barry deFreese <bdefre...@debian.org> Wed, 07 Jan 2009 16:32:24 -0500
+
cccd (0.3beta4-6) unstable; urgency=low
* Fix debian/copyright (Closes: #302936). Actually this was fixed already,
diff -u cccd-0.3beta4/debian/compat cccd-0.3beta4/debian/compat
--- cccd-0.3beta4/debian/compat
+++ cccd-0.3beta4/debian/compat
@@ -1 +1 @@
-4
+5
diff -u cccd-0.3beta4/debian/menu cccd-0.3beta4/debian/menu
--- cccd-0.3beta4/debian/menu
+++ cccd-0.3beta4/debian/menu
@@ -1,3 +1,3 @@
-?package(cccd):needs="X11" section="Apps/Sound" \
+?package(cccd):needs="X11" section="Applications/Sound" \
title="cccd" command="/usr/bin/cccd"
diff -u cccd-0.3beta4/debian/copyright cccd-0.3beta4/debian/copyright
--- cccd-0.3beta4/debian/copyright
+++ cccd-0.3beta4/debian/copyright
@@ -4,7 +4,9 @@
There's no upstream homepage at the moment, I got the tarball from the
upstream maintainer by email...
-Copyright Holder: Jochen A. Stein <j...@nitsfans.org>
+Copyright:
+ Copyright (c) 1998 by Jochen Stein, j...@writeme.com
+ Copyright (c) 1998 by Sven Riedel, sven.rie...@heim8.tu-clausthal.de
License:
diff -u cccd-0.3beta4/debian/control cccd-0.3beta4/debian/control
--- cccd-0.3beta4/debian/control
+++ cccd-0.3beta4/debian/control
@@ -2,8 +2,8 @@
Section: sound
Priority: extra
Maintainer: Uwe Hermann <u...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libgtk1.2-dev
-Standards-Version: 3.6.2.0
+Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev
+Standards-Version: 3.8.0
Package: cccd
Architecture: any
@@ -17 +16,0 @@
-
diff -u cccd-0.3beta4/debian/rules cccd-0.3beta4/debian/rules
--- cccd-0.3beta4/debian/rules
+++ cccd-0.3beta4/debian/rules
@@ -20,14 +20,14 @@
build-stamp: configure-stamp
dh_testdir
- $(MAKE)
+ [ ! -f Makefile ] || $(MAKE)
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- -$(MAKE) clean
+ $(MAKE) clean
dh_clean
install: build
only in patch2:
unchanged:
--- cccd-0.3beta4.orig/info.c
+++ cccd-0.3beta4/info.c
@@ -841,7 +841,7 @@
GtkWidget *window, *box, *clist, *button;
alternate_selected = matches;
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_signal_connect(GTK_OBJECT(window), "destroy",
GTK_SIGNAL_FUNC(alternate_quit), NULL);
gtk_window_set_title(GTK_WINDOW(window), "Select Category");
only in patch2:
unchanged:
--- cccd-0.3beta4.orig/cccd.c
+++ cccd-0.3beta4/cccd.c
@@ -102,7 +102,6 @@
tooltipcolor.green = 59113;
tooltipcolor.blue = 35979;
gdk_color_alloc(colormap, &tooltipcolor);
- gtk_tooltips_set_colors(tooltip, &tooltipcolor,
&window->style->fg[GTK_STATE_NORMAL]);
gtk_window_set_title(GTK_WINDOW(window), "cccd Panel");
gtk_signal_connect(GTK_OBJECT(window), "destroy",
