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

tgg at alioth.debian.org tgg at alioth.debian.org
Tue May 15 08:13:03 UTC 2007 

Author: tgg
Date: 2007-05-15 08:13:02 +0000 (Tue, 15 May 2007)
New Revision: 3467

Added:
   trunk/libgtk-java/debian/libgtk-java-dev.install
   trunk/libgtk-java/debian/patches/06_pkgconfig_no_need_for_gtk.diff
Modified:
   trunk/libgtk-java/debian/changelog
   trunk/libgtk-java/debian/control
   trunk/libgtk-java/debian/libgtk-cni.install
   trunk/libgtk-java/debian/libgtk-jni.install
   trunk/libgtk-java/debian/patches/series
   trunk/libgtk-java/debian/rules
Log:
new package, libgtk-java-dev to fix #423522


Modified: trunk/libgtk-java/debian/changelog
===================================================================
--- trunk/libgtk-java/debian/changelog	2007-05-15 06:30:20 UTC (rev 3466)
+++ trunk/libgtk-java/debian/changelog	2007-05-15 08:13:02 UTC (rev 3467)
@@ -1,3 +1,16 @@
+libgtk-java (2.10.2-4) unstable; urgency=low
+
+  * New package, libgtk-java-dev, split from libgtk-jni and libgtk-cni,
+    that:
+    o contains header file, library symlink and pkg-config file
+    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 replace
+    `Requires: gtk+-2.0' with `Requires: glib-2.0 gobject-2.0' in gtk2-java.pc.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 07:37:06 +0000
+
 libgtk-java (2.10.2-3) unstable; urgency=low
 
   * libgtk-jni Replaces: libgtk-java (<< 2.10.2-1) because include file and

Modified: trunk/libgtk-java/debian/control
===================================================================
--- trunk/libgtk-java/debian/control	2007-05-15 06:30:20 UTC (rev 3466)
+++ trunk/libgtk-java/debian/control	2007-05-15 08:13:02 UTC (rev 3467)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Howard <mh at debian.org>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>> 5), libgtk2.0-dev (>= 2.10.0), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java (>= 0.4.2-4), libglib-cni (>= 0.4.2), libcairo-java (>= 1.0.8-2), libcairo-cni (>= 1.0.8), quilt (>= 0.29-2), autotools-dev
+Build-Depends: debhelper (>> 5), libgtk2.0-dev (>= 2.10.0), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java-dev (>= 0.4.2-7), libcairo-java-dev (>= 1.0.8-5), quilt (>= 0.29-2), autotools-dev
 Standards-Version: 3.7.2.0
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgtk-java
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgtk-java
@@ -25,7 +25,7 @@
  as stock icons, and file chooser buttons; or if you want to use additional
  gnome libraries such as gnome-vfs, vte, libmozembed.
  .
- This package provides the architecture-independant files for gtk+ support.
+ This package provides the architecture-independant files for GTK+ support.
  .
  http://java-gnome.sf.net
  
@@ -45,7 +45,7 @@
  as stock icons, and file chooser buttons; or if you want to use additional
  gnome libraries such as gnome-vfs, vte, libmozembed.
  .
- This package provides the architecture-dependant files for gtk+ support.
+ This package provides the architecture-dependant files for GTK+ support.
  .
  http://java-gnome.sf.net
 
@@ -101,6 +101,26 @@
  as stock icons, and file chooser buttons; or if you want to use additional
  gnome libraries such as gnome-vfs, vte, libmozembed.
  .
- This package contains the API documentation for the gtk+ bindings.
+ This package contains the API documentation for the GTK+ bindings.
  .
  http://java-gnome.sf.net
+
+Package: libgtk-java-dev
+Section: devel
+Architecture: any
+Depends: libglib-java-dev (>= 0.4.2-7), libcairo-java-dev (>= 1.0.8-5), libglib2.0-dev, libgtk-jni (= ${binary:Version}), libgtk-cni (= ${binary:Version}), libgtk-java (= ${source:Version})
+Replaces: libgtk-java (<< 2.10.2-1), libgtk-jni (<< 2.10.2-4), libgtk-cni (<< 2.10.2-4)
+Description: GTK+ bindings for Java (development files)
+ The Java-Gnome project provides a framework for creating Gtk and Gnome
+ applications using Java. This covers the entire gtk and gnome API, so you can
+ create true gnome applications, which work just like any other desktop
+ application. Most other Java UI toolkits such as SWT or swing provide at most
+ compatibility layers so that your app will look like gnome appliactions. You
+ should use java-gnome if you want to use standard gtk and gnome features such
+ as stock icons, and file chooser buttons; or if you want to use additional
+ gnome libraries such as gnome-vfs, vte, libmozembed.
+ .
+ This package provides header file, library symlinks and pkg-config file for
+ GTK+ bindings.
+ .
+ http://java-gnome.sf.net

Modified: trunk/libgtk-java/debian/libgtk-cni.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-cni.install	2007-05-15 06:30:20 UTC (rev 3466)
+++ trunk/libgtk-java/debian/libgtk-cni.install	2007-05-15 08:13:02 UTC (rev 3467)
@@ -1 +1 @@
-debian/tmp/usr/lib/libgtkjava*.so       usr/lib
+debian/tmp/usr/lib/libgtkjava-*.so	usr/lib

Added: trunk/libgtk-java/debian/libgtk-java-dev.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-java-dev.install	                        (rev 0)
+++ trunk/libgtk-java/debian/libgtk-java-dev.install	2007-05-15 08:13:02 UTC (rev 3467)
@@ -0,0 +1,4 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libgtkjni.so		usr/lib/jni
+debian/tmp/usr/lib/libgtkjava.so	usr/lib

Modified: trunk/libgtk-java/debian/libgtk-jni.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-jni.install	2007-05-15 06:30:20 UTC (rev 3466)
+++ trunk/libgtk-java/debian/libgtk-jni.install	2007-05-15 08:13:02 UTC (rev 3467)
@@ -1,3 +1 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/lib*jni*.so		usr/lib/jni
+debian/tmp/usr/lib/libgtkjni-*.so	usr/lib/jni

Added: trunk/libgtk-java/debian/patches/06_pkgconfig_no_need_for_gtk.diff
===================================================================
--- trunk/libgtk-java/debian/patches/06_pkgconfig_no_need_for_gtk.diff	                        (rev 0)
+++ trunk/libgtk-java/debian/patches/06_pkgconfig_no_need_for_gtk.diff	2007-05-15 08:13:02 UTC (rev 3467)
@@ -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 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@

Modified: trunk/libgtk-java/debian/patches/series
===================================================================
--- trunk/libgtk-java/debian/patches/series	2007-05-15 06:30:20 UTC (rev 3466)
+++ trunk/libgtk-java/debian/patches/series	2007-05-15 08:13:02 UTC (rev 3467)
@@ -2,3 +2,4 @@
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff
 05_link_libgtkjava_libcairojava.diff
+06_pkgconfig_no_need_for_gtk.diff

Modified: trunk/libgtk-java/debian/rules
===================================================================
--- trunk/libgtk-java/debian/rules	2007-05-15 06:30:20 UTC (rev 3466)
+++ trunk/libgtk-java/debian/rules	2007-05-15 08:13:02 UTC (rev 3467)
@@ -13,6 +13,7 @@
 jar  = gtk2.10.jar
 jni  = libgtk-jni
 cni  = libgtk-cni
+dev  = $(base)-dev
 
 include /usr/share/gcj/debian_defaults
 
@@ -41,9 +42,9 @@
 	    JAVADOC_OPTIONS='' \
 	    JAVADOC_FOOTER=''
 
-binary-post-install/$(jni)::
+binary-post-install/$(dev)::
 	sed -i -e 's/\r$$//' -e 's/-[0-9.]*\.jar$$/.jar/' \
-	    debian/$(jni)/usr/lib/pkgconfig/gtk2-java.pc
+	    debian/$(dev)/usr/lib/pkgconfig/gtk2-java.pc
 
 binary-post-install/$(cni)::
 	mkdir -p debian/$(cni)/usr/share/lintian/overrides

More information about the pkg-java-commits mailing list