[pkg-java] r3474 - in trunk/libgnome-java/debian: . patches

tgg at alioth.debian.org tgg at alioth.debian.org
Tue May 15 13:24:43 UTC 2007 

Author: tgg
Date: 2007-05-15 13:24:43 +0000 (Tue, 15 May 2007)
New Revision: 3474

Added:
   trunk/libgnome-java/debian/libgnome-java-dev.install
   trunk/libgnome-java/debian/patches/05_add_glib_and_gtk_to_pkgconfig.diff
Modified:
   trunk/libgnome-java/debian/changelog
   trunk/libgnome-java/debian/control
   trunk/libgnome-java/debian/libgnome-cni.install
   trunk/libgnome-java/debian/libgnome-jni.install
   trunk/libgnome-java/debian/patches/series
   trunk/libgnome-java/debian/rules
Log:
add libgnome-java-dev package, and fix .pc file


Modified: trunk/libgnome-java/debian/changelog
===================================================================
--- trunk/libgnome-java/debian/changelog	2007-05-15 12:42:05 UTC (rev 3473)
+++ trunk/libgnome-java/debian/changelog	2007-05-15 13:24:43 UTC (rev 3474)
@@ -1,3 +1,15 @@
+libgnome-java (2.12.7-3) unstable; urgency=low
+
+  * New package, libgnome-java-dev, split from libgnome-jni and libgnome-cni,
+    that:
+    o contains library symlinks and pkg-config file
+    o pulls in libgnome-jni, libgnome-cni and libgnome-java
+  * Add missing java-gcj-compat | java2-runtime to libgnome-java.
+  * New patch, 05_add_glib_and_gtk_to_pkgconfig.diff, to complete the
+    pkg-config file (also converts eol to unix).
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 13:04:53 +0000
+
 libgnome-java (2.12.7-2) unstable; urgency=low
 
   * Build for unstable.

Modified: trunk/libgnome-java/debian/control
===================================================================
--- trunk/libgnome-java/debian/control	2007-05-15 12:42:05 UTC (rev 3473)
+++ trunk/libgnome-java/debian/control	2007-05-15 13:24:43 UTC (rev 3474)
@@ -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>, Michael Koch <konqueror at gmx.de>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook, docbook-utils, cdbs (>= 0.4.34), pkg-config, libgtk-java (>= 2.10.2), libgtk-cni (>= 2.10.2), libglib-java (>= 0.4.2-4), libglib-cni (>= 0.4.2), libgnomeui-dev (>= 2.11.0), libgnomecanvas2-dev (>= 2.11.0), quilt (>= 0.29-2), autotools-dev
+Build-Depends: debhelper (>> 5), 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), libgtk-java-dev (>= 2.10.2-4), libgnomeui-dev (>= 2.11.0), libgnomecanvas2-dev (>= 2.11.0), quilt (>= 0.29-2), autotools-dev
 Standards-Version: 3.7.2.0
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgnome-java
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgnome-java
@@ -11,7 +11,7 @@
 Package: libgnome-java
 Section: libs
 Architecture: all
-Depends: libgnome-jni (>= ${source:Version}), libgtk-java (>= 2.10.2)
+Depends: libgnome-jni (>= ${source:Version}), libglib-java (>= 0.4.2), libgtk-java (>= 2.10.2), java-gcj-compat | java2-runtime
 Replaces: libgnome0-java, libgnome2-java
 Recommends: libgnome-java-gcj
 Conflicts: libgnome2-java
@@ -104,3 +104,22 @@
  This package provides natively compiled code for gnome support.
  .
  http://java-gnome.sf.net
+
+Package: libgnome-java-dev
+Section: devel
+Architecture: any
+Depends: libglib-java-dev (>= 0.4.2-7), libgtk-java-dev (>= 2.10.2-4), libgnome-jni (= ${binary:Version}), libgnome-cni (= ${binary:Version}), libgnome-java (= ${source:Version})
+Replaces: libgnome-java (<< 2.12.7-1), libgnome-jni (<< 2.12.7-3), libgnome-cni (<< 2.12.7-3)
+Description:  Gnome 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 library symlinks and pkg-config file for gnome support.
+ .
+ http://java-gnome.sf.net

Modified: trunk/libgnome-java/debian/libgnome-cni.install
===================================================================
--- trunk/libgnome-java/debian/libgnome-cni.install	2007-05-15 12:42:05 UTC (rev 3473)
+++ trunk/libgnome-java/debian/libgnome-cni.install	2007-05-15 13:24:43 UTC (rev 3474)
@@ -1 +1 @@
-debian/tmp/usr/lib/libgnomejava*.so       usr/lib
+debian/tmp/usr/lib/libgnomejava-*.so	usr/lib

Added: trunk/libgnome-java/debian/libgnome-java-dev.install
===================================================================
--- trunk/libgnome-java/debian/libgnome-java-dev.install	                        (rev 0)
+++ trunk/libgnome-java/debian/libgnome-java-dev.install	2007-05-15 13:24:43 UTC (rev 3474)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libgnomejni.so	usr/lib/jni
+debian/tmp/usr/lib/libgnomejava.so	usr/lib

Modified: trunk/libgnome-java/debian/libgnome-jni.install
===================================================================
--- trunk/libgnome-java/debian/libgnome-jni.install	2007-05-15 12:42:05 UTC (rev 3473)
+++ trunk/libgnome-java/debian/libgnome-jni.install	2007-05-15 13:24:43 UTC (rev 3474)
@@ -1,2 +1 @@
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/lib*jni*.so		usr/lib/jni
+debian/tmp/usr/lib/libgnomejni-*.so	usr/lib/jni

Added: trunk/libgnome-java/debian/patches/05_add_glib_and_gtk_to_pkgconfig.diff
===================================================================
--- trunk/libgnome-java/debian/patches/05_add_glib_and_gtk_to_pkgconfig.diff	                        (rev 0)
+++ trunk/libgnome-java/debian/patches/05_add_glib_and_gtk_to_pkgconfig.diff	2007-05-15 13:24:43 UTC (rev 3474)
@@ -0,0 +1,34 @@
+Index: libgnome-java-2.12.7/gnome2-java.pc.in
+===================================================================
+--- libgnome-java-2.12.7.orig/gnome2-java.pc.in	2007-05-15 13:15:05.000000000 +0000
++++ libgnome-java-2.12.7/gnome2-java.pc.in	2007-05-15 13:15:54.000000000 +0000
+@@ -1,15 +1,15 @@
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ jardir=@jardir@
+-
+-
+-Name: GNOME-Java
+-Description: GNOME Java bindings
+-Version: @VERSION@
+-api_version=@apiversion@
+-classpath=@INSTALLED_CLASSPATH@
+-jnilibs=-L${exec_prefix}/lib/jni -lgnomejni
+-Libs: -L at libdir@ -lgnomejava
+-
++
++
++Name: GNOME-Java
++Description: GNOME Java bindings
++Requires: glib-java gtk2-java
++Version: @VERSION@
++api_version=@apiversion@
++classpath=@INSTALLED_CLASSPATH@
++jnilibs=-L${exec_prefix}/lib/jni -lgnomejni
++Libs: -L at libdir@ -lgnomejava

Modified: trunk/libgnome-java/debian/patches/series
===================================================================
--- trunk/libgnome-java/debian/patches/series	2007-05-15 12:42:05 UTC (rev 3473)
+++ trunk/libgnome-java/debian/patches/series	2007-05-15 13:24:43 UTC (rev 3474)
@@ -1,3 +1,4 @@
 01_late_javadoc.diff
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff
+05_add_glib_and_gtk_to_pkgconfig.diff

Modified: trunk/libgnome-java/debian/rules
===================================================================
--- trunk/libgnome-java/debian/rules	2007-05-15 12:42:05 UTC (rev 3473)
+++ trunk/libgnome-java/debian/rules	2007-05-15 13:24:43 UTC (rev 3474)
@@ -13,6 +13,7 @@
 jar  = gnome2.12.jar
 jni  = libgnome-jni
 cni  = libgnome-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/gnome2-java.pc
+	    debian/$(dev)/usr/lib/pkgconfig/gnome2-java.pc
 
 binary-post-install/$(cni)::
 	mkdir -p debian/$(cni)/usr/share/lintian/overrides

More information about the pkg-java-commits mailing list