[pkg-java] r3471 - in trunk/libgconf-java/debian: . patches

tgg at alioth.debian.org tgg at alioth.debian.org
Tue May 15 12:17:15 UTC 2007 

Author: tgg
Date: 2007-05-15 12:17:15 +0000 (Tue, 15 May 2007)
New Revision: 3471

Added:
   trunk/libgconf-java/debian/libgconf-java-dev.install
   trunk/libgconf-java/debian/patches/05_dont_link_gconf_against_gtk.diff
   trunk/libgconf-java/debian/patches/06_add_glib_to_pkgconfig.diff
Modified:
   trunk/libgconf-java/debian/changelog
   trunk/libgconf-java/debian/control
   trunk/libgconf-java/debian/libgconf-cni.install
   trunk/libgconf-java/debian/libgconf-jni.install
   trunk/libgconf-java/debian/patches/series
   trunk/libgconf-java/debian/rules
Log:
add libgconf-java-dev; remove link between libgconf-java and libgtk-java


Modified: trunk/libgconf-java/debian/changelog
===================================================================
--- trunk/libgconf-java/debian/changelog	2007-05-15 10:56:04 UTC (rev 3470)
+++ trunk/libgconf-java/debian/changelog	2007-05-15 12:17:15 UTC (rev 3471)
@@ -1,3 +1,20 @@
+libgconf-java (2.12.6-3) unstable; urgency=low
+
+  * New package, libgconf-java-dev, split from libgconf-jni and libgconf-cni,
+    that:
+    o contains library symlinks and pkg-config file
+    o depends on libglib-java-dev
+    o pulls in libgconf-jni, libgconf-cni and libgconf-java
+  * Add missing java-gcj-compat | java2-runtime dependency on libgconf-java.
+  * libgconf-java does not need libgtk-java at runtime, so:
+    o remove all runtime dependencies on libgtk-java from libgconf-java
+    o new patch, 05_dont_link_gconf_against_gtk.diff, to prevent linking
+      against gtk-java libraries
+  * new patch, 06_add_glib_to_pkgconfig.diff, to add glib-java requirement
+    for libgconf-java pkg-config file.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 15 May 2007 12:24:30 +0000
+
 libgconf-java (2.12.6-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/libgconf-java/debian/control
===================================================================
--- trunk/libgconf-java/debian/control	2007-05-15 10:56:04 UTC (rev 3470)
+++ trunk/libgconf-java/debian/control	2007-05-15 12:17:15 UTC (rev 3471)
@@ -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), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs (>= 0.4.34), pkg-config, libgtk-java (>= 2.10.2), libgtk-cni (>= 2.10.2), libgconf2-dev (>= 2.11.2), libglib-java (>= 0.4.2-4), libglib-cni (>= 0.4.2), quilt (>= 0.29-2), autotools-dev
+Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java-dev (>= 0.4.2-7), libgtk-java-dev (>= 2.10.2-4), libgconf2-dev (>= 2.11.2), quilt (>= 0.29-2), autotools-dev
 Standards-Version: 3.7.2.0
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgconf-java
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgconf-java
@@ -11,7 +11,7 @@
 Package: libgconf-java
 Section: libs
 Architecture: all
-Depends: libgconf-jni (>= ${source:Version}), libgtk-java (>= 2.10.2)
+Depends: libgconf-jni (>= ${source:Version}), libglib-java (>= 0.4.2), java-gcj-compat | java2-runtime
 Replaces: libgtk2-java
 Recommends: libgconf-java-gcj
 Conflicts: libgtk2-java
@@ -44,8 +44,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 library for libgconf
- bindings.
+ This package provides the architecture-dependant library for GConf bindings.
  .
  http://java-gnome.sf.net
 
@@ -64,14 +63,14 @@
  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 natively compiled code for libgconf bindings.
+ This package provides natively compiled code for GConf bindings.
  .
  http://java-gnome.sf.net
 
 Package: libgconf-java-gcj
 Section: libs
 Architecture: any
-Depends: libgconf-java (= ${source:Version}), libgtk-java-gcj (>= 2.10.2), ${misc:Depends}, ${shlibs:Depends}
+Depends: libgconf-java (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: GConf bindings for Java (native code for use with gij)
  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
@@ -89,7 +88,7 @@
 Package: libgconf-java-doc
 Section: doc
 Architecture: all
-Depends: classpath-doc, libgtk-java-doc
+Depends: classpath-doc, libglib-java-doc
 Replaces: libgconf-java (<< 2.12.4)
 Description: GConf bindings for Java (API documentation)
  The Java-Gnome project provides a framework for creating Gtk and Gnome
@@ -101,6 +100,25 @@
  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 libgconf bindings.
+ This package contains the API documentation for the GConf bindings.
  .
  http://java-gnome.sf.net
+
+Package: libgconf-java-dev
+Section: devel
+Architecture: any
+Depends: libglib-java-dev (>= 0.4.2-7), libgconf-jni (= ${binary:Version}), libgconf-cni (= ${binary:Version}), libgconf-java (= ${source:Version})
+Replaces: libgconf-java (<< 2.12.6-1), libgconf-jni (<< 2.12.6-3), libgconf-cni (<< 2.12.6-3)
+Description: GConf 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 GConf bindings.
+ .
+ http://java-gnome.sf.net

Modified: trunk/libgconf-java/debian/libgconf-cni.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-cni.install	2007-05-15 10:56:04 UTC (rev 3470)
+++ trunk/libgconf-java/debian/libgconf-cni.install	2007-05-15 12:17:15 UTC (rev 3471)
@@ -1 +1 @@
-debian/tmp/usr/lib/libgconfjava*.so	usr/lib
+debian/tmp/usr/lib/libgconfjava-*.so	usr/lib

Added: trunk/libgconf-java/debian/libgconf-java-dev.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-java-dev.install	                        (rev 0)
+++ trunk/libgconf-java/debian/libgconf-java-dev.install	2007-05-15 12:17:15 UTC (rev 3471)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libgconfjni.so	usr/lib/jni
+debian/tmp/usr/lib/libgconfjava.so	usr/lib

Modified: trunk/libgconf-java/debian/libgconf-jni.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-jni.install	2007-05-15 10:56:04 UTC (rev 3470)
+++ trunk/libgconf-java/debian/libgconf-jni.install	2007-05-15 12:17:15 UTC (rev 3471)
@@ -1,2 +1 @@
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/lib*jni*.so	usr/lib/jni
+debian/tmp/usr/lib/libgconfjni-*.so	usr/lib/jni

Added: trunk/libgconf-java/debian/patches/05_dont_link_gconf_against_gtk.diff
===================================================================
--- trunk/libgconf-java/debian/patches/05_dont_link_gconf_against_gtk.diff	                        (rev 0)
+++ trunk/libgconf-java/debian/patches/05_dont_link_gconf_against_gtk.diff	2007-05-15 12:17:15 UTC (rev 3471)
@@ -0,0 +1,36 @@
+Index: libgconf-java-2.12.6/Makefile.am
+===================================================================
+--- libgconf-java-2.12.6.orig/Makefile.am	2007-05-15 11:59:14.000000000 +0000
++++ libgconf-java-2.12.6/Makefile.am	2007-05-15 12:00:01.000000000 +0000
+@@ -42,12 +42,12 @@
+ if BUILD_GCJ
+ libgconfjava_la_SOURCES = $(java_gconf_source_files)
+ libgconfjava_la_GCJFLAGS = -fjni -I$(srcdir)/src/java -Isrc/java --classpath=$(CLASSPATH):$(srcdir)/src/java
+-libgconfjava_la_LDFLAGS = $(JGJAVA_LIBS) $(GTKJAVA_LIBS) -release $(apiversion)
++libgconfjava_la_LDFLAGS = $(JGJAVA_LIBS) -release $(apiversion)
+ endif
+ 
+ libgconfjni_la_SOURCES = $(jni_gconf_source_files)
+ AM_CFLAGS = $(GCONF_CFLAGS) $(JGJAVA_CFLAGS) $(GTKJAVA_CFLAGS) $(JNI_INCLUDES) -I$(includedir)
+-libgconfjni_la_LDFLAGS = $(GCONF_LIBS) $(JGJNI_LIBS) $(GTKJNI_LIBS) -release $(apiversion)
++libgconfjni_la_LDFLAGS = $(GCONF_LIBS) $(JGJNI_LIBS) -release $(apiversion)
+ 
+ # automake should support generating versioned jars
+ gconf_jardir = $(jardir)
+Index: libgconf-java-2.12.6/Makefile.in
+===================================================================
+--- libgconf-java-2.12.6.orig/Makefile.in	2007-05-15 11:59:14.000000000 +0000
++++ libgconf-java-2.12.6/Makefile.in	2007-05-15 12:00:33.000000000 +0000
+@@ -351,10 +351,10 @@
+ 
+ @BUILD_GCJ_TRUE at libgconfjava_la_SOURCES = $(java_gconf_source_files)
+ @BUILD_GCJ_TRUE at libgconfjava_la_GCJFLAGS = -fjni -I$(srcdir)/src/java -Isrc/java --classpath=$(CLASSPATH):$(srcdir)/src/java
+- at BUILD_GCJ_TRUE@libgconfjava_la_LDFLAGS = $(JGJAVA_LIBS) $(GTKJAVA_LIBS) -release $(apiversion)
++ at BUILD_GCJ_TRUE@libgconfjava_la_LDFLAGS = $(JGJAVA_LIBS) -release $(apiversion)
+ libgconfjni_la_SOURCES = $(jni_gconf_source_files)
+ AM_CFLAGS = $(GCONF_CFLAGS) $(JGJAVA_CFLAGS) $(GTKJAVA_CFLAGS) $(JNI_INCLUDES) -I$(includedir)
+-libgconfjni_la_LDFLAGS = $(GCONF_LIBS) $(JGJNI_LIBS) $(GTKJNI_LIBS) -release $(apiversion)
++libgconfjni_la_LDFLAGS = $(GCONF_LIBS) $(JGJNI_LIBS) -release $(apiversion)
+ 
+ # automake should support generating versioned jars
+ gconf_jardir = $(jardir)

Added: trunk/libgconf-java/debian/patches/06_add_glib_to_pkgconfig.diff
===================================================================
--- trunk/libgconf-java/debian/patches/06_add_glib_to_pkgconfig.diff	                        (rev 0)
+++ trunk/libgconf-java/debian/patches/06_add_glib_to_pkgconfig.diff	2007-05-15 12:17:15 UTC (rev 3471)
@@ -0,0 +1,12 @@
+Index: libgconf-java-2.12.6/gconf-java.pc.in
+===================================================================
+--- libgconf-java-2.12.6.orig/gconf-java.pc.in	2007-05-15 12:21:08.000000000 +0000
++++ libgconf-java-2.12.6/gconf-java.pc.in	2007-05-15 12:21:37.000000000 +0000
+@@ -7,6 +7,7 @@
+ 
+ Name: Gconf-Java
+ Description: Gconf Java bindings
++Requires: glib-java
+ Version: @VERSION@
+ api_version=@apiversion@
+ classpath=@INSTALLED_CLASSPATH@

Modified: trunk/libgconf-java/debian/patches/series
===================================================================
--- trunk/libgconf-java/debian/patches/series	2007-05-15 10:56:04 UTC (rev 3470)
+++ trunk/libgconf-java/debian/patches/series	2007-05-15 12:17:15 UTC (rev 3471)
@@ -1,3 +1,5 @@
 01_late_javadoc.diff
 03_reduce_distclean.diff
 04_pkgconfig_for_jni.diff
+05_dont_link_gconf_against_gtk.diff
+06_add_glib_to_pkgconfig.diff

Modified: trunk/libgconf-java/debian/rules
===================================================================
--- trunk/libgconf-java/debian/rules	2007-05-15 10:56:04 UTC (rev 3470)
+++ trunk/libgconf-java/debian/rules	2007-05-15 12:17:15 UTC (rev 3471)
@@ -13,6 +13,7 @@
 jar  = gconf2.12.jar
 jni  = libgconf-jni
 cni  = libgconf-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/-[0-9.]*\.jar$$/.jar/' \
-	    debian/$(jni)/usr/lib/pkgconfig/gconf-java.pc
+	    debian/$(dev)/usr/lib/pkgconfig/gconf-java.pc
 
 binary-post-install/$(cni)::
 	mkdir -p debian/$(cni)/usr/share/lintian/overrides

More information about the pkg-java-commits mailing list