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

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-15 18:19:34 +0000 (Tue, 15 May 2007)
New Revision: 3481

Added:
   trunk/libgtk-java/debian/patches/06_pkgconfig_remove_unneeded_requires.diff
Removed:
   trunk/libgtk-java/debian/patches/06_pkgconfig_no_need_for_gtk.diff
Modified:
   trunk/libgtk-java/debian/changelog
   trunk/libgtk-java/debian/patches/series
Log:
rework pkg-config file again


Modified: trunk/libgtk-java/debian/changelog
===================================================================
--- trunk/libgtk-java/debian/changelog	2007-05-15 18:09:16 UTC (rev 3480)
+++ trunk/libgtk-java/debian/changelog	2007-05-15 18:19:34 UTC (rev 3481)
@@ -6,11 +6,11 @@
     o depends on libcairo-java-dev (Closes: #423522) and libglib-java-dev
     o pulls in libgtk-jni, libgtk-cni and libgtk-java
   * Add missing java-gcj-compat | java2-runtime dependency on libgtk-java.
-  * debian/patches/06_pkgconfig_no_need_for_gtk.diff: new patch to remove
-    the need for gtk+-2.0 in gtk2-java.pc. Instead we only need glib-2.0 and
-    gobject-2.0. Closes: #423843.
+  * debian/patches/06_pkgconfig_remove_unneeded_requires.diff: new patch to
+    remove the need for gtk+-2.0 and cairo-java in gtk2-java.pc. Instead we
+    only need glib-java. Closes: #423843.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 11:05:59 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 18:26:01 +0000
 
 libgtk-java (2.10.2-3) unstable; urgency=low
 

Deleted: trunk/libgtk-java/debian/patches/06_pkgconfig_no_need_for_gtk.diff
===================================================================
--- trunk/libgtk-java/debian/patches/06_pkgconfig_no_need_for_gtk.diff	2007-05-15 18:09:16 UTC (rev 3480)
+++ trunk/libgtk-java/debian/patches/06_pkgconfig_no_need_for_gtk.diff	2007-05-15 18:19:34 UTC (rev 3481)
@@ -1,13 +0,0 @@
-Index: libgtk-java-2.10.2/gtk2-java.pc.in
-===================================================================
---- libgtk-java-2.10.2.orig/gtk2-java.pc.in	2007-05-15 07:32:12.000000000 +0000
-+++ libgtk-java-2.10.2/gtk2-java.pc.in	2007-05-15 07:32:37.000000000 +0000
-@@ -8,7 +8,7 @@
- 
- Name: GTK-Java
- Description: GTK Java bindings
--Requires: glib-java cairo-java gtk+-2.0 
-+Requires: glib-java cairo-java glib-2.0 gobject-2.0
- Version: @VERSION@
- api_version=@gtkapiversion@
- classpath=@INSTALLED_CLASSPATH@

Added: trunk/libgtk-java/debian/patches/06_pkgconfig_remove_unneeded_requires.diff
===================================================================
--- trunk/libgtk-java/debian/patches/06_pkgconfig_remove_unneeded_requires.diff	                        (rev 0)
+++ trunk/libgtk-java/debian/patches/06_pkgconfig_remove_unneeded_requires.diff	2007-05-15 18:19:34 UTC (rev 3481)
@@ -0,0 +1,13 @@
+Index: libgtk-java-2.10.2/gtk2-java.pc.in
+===================================================================
+--- libgtk-java-2.10.2.orig/gtk2-java.pc.in	2007-05-15 13:59:22.000000000 +0000
++++ libgtk-java-2.10.2/gtk2-java.pc.in	2007-05-15 17:29:15.000000000 +0000
+@@ -8,7 +8,7 @@
+ 
+ Name: GTK-Java
+ Description: GTK Java bindings
+-Requires: glib-java cairo-java gtk+-2.0 
++Requires: glib-java
+ Version: @VERSION@
+ api_version=@gtkapiversion@
+ classpath=@INSTALLED_CLASSPATH@

Modified: trunk/libgtk-java/debian/patches/series
===================================================================
--- trunk/libgtk-java/debian/patches/series	2007-05-15 18:09:16 UTC (rev 3480)
+++ trunk/libgtk-java/debian/patches/series	2007-05-15 18:19:34 UTC (rev 3481)
@@ -2,4 +2,4 @@
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff
 05_link_libgtkjava_libcairojava.diff
-06_pkgconfig_no_need_for_gtk.diff
+06_pkgconfig_remove_unneeded_requires.diff