[pkg-java] r3248 - in trunk/libgtk-java/debian: . patches

[Thomas Girard]

Author: tgg
Date: 2007-04-15 17:22:50 +0000 (Sun, 15 Apr 2007)
New Revision: 3248

Added:
   trunk/libgtk-java/debian/patches/05_link_libgtkjava_libcairojava.diff
Modified:
   trunk/libgtk-java/debian/changelog
   trunk/libgtk-java/debian/patches/series
Log:
libgtkjava must be linked against libcairojava


Modified: trunk/libgtk-java/debian/changelog
===================================================================
--- trunk/libgtk-java/debian/changelog	2007-04-15 16:01:14 UTC (rev 3247)
+++ trunk/libgtk-java/debian/changelog	2007-04-15 17:22:50 UTC (rev 3248)
@@ -1,8 +1,10 @@
 libgtk-java (2.10.2-2) experimental; urgency=low
 
   * Fix the libgtk-java-gcj dependency on libgtk-java.
+  * New patch, 05_link_libgtkjava_libcairojava.diff, to make sure libgtkjava
+    is linked with libcairojava.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Sun, 15 Apr 2007 15:59:32 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sun, 15 Apr 2007 16:47:43 +0000
 
 libgtk-java (2.10.2-1) experimental; urgency=low
 

Added: trunk/libgtk-java/debian/patches/05_link_libgtkjava_libcairojava.diff
===================================================================
--- trunk/libgtk-java/debian/patches/05_link_libgtkjava_libcairojava.diff	2007-04-15 16:01:14 UTC (rev 3247)
+++ trunk/libgtk-java/debian/patches/05_link_libgtkjava_libcairojava.diff	2007-04-15 17:22:50 UTC (rev 3248)
@@ -0,0 +1,13 @@
+Index: libgtk-java-2.10.2/Makefile.in
+===================================================================
+--- libgtk-java-2.10.2.orig/Makefile.in	2007-04-15 16:46:59.000000000 +0000
++++ libgtk-java-2.10.2/Makefile.in	2007-04-15 16:47:14.000000000 +0000
+@@ -1521,7 +1521,7 @@
+ JAVAH = @JAVAH@
+ JGJAR = @JGJAR@
+ JGJAVA_CFLAGS = @JGJAVA_CFLAGS@
+-JGJAVA_LIBS = @JGJAVA_LIBS@
++JGJAVA_LIBS = -lcairojava -lcairo @JGJAVA_LIBS@
+ JGJNI_LIBS = @JGJNI_LIBS@
+ JNI_INCLUDES = @JNI_INCLUDES@
+ LDFLAGS = @LDFLAGS@

Modified: trunk/libgtk-java/debian/patches/series
===================================================================
--- trunk/libgtk-java/debian/patches/series	2007-04-15 16:01:14 UTC (rev 3247)
+++ trunk/libgtk-java/debian/patches/series	2007-04-15 17:22:50 UTC (rev 3248)
@@ -2,3 +2,4 @@
 02_dont_install_jar.diff
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff
+05_link_libgtkjava_libcairojava.diff