r12680 - in packages/trunk/gamine/debian: . patches

[Ansgar Burchardt]

Author: ansgar
Date: 2011-09-16 08:41:08 +0000 (Fri, 16 Sep 2011)
New Revision: 12680

Added:
   packages/trunk/gamine/debian/patches/link-X11.diff
Modified:
   packages/trunk/gamine/debian/changelog
   packages/trunk/gamine/debian/control
   packages/trunk/gamine/debian/patches/series
Log:
* Team upload.
* Build-depend on libx11-dev and link with -lX11 as gamine uses
  XGrabKeyboard. (Closes: #615717)

Modified: packages/trunk/gamine/debian/changelog
===================================================================
--- packages/trunk/gamine/debian/changelog	2011-09-16 08:39:35 UTC (rev 12679)
+++ packages/trunk/gamine/debian/changelog	2011-09-16 08:41:08 UTC (rev 12680)
@@ -1,9 +1,12 @@
-gamine (1.1-2) UNRELEASED; urgency=low
+gamine (1.1-2) unstable; urgency=low
 
+  * Team upload.
   * Use source format 3.0 (quilt).
   * Remove empty postinst and prerm scripts.
+  * Build-depend on libx11-dev and link with -lX11 as gamine uses
+    XGrabKeyboard. (Closes: #615717)
 
- -- Ansgar Burchardt <ansgar at debian.org>  Mon, 14 Mar 2011 16:06:14 +0100
+ -- Ansgar Burchardt <ansgar at debian.org>  Mon, 14 Mar 2011 16:18:23 +0100
 
 gamine (1.1-1) unstable; urgency=low
 

Modified: packages/trunk/gamine/debian/control
===================================================================
--- packages/trunk/gamine/debian/control	2011-09-16 08:39:35 UTC (rev 12679)
+++ packages/trunk/gamine/debian/control	2011-09-16 08:41:08 UTC (rev 12680)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
 Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, libcairo2-dev,
- libgstreamer0.10-dev, docbook-to-man, libgconf2-dev
+ libgstreamer0.10-dev, docbook-to-man, libgconf2-dev, libx11-dev
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-games/packages/trunk/gamine/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/gamine/
@@ -12,7 +12,7 @@
 
 Package: gamine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gamine-data  (= ${source:Version}), gstreamer0.10-plugins-good
+Depends: ${shlibs:Depends}, ${misc:Depends}, gamine-data (= ${source:Version}), gstreamer0.10-plugins-good
 Description: an interactive game for young children
  Gamine is a game designed for 2 years old children who are not able to use
  a keyboard.

Added: packages/trunk/gamine/debian/patches/link-X11.diff
===================================================================
--- packages/trunk/gamine/debian/patches/link-X11.diff	                        (rev 0)
+++ packages/trunk/gamine/debian/patches/link-X11.diff	2011-09-16 08:41:08 UTC (rev 12680)
@@ -0,0 +1,15 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Mon, 14 Mar 2011 16:15:28 +0100
+Subject: Link with -lX11 as gamine uses XGrabKeyboard
+Bug-Debian: http://bugs.debian.org/615717
+--- gamine.orig/Makefile
++++ gamine/Makefile
+@@ -16,7 +16,7 @@
+ CFLAGS = -Wall
+ #CFLAGS = -Wall -g 
+ CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
+-LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
++LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -lX11 -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
+ LDFLAGS = -g 
+ CC = gcc
+ target = gamine

Modified: packages/trunk/gamine/debian/patches/series
===================================================================
--- packages/trunk/gamine/debian/patches/series	2011-09-16 08:39:35 UTC (rev 12679)
+++ packages/trunk/gamine/debian/patches/series	2011-09-16 08:41:08 UTC (rev 12680)
@@ -1 +1,2 @@
 makefile-DESTDIR.diff
+link-X11.diff