[Pkg-xfce-commits] r376 - in goodies/xfce4-terminal/debian: . patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2005-12-20 11:53:38 +0000 (Tue, 20 Dec 2005)
New Revision: 376

Added:
   goodies/xfce4-terminal/debian/patches/02_fix-build-with-exo.patch
Modified:
   goodies/xfce4-terminal/debian/changelog
   goodies/xfce4-terminal/debian/rules
Log:
this patch fixes FTBS with exo svn


Modified: goodies/xfce4-terminal/debian/changelog
===================================================================
--- goodies/xfce4-terminal/debian/changelog	2005-12-20 08:25:22 UTC (rev 375)
+++ goodies/xfce4-terminal/debian/changelog	2005-12-20 11:53:38 UTC (rev 376)
@@ -3,11 +3,12 @@
   [ Yves-Alexis Perez ]
   * Changed default behaviour for the cycle tabs options
   * Changed dependance on libexo-0.3
+  * Added a patch to fix FTBS with libexo-0.3 svn
 
   [ Rudy Godoy ]
   * Fixed binary name on .desktop file call since we rename it to xfce4-terminal.
 
- -- Rudy Godoy <rudy at kernel-panik.org>  Wed, 23 Nov 2005 22:20:12 -0500
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 19 Dec 2005 23:42:03 +0100
 
 xfce4-terminal (0.2.4-3) unstable; urgency=low
 

Added: goodies/xfce4-terminal/debian/patches/02_fix-build-with-exo.patch
===================================================================
--- goodies/xfce4-terminal/debian/patches/02_fix-build-with-exo.patch	2005-12-20 08:25:22 UTC (rev 375)
+++ goodies/xfce4-terminal/debian/patches/02_fix-build-with-exo.patch	2005-12-20 11:53:38 UTC (rev 376)
@@ -0,0 +1,46 @@
+diff -pruN terminal.old/Makefile.in terminal/Makefile.in
+--- terminal.old/Makefile.in	2005-03-19 20:31:20.000000000 +0100
++++ terminal/Makefile.in	2005-12-20 12:33:54.000000000 +0100
+@@ -349,6 +349,7 @@ Terminal_LDFLAGS = \
+ 	-no-undefined							\
+ 	$(DBUS_LIBS)							\
+ 	$(EXO_LIBS)							\
++	/usr/lib/libxfcegui4.so						\
+ 	$(LIBSTARTUP_NOTIFICATION_LIBS)					\
+ 	$(VTE_LIBS)
+ 
+diff -pruN terminal.old/terminal-screen.c terminal/terminal-screen.c
+--- terminal.old/terminal-screen.c	2005-03-13 17:06:38.000000000 +0100
++++ terminal/terminal-screen.c	2005-12-20 12:28:41.000000000 +0100
+@@ -37,6 +37,8 @@
+ #include <unistd.h>
+ #endif
+ 
++#include <gdk/gdk.h>
++#include <gdk/gdkx.h>
+ #include <exo/exo.h>
+ 
+ #include <terminal/terminal-enum-types.h>
+diff -pruN terminal.old/terminal-shortcut-editor.c terminal/terminal-shortcut-editor.c
+--- terminal.old/terminal-shortcut-editor.c	2005-01-31 00:49:43.000000000 +0100
++++ terminal/terminal-shortcut-editor.c	2005-12-20 12:19:56.000000000 +0100
+@@ -26,6 +26,7 @@
+ #endif
+ 
+ #include <gdk/gdkkeysyms.h>
++#include <gdk/gdkx.h>
+ 
+ #include <terminal/terminal-preferences.h>
+ #include <terminal/terminal-shortcut-editor.h>
+diff -pruN terminal.old/terminal-window.c terminal/terminal-window.c
+--- terminal.old/terminal-window.c	2005-03-17 10:18:58.000000000 +0100
++++ terminal/terminal-window.c	2005-12-20 12:26:41.000000000 +0100
+@@ -37,6 +37,8 @@
+ #include <unistd.h>
+ #endif
+ 
++#include <libxfcegui4/libxfcegui4.h>
++
+ #include <exo/exo.h>
+ 
+ #include <gdk/gdkkeysyms.h>

Modified: goodies/xfce4-terminal/debian/rules
===================================================================
--- goodies/xfce4-terminal/debian/rules	2005-12-20 08:25:22 UTC (rev 375)
+++ goodies/xfce4-terminal/debian/rules	2005-12-20 11:53:38 UTC (rev 376)
@@ -21,4 +21,5 @@
 	perl -i -pe 's/for browser in mozilla/for browser in sensible-browser mozilla/' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
 	perl -i -pe 's#doc/Terminal/#doc/xfce4-terminal/html#' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
 	# .desktop file call to the right binary
-	perl -i -pe 's#Exec=Terminal#Exec=xfce4-terminal#' debian/xfce4-terminal/usr/share/applications/Terminal.desktop
\ No newline at end of file
+	perl -i -pe 's#Exec=Terminal#Exec=xfce4-terminal#' debian/xfce4-terminal/usr/share/applications/Terminal.desktop
+