[pkg-java] r3333 - trunk/libgconf-java/debian

Thomas Girard tgg at alioth.debian.org
Tue Apr 24 21:23:41 UTC 2007


Author: tgg
Date: 2007-04-24 21:23:41 +0000 (Tue, 24 Apr 2007)
New Revision: 3333

Added:
   trunk/libgconf-java/debian/libgconf-java-doc.doc-base
   trunk/libgconf-java/debian/libgconf-java-gcj.install
   trunk/libgconf-java/debian/libgconf-java-gcj.postinst
Removed:
   trunk/libgconf-java/debian/patches/
Modified:
   trunk/libgconf-java/debian/changelog
   trunk/libgconf-java/debian/control
   trunk/libgconf-java/debian/libgconf-java.install
   trunk/libgconf-java/debian/rules
Log:
merge ubuntu changes


Modified: trunk/libgconf-java/debian/changelog
===================================================================
--- trunk/libgconf-java/debian/changelog	2007-04-24 20:54:55 UTC (rev 3332)
+++ trunk/libgconf-java/debian/changelog	2007-04-24 21:23:41 UTC (rev 3333)
@@ -1,10 +1,30 @@
-libgconf-java (2.12.3-2) UNRELEASED; urgency=low
+libgconf-java (2.12.5-0ubuntu1) feisty; urgency=low
 
-  * NOT RELEASED YET
-  * debian/watch: added
+  * New upstream version.
 
- -- Mark Howard <mh at debian.org>  Thu, 28 Sep 2006 21:38:27 +0100
+ -- Matthias Klose <doko at ubuntu.com>  Sat,  6 Jan 2007 23:33:39 +0100
 
+libgconf-java (2.12.4-0ubuntu2) edgy; urgency=low
+
+  * Re-add the jni library.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 17 Aug 2006 01:36:01 +0200
+
+libgconf-java (2.12.4-0ubuntu1) edgy; urgency=low
+
+  * New upstream release
+  * Makefile.am: Unconditionalize the doc-stamp target, remove the
+    install-data-hook.
+  * Split out libgconf-java-doc. Configure --without-javadocs, because gjdoc
+    fails on some architectures.
+  * Split out libgconf-java-gcj.
+  * Configure --without-gcj-compile; rebuild the natively compiled for gcj
+    from bytecode instead from source using using -fjni -findirect-dispatch.
+  * Do not install a shlibs file for the jni library.
+  * Register the API docs.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 16 Aug 2006 23:12:14 +0000
+
 libgconf-java (2.12.3-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libgconf-java/debian/control
===================================================================
--- trunk/libgconf-java/debian/control	2007-04-24 20:54:55 UTC (rev 3332)
+++ trunk/libgconf-java/debian/control	2007-04-24 21:23:41 UTC (rev 3333)
@@ -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>
-Build-Depends: debhelper (>> 4), gcj, java-gcj-compat-dev, docbook-utils, cdbs, pkg-config, libgtk-java (>= 2.8), libgconf2-dev, libglib-java, libgtk2.0-dev (>= 2.8)
+Build-Depends: debhelper (>> 4), gcj, java-gcj-compat-dev (>= 1.0.61-0ubuntu3), docbook-utils, cdbs, pkg-config, libgtk-java (>= 2.10), libgconf2-dev, libglib-java (>= 0.4), libgtk2.0-dev (>= 2.8)
 Standards-Version: 3.6.1.0
 
 Package: libgconf-java
@@ -24,13 +24,37 @@
  .
  This package provides libgconf support.
  .
- These Debian packages provide both java bytecode for running in a JVM and
- natively compiled code (gcj) to run applications directly. Java-Gnome is also
- available for windows platforms if you want cross-platform compatibility.
- Java-Gnome is now API stable - if you develop an application for java-gnome
- 2.x, it will work with java-gnome 2.(x+2). It is also regularly updated to the
- latest bindings - it is part of the official gnome bindings release and
- follows the gnome release schedule.
- .
  http://java-gnome.sf.net
 
+Package: libgconf-java-gcj
+Section: libs
+Architecture: any
+Depends: libgconf-java (= ${Source-Version}), libgtk-java-gcj, java-gcj-compat (>= 1.0.61-0ubuntu3), ${shlibs:Depends}
+Description: LIBGCONF 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
+ 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 natively compiled code to run with gij.
+
+Package: libgconf-java-doc
+Section: doc
+Architecture: all
+Depends: classpath-doc, libgtk-java-doc
+Replaces: libgconf-java (<< 2.12.4)
+Description: LIBGCONF bindings for Java (API documentation)
+ 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 contains the API documentation for the libgconf bindings.

Added: trunk/libgconf-java/debian/libgconf-java-doc.doc-base
===================================================================
--- trunk/libgconf-java/debian/libgconf-java-doc.doc-base	2007-04-24 20:54:55 UTC (rev 3332)
+++ trunk/libgconf-java/debian/libgconf-java-doc.doc-base	2007-04-24 21:23:41 UTC (rev 3333)
@@ -0,0 +1,9 @@
+Document: libgconf-java-doc
+Title: Programmer API for LIBGCONF Java bindings
+Author: Jeffrey S. Morgan <kuzman at gmail.com>
+Abstract: Javadocs programmer API for the LIBGCONF Java bindings
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libgconf-java/api/index.html
+Files: /usr/share/doc/libgconf-java/api/*.html

Added: trunk/libgconf-java/debian/libgconf-java-gcj.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-java-gcj.install	2007-04-24 20:54:55 UTC (rev 3332)
+++ trunk/libgconf-java/debian/libgconf-java-gcj.install	2007-04-24 21:23:41 UTC (rev 3333)
@@ -0,0 +1 @@
+gconf*.jar.so	usr/lib/gcj

Added: trunk/libgconf-java/debian/libgconf-java-gcj.postinst
===================================================================
--- trunk/libgconf-java/debian/libgconf-java-gcj.postinst	2007-04-24 20:54:55 UTC (rev 3332)
+++ trunk/libgconf-java/debian/libgconf-java-gcj.postinst	2007-04-24 21:23:41 UTC (rev 3333)
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = configure ] && which rebuild-gcj-db >/dev/null 2>&1; then
+        rebuild-gcj-db
+fi

Modified: trunk/libgconf-java/debian/libgconf-java.install
===================================================================
--- trunk/libgconf-java/debian/libgconf-java.install	2007-04-24 20:54:55 UTC (rev 3332)
+++ trunk/libgconf-java/debian/libgconf-java.install	2007-04-24 21:23:41 UTC (rev 3333)
@@ -1 +1,3 @@
-debian/tmp/usr/*
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/lib*jni*.so	usr/lib/jni
+debian/tmp/usr/share/java

Modified: trunk/libgconf-java/debian/rules
===================================================================
--- trunk/libgconf-java/debian/rules	2007-04-24 20:54:55 UTC (rev 3332)
+++ trunk/libgconf-java/debian/rules	2007-04-24 21:23:41 UTC (rev 3333)
@@ -5,16 +5,64 @@
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-CFLAGS = -I/usr/lib/jvm/java-gcj/include
+base = libgconf-java
+jar  = gconf2.12.jar
 
-binary-post-install/libgconf-java::
-	mv debian/libgconf-java/usr/share/doc/libgconf-java-*/* \
-		debian/libgconf-java/usr/share/doc/libgconf-java/
-	rmdir debian/libgconf-java/usr/share/doc/libgconf-java-*
-	rm -f debian/libgconf-java/usr/share/doc/libgconf-java/COPYING*
-	rm -f debian/libgconf-java/usr/share/doc/libgconf-java/INSTALL*
+with_native := yes
+GCJ = /usr/lib/jvm/java-gcj/bin/gcj
+GCJ_DBTOOL = /usr/lib/jvm/java-gcj/bin/gcj-dbtool
 
+DEB_CONFIGURE_EXTRA_FLAGS = --without-javadocs --without-gcj-compile
+
+DEB_MAKE_INSTALL_TARGET  := install DESTDIR=$(CURDIR)/debian/tmp/ \
+	docdir='$$(datadir)/doc/$(base)' \
+	apidir='$$(datadir)/doc/$(base)-doc/api'
+
+DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibgconfjni
+DEB_COMPRESS_EXCLUDE = .java
+
+common-post-build-indep::
+	$(MAKE) doc-stamp \
+	    JAVADOC=gjdoc \
+	    JAVADOC_OPTIONS='' \
+	    JAVADOC_FOOTER=''
+
+ifeq ($(with_native),yes)
+common-post-build-arch:: $(jar).so
+$(jar).so: $(jar)
+common-post-build-arch::
+	$(GCJ) -O2 -g -Wl,-Bsymbolic,-O1 \
+	    -shared -fPIC -fjni -findirect-dispatch \
+	    -o $(jar).so \
+	    $(jar)
+endif
+
+binary-post-install/$(base)::
+	sed -i -e 's/-[0-9.]*\.jar$$/.jar/' \
+	    debian/$(base)/usr/lib/pkgconfig/gconf-java.pc
+
+binary-post-install/$(base)-gcj::
+ifeq ($(with_native),yes)
+	rm -rf debian/$(base)-gcj/usr/share/doc/$(base)-gcj
+	ln -s $(base) \
+	    debian/$(base)-gcj/usr/share/doc/$(base)-gcj
+
+	mkdir -p debian/$(base)-gcj/usr/share/gcj/classmap.d
+	$(GCJ_DBTOOL) -n \
+	    debian/$(base)-gcj/usr/share/gcj/classmap.d/$(base).db
+
+	$(GCJ_DBTOOL) -f \
+	    debian/$(base)-gcj/usr/share/gcj/classmap.d/$(base).db \
+	    debian/$(base)/usr/share/java/$(jar) \
+	    /usr/lib/gcj/$(jar).so
+endif
+
+binary-post-install/$(base)-doc::
+	cd debian/$(base)-doc/usr/share/doc/$(base)-doc \
+	    && rm -f changelog
+
 clean::
-	-rm -rf doc/api/
-	find -name *.Plo | xargs rm -f
+	rm -rf doc/api
+	rm -f $(jar).so
+	find -name *.Plo | xargs -r rm -f
 




More information about the pkg-java-commits mailing list