--- Begin Message ---
Package: xbindkeys-config
Version: 0.1.3-1
Severity: serious
Hi,
Gtk1.2 will not be shipping with Squeeze so xbindkeys-config will either
need to be ported to Gtk2 or removed from the archive.
I am attaching a debdiff that builds with Gtk2 as well as several other
fixes. Seems to work fine with the minimal testing I did. Hope you can
use it.
Thanks,
Barry deFreese
Debian QA
diff -u xbindkeys-config-0.1.3/Makefile xbindkeys-config-0.1.3/Makefile
--- xbindkeys-config-0.1.3/Makefile
+++ xbindkeys-config-0.1.3/Makefile
@@ -2,8 +2,8 @@
CC= gcc $(CFLAGS)
STD= _GNU_SOURCE
-GTK= `gtk-config --cflags --libs`
-GTK2= `gtk-config --cflags`
+GTK= `pkg-config --cflags --libs gtk+-2.0`
+GTK2= `pkg-config --cflags gtk+-2.0`
OBJS= xbindkeys_config.o menu.o middle.o speedc.o
NOM= xbindkeys_config
diff -u xbindkeys-config-0.1.3/middle.c xbindkeys-config-0.1.3/middle.c
--- xbindkeys-config-0.1.3/middle.c
+++ xbindkeys-config-0.1.3/middle.c
@@ -551,6 +551,8 @@
GtkWidget *window;
GtkWidget *text;
GtkWidget *src;
+ GtkTextBuffer *textbuffer;
+ GtkTextIter iter;
char line [1024];
unlink(TEMP_FILE);
@@ -561,11 +563,13 @@
gtk_window_set_title(GTK_WINDOW(window), "Generated File");
src = gtk_scrolled_window_new ( NULL, NULL );
gtk_widget_set_usize(src,500,400);
- text = gtk_text_new (NULL, NULL);
+ text = gtk_text_view_new ();
+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0);
gtk_container_add (GTK_CONTAINER(src), text);
while (fgets (line, sizeof(line), f))
- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL,
+ gtk_text_buffer_insert (textbuffer, &iter,
line, strlen(line));
gtk_container_add(GTK_CONTAINER(window),src);
diff -u xbindkeys-config-0.1.3/debian/menu xbindkeys-config-0.1.3/debian/menu
--- xbindkeys-config-0.1.3/debian/menu
+++ xbindkeys-config-0.1.3/debian/menu
@@ -1,5 +1,5 @@
-?package(xbindkeys-config):needs=X11 \
- section=Apps/Tools \
+?package(xbindkeys-config):needs="X11" \
+ section="Applications/System/Administration" \
title="XBindKeys-config" \
command="/usr/bin/xbindkeys-config" \
hints="Keys,Bind,Config" \
diff -u xbindkeys-config-0.1.3/debian/control
xbindkeys-config-0.1.3/debian/control
--- xbindkeys-config-0.1.3/debian/control
+++ xbindkeys-config-0.1.3/debian/control
@@ -5,8 +5,8 @@
-Build-Depends: debhelper (>> 4.0.0), libgtk1.2-dev
-Standards-Version: 3.5.10
+Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev
+Standards-Version: 3.8.0
Package: xbindkeys-config
Architecture: any
Depends: ${shlibs:Depends}, xbindkeys
-Description: An easy to use gtk program for configuring Xbindkeys.
- GTK Configure program for xbindkeys.
+Description: an easy to use gtk program for configuring Xbindkeys
+ GTK+ Configure program for xbindkeys.
diff -u xbindkeys-config-0.1.3/debian/rules xbindkeys-config-0.1.3/debian/rules
--- xbindkeys-config-0.1.3/debian/rules
+++ xbindkeys-config-0.1.3/debian/rules
@@ -1,14 +1,9 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
PACKAGE := xbindkeys-config
-pwd=$(shell pwd)
-TOPDIR := $(shell pwd)
-t = ${TOPDIR}/debian/xbindkeys-config
+t = $(CURDIR)/debian/xbindkeys-config
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -33,7 +28,7 @@
dh_testdir
dh_testroot
rm -f build-stamp
- -$(MAKE) clean
+ $(MAKE) clean
dh_clean
diff -u xbindkeys-config-0.1.3/debian/changelog
xbindkeys-config-0.1.3/debian/changelog
--- xbindkeys-config-0.1.3/debian/changelog
+++ xbindkeys-config-0.1.3/debian/changelog
@@ -1,3 +1,28 @@
+xbindkeys-config (0.1.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with Gtk2.
+ + Makefile: Use pkg-config instead of gtk-config.
+ + Change use of gtk_text with gtk_text_view.
+ * Rebuild to pickup newer X libs. (Closes: #367527).
+ * Lintian fixes: (Closes: #399774).
+ + Update FSF address in debian/copyright.
+ + Remove punctuation from short description.
+ + Quote strings in menu file.
+ + Thanks to Matti Pöllä for the fixes.
+ * Version path to GPL license in copyright.
+ * Add appropriate copyright holder to debian/copyright.
+ * Replace use of pwd with $(CURDIR) in rules.
+ * Replace GTK with GTK+ in description.
+ * Fix hyphen used as minus and what-is entry in manpage.
+ * Make clean not ignore errors.
+ * Bump debhelper build-dep to >> 5.0.0.
+ + Move DH_COMPAT from rules to debian/compat and set to 5.
+ * Bump Standards Version to 3.8.0.
+ + Menu policy transition.
+
+ -- Barry deFreese <bdefre...@debian.org> Thu, 19 Feb 2009 13:25:57 -0500
+
xbindkeys-config (0.1.3-1) unstable; urgency=low
* New Upstream Release.
diff -u xbindkeys-config-0.1.3/debian/copyright
xbindkeys-config-0.1.3/debian/copyright
--- xbindkeys-config-0.1.3/debian/copyright
+++ xbindkeys-config-0.1.3/debian/copyright
@@ -5,8 +5,9 @@
Upstream Author: Laurent Vuibert <lapina...@gmx.fr>
-Copyright:
+Copyright: Copyright (C) 2002 by Laurent VUIBERT <lapina...@gmx.fr>
+License:
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 dated June, 1991.
@@ -20,7 +21,7 @@
along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff -u xbindkeys-config-0.1.3/debian/xbindkeys-config.1
xbindkeys-config-0.1.3/debian/xbindkeys-config.1
--- xbindkeys-config-0.1.3/debian/xbindkeys-config.1
+++ xbindkeys-config-0.1.3/debian/xbindkeys-config.1
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.27.
.TH XBINDKEYS_CONFIG "1" "April 2002" "xbindkeys-config" "User Commands"
.SH NAME
-xbindkeys_config \- manual page for xbindkeys_config
+xbindkeys-config \- GTK+ configuration tool for xbindkeys
.SH "SYNOPSIS"
xbindkeys-config
-[--file|-f file]
-[--help|-h]
-[--show|-s]
+[\-\-file|\-f file]
+[\-\-help|\-h]
+[\-\-show|\-s]
.TP
\fB\-h\fR, \fB\-\-help\fR
This Help
only in patch2:
unchanged:
--- xbindkeys-config-0.1.3.orig/xbindkeys_config.c
+++ xbindkeys-config-0.1.3/xbindkeys_config.c
@@ -95,7 +95,8 @@
accel_group = gtk_accel_group_new();
menu=xbindkeys_config_menu(accel_group);
gtk_box_pack_start(GTK_BOX(vbox),menu,FALSE,FALSE,0);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+/* BDD - FIXME - Don't need this? */
+/* gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); */
middle= xbindkeys_config_middle();
gtk_box_pack_start(GTK_BOX(vbox),middle,TRUE,TRUE,0);
only in patch2:
unchanged:
--- xbindkeys-config-0.1.3.orig/menu.c
+++ xbindkeys-config-0.1.3/menu.c
@@ -283,6 +283,8 @@
GtkWidget *window;
GtkWidget *text;
GtkWidget *vbox;
+ GtkTextBuffer *textbuffer;
+ GtkTextIter iter;
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title(GTK_WINDOW(window),
@@ -293,10 +295,13 @@
text = gtk_label_new("\nManual\n");
gtk_box_pack_start(GTK_BOX(vbox), text, FALSE, FALSE, 0);
- text = gtk_text_new(NULL,NULL);
+/* BDD - FIXME */
+/* text = gtk_text_new(NULL,NULL); */
+ text = gtk_text_view_new();
+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0);
-
- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL,
+ gtk_text_buffer_insert (textbuffer, &iter,
MANUAL_TEXT, sizeof(MANUAL_TEXT)-1);
gtk_box_pack_start(GTK_BOX(vbox), text, TRUE, TRUE, 0);
gtk_widget_set_usize(text,300,250);
only in patch2:
unchanged:
--- xbindkeys-config-0.1.3.orig/debian/compat
+++ xbindkeys-config-0.1.3/debian/compat
@@ -0,0 +1 @@
+5
--- End Message ---
