[pkg-java] r3220 - in trunk/cairo-java/debian: . patches

[Thomas Girard]

Author: tgg
Date: 2007-04-14 21:34:15 +0000 (Sat, 14 Apr 2007)
New Revision: 3220

Added:
   trunk/cairo-java/debian/patches/05_dont_link_cairojni_against_glibjni.diff
Modified:
   trunk/cairo-java/debian/changelog
   trunk/cairo-java/debian/patches/series
Log:
add a new patch to prevent jni libraries interdepencies


Modified: trunk/cairo-java/debian/changelog
===================================================================
--- trunk/cairo-java/debian/changelog	2007-04-14 20:08:35 UTC (rev 3219)
+++ trunk/cairo-java/debian/changelog	2007-04-14 21:34:15 UTC (rev 3220)
@@ -6,16 +6,18 @@
     o move documentation into libcairo-java-doc package.
     o new package, libcairo-java-gcj, containing the GCJ binary compatible
       native code.
+  * Copy Ubuntu patches into debian/patches, and use quilt to handle them.
   * New packages libcairo-jni and libcairo-cni, split from libcairo-java so
     that the latter can be Arch:all.
   * Restore shlibs for libcairo-jni.
-  * Use quilt to manage patches.
   * Add autotools-dev build dependency.
   * Drop unneeded libfontconfig1-dev build-dependency.
   * Tighten build-dependency on libcairo2-dev.
   * Use "Cairo" instead of "CAIRO" in descriptions.
+  * New patch, 05_dont_link_cairojni_against_glibjni.diff, to prevent
+    libcairojni from linking against libglibjni.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Sat, 14 Apr 2007 20:06:30 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sat, 14 Apr 2007 21:32:20 +0000
 
 cairo-java (1.0.8-1) unstable; urgency=low
 

Added: trunk/cairo-java/debian/patches/05_dont_link_cairojni_against_glibjni.diff
===================================================================
--- trunk/cairo-java/debian/patches/05_dont_link_cairojni_against_glibjni.diff	2007-04-14 20:08:35 UTC (rev 3219)
+++ trunk/cairo-java/debian/patches/05_dont_link_cairojni_against_glibjni.diff	2007-04-14 21:34:15 UTC (rev 3220)
@@ -0,0 +1,27 @@
+
+Index: cairo-java-1.0.8/Makefile.am
+===================================================================
+--- cairo-java-1.0.8.orig/Makefile.am	2007-04-14 21:20:42.000000000 +0000
++++ cairo-java-1.0.8/Makefile.am	2007-04-14 21:21:17.000000000 +0000
+@@ -80,7 +80,7 @@
+ 
+ libcairojni_la_SOURCES = $(jni_cairo_source_files)
+ AM_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(GLIB_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir) $(JNI_INCLUDES) -Isrc/jni
+-libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(JGJNI_LIBS) -release $(apiversion)
++libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) -release $(apiversion)
+ 
+ # automake should support generating versioned jars
+ cairo_jardir = $(jardir)
+Index: cairo-java-1.0.8/Makefile.in
+===================================================================
+--- cairo-java-1.0.8.orig/Makefile.in	2007-04-14 21:21:27.000000000 +0000
++++ cairo-java-1.0.8/Makefile.in	2007-04-14 21:21:37.000000000 +0000
+@@ -468,7 +468,7 @@
+ @BUILD_GCJ_TRUE at libcairojava_la_LDFLAGS = $(JGJAVA_LIBS) -release $(apiversion)
+ libcairojni_la_SOURCES = $(jni_cairo_source_files)
+ AM_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(GLIB_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir) $(JNI_INCLUDES) -Isrc/jni
+-libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(JGJNI_LIBS) -release $(apiversion)
++libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) -release $(apiversion)
+ 
+ # automake should support generating versioned jars
+ cairo_jardir = $(jardir)

Modified: trunk/cairo-java/debian/patches/series
===================================================================
--- trunk/cairo-java/debian/patches/series	2007-04-14 20:08:35 UTC (rev 3219)
+++ trunk/cairo-java/debian/patches/series	2007-04-14 21:34:15 UTC (rev 3220)
@@ -2,3 +2,4 @@
 02_dont_install_jar.diff
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff
+05_dont_link_cairojni_against_glibjni.diff