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

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-15 18:09:16 +0000 (Tue, 15 May 2007)
New Revision: 3480

Added:
   trunk/cairo-java/debian/patches/05_pkgconfig_drop_requires.diff
Removed:
   trunk/cairo-java/debian/patches/05_pkgconfig_no_need_for_cairo.diff
Modified:
   trunk/cairo-java/debian/changelog
   trunk/cairo-java/debian/patches/series
Log:
rework pkg-config files again


Modified: trunk/cairo-java/debian/changelog
===================================================================
--- trunk/cairo-java/debian/changelog	2007-05-15 16:04:27 UTC (rev 3479)
+++ trunk/cairo-java/debian/changelog	2007-05-15 18:09:16 UTC (rev 3480)
@@ -6,10 +6,10 @@
     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.
+  * debian/patches/05_pkgconfig_drop_requires.diff: new patch to remove
+    Requires: section from cairo-java.pc. Closes: #423525.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 06:40:15 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 17:45:35 +0000
 
 cairo-java (1.0.8-4) unstable; urgency=low
 

Added: trunk/cairo-java/debian/patches/05_pkgconfig_drop_requires.diff
===================================================================
--- trunk/cairo-java/debian/patches/05_pkgconfig_drop_requires.diff	                        (rev 0)
+++ trunk/cairo-java/debian/patches/05_pkgconfig_drop_requires.diff	2007-05-15 18:09:16 UTC (rev 3480)
@@ -0,0 +1,10 @@
+--- 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,6 @@
+ Name: Cairo-Java
+ Description: Cairo Java bindings
+ Version: @VERSION@
+-Requires: cairo glib-java
+ api_version=@apiversion@
+ classpath=@INSTALLED_CLASSPATH@
+ jnilibs=-L at libdir@ -lcairojni

Deleted: trunk/cairo-java/debian/patches/05_pkgconfig_no_need_for_cairo.diff
===================================================================
--- trunk/cairo-java/debian/patches/05_pkgconfig_no_need_for_cairo.diff	2007-05-15 16:04:27 UTC (rev 3479)
+++ trunk/cairo-java/debian/patches/05_pkgconfig_no_need_for_cairo.diff	2007-05-15 18:09:16 UTC (rev 3480)
@@ -1,11 +0,0 @@
---- 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 16:04:27 UTC (rev 3479)
+++ trunk/cairo-java/debian/patches/series	2007-05-15 18:09:16 UTC (rev 3480)
@@ -1,4 +1,4 @@
 01_late_javadoc.diff
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff
-05_pkgconfig_no_need_for_cairo.diff
+05_pkgconfig_drop_requires.diff