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

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-15 06:30:20 +0000 (Tue, 15 May 2007)
New Revision: 3466

Added:
   trunk/cairo-java/debian/patches/05_pkgconfig_no_need_for_cairo.diff
Modified:
   trunk/cairo-java/debian/changelog
   trunk/cairo-java/debian/control
   trunk/cairo-java/debian/patches/series
Log:
add a new patch to fix #423525


Modified: trunk/cairo-java/debian/changelog
===================================================================
--- trunk/cairo-java/debian/changelog	2007-05-15 06:25:34 UTC (rev 3465)
+++ trunk/cairo-java/debian/changelog	2007-05-15 06:30:20 UTC (rev 3466)
@@ -3,10 +3,13 @@
   * New package, libcairo-java-dev, split from libcairo-jni and
     libcairo-cni, that:
     o contains library symlinks and pkg-config file
-    o depends on libcairo-jni, libcairo-cni and libcairo-java
+    o depends on libglib-java-dev
+    o pulls in libcairo-jni, libcairo-cni and libcairo-java
   * Add missing java-gcj-compat | java2-runtime dependency on libcairo-java.
+  * debian/patches/05_pkgconfig_no_need_for_cairo.diff: new patch to remove
+    `Requires: cairo' from cairo-java.pc. Closes: #423525.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Mon, 14 May 2007 19:01:04 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 06:40:15 +0000
 
 cairo-java (1.0.8-4) unstable; urgency=low
 

Modified: trunk/cairo-java/debian/control
===================================================================
--- trunk/cairo-java/debian/control	2007-05-15 06:25:34 UTC (rev 3465)
+++ trunk/cairo-java/debian/control	2007-05-15 06:30:20 UTC (rev 3466)
@@ -107,7 +107,7 @@
 Package: libcairo-java-dev
 Section: devel
 Architecture: any
-Depends: libcairo-jni (= ${binary:Version}), libcairo-cni (= ${binary:Version}), libcairo-java (= ${source:Version}), libglib-java-dev (>= 0.4.2-7)
+Depends: libglib-java-dev (>= 0.4.2-7), libcairo-jni (= ${binary:Version}), libcairo-cni (= ${binary:Version}), libcairo-java (= ${source:Version})
 Replaces: libcairo-java (<< 1.0.8-2), libcairo-jni (<< 1.0.8-5), libcairo-cni (<< 1.0.8-5)
 Description: Cairo bindings for Java (development files)
  The Java-Gnome project provides a framework for creating Gtk and Gnome

Added: trunk/cairo-java/debian/patches/05_pkgconfig_no_need_for_cairo.diff
===================================================================
--- trunk/cairo-java/debian/patches/05_pkgconfig_no_need_for_cairo.diff	                        (rev 0)
+++ trunk/cairo-java/debian/patches/05_pkgconfig_no_need_for_cairo.diff	2007-05-15 06:30:20 UTC (rev 3466)
@@ -0,0 +1,11 @@
+--- cairo-1.0.8.orig/cairo-java.pc.in	2007-05-14 20:50:41.000000000 +0000
++++ cairo-1.0.8/cairo-java.pc.in	2007-05-14 20:50:54.000000000 +0000
+@@ -8,7 +8,7 @@
+ Name: Cairo-Java
+ Description: Cairo Java bindings
+ Version: @VERSION@
+-Requires: cairo glib-java
++Requires: glib-java
+ api_version=@apiversion@
+ classpath=@INSTALLED_CLASSPATH@
+ jnilibs=-L at libdir@ -lcairojni

Modified: trunk/cairo-java/debian/patches/series
===================================================================
--- trunk/cairo-java/debian/patches/series	2007-05-15 06:25:34 UTC (rev 3465)
+++ trunk/cairo-java/debian/patches/series	2007-05-15 06:30:20 UTC (rev 3466)
@@ -1,3 +1,4 @@
 01_late_javadoc.diff
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff
+05_pkgconfig_no_need_for_cairo.diff