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

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-15 22:39:09 +0000 (Tue, 15 May 2007)
New Revision: 3483

Modified:
   trunk/cairo-java/debian/changelog
   trunk/cairo-java/debian/patches/05_pkgconfig_drop_requires.diff
Log:
reenable the Requires: on glib-java. The cairo part is definitely not needed

Rationale (before I change my mind again):
  * libcairojava is linked against libglibjava
  * a program that uses libcairojava is therefore indirecly linked with
    libglibjava
  * libcairojava does not seem to expose any libglibjava type ...
    [ so I'm not sure really enabling the Requires: is needed ]
  * ... but libcairojava *does* expose types derived from libglibjava,
    including exceptions

That's probably not worth the pain, but this will automatically add
`-lgobject-2.0 -lglib-2.0' to any program linking against libcairojava,
and I'm not sure whether it's needed or not.


Modified: trunk/cairo-java/debian/changelog
===================================================================
--- trunk/cairo-java/debian/changelog	2007-05-15 21:22:30 UTC (rev 3482)
+++ trunk/cairo-java/debian/changelog	2007-05-15 22:39:09 UTC (rev 3483)
@@ -7,9 +7,9 @@
     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_drop_requires.diff: new patch to remove
-    Requires: section from cairo-java.pc. Closes: #423525.
+    unneeded Requires: on cairo from cairo-java.pc. Closes: #423525.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 17:45:35 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 22:30:44 +0000
 
 cairo-java (1.0.8-4) unstable; urgency=low
 

Modified: trunk/cairo-java/debian/patches/05_pkgconfig_drop_requires.diff
===================================================================
--- trunk/cairo-java/debian/patches/05_pkgconfig_drop_requires.diff	2007-05-15 21:22:30 UTC (rev 3482)
+++ trunk/cairo-java/debian/patches/05_pkgconfig_drop_requires.diff	2007-05-15 22:39:09 UTC (rev 3483)
@@ -1,10 +1,13 @@
---- 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 @@
+Index: cairo-java-1.0.8/cairo-java.pc.in
+===================================================================
+--- cairo-java-1.0.8.orig/cairo-java.pc.in	2007-05-15 22:28:37.000000000 +0000
++++ cairo-java-1.0.8/cairo-java.pc.in	2007-05-15 22:29:23.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
+ jnilibs=-L at libdir@/jni -lcairojni