[pkg-java] r3284 - trunk/libgnome-java/debian

Thomas Girard tgg at alioth.debian.org
Fri Apr 20 15:51:07 UTC 2007


Author: tgg
Date: 2007-04-20 15:51:06 +0000 (Fri, 20 Apr 2007)
New Revision: 3284

Added:
   trunk/libgnome-java/debian/libgnome-cni.install
   trunk/libgnome-java/debian/libgnome-cni.lintian
   trunk/libgnome-java/debian/libgnome-java-doc.doc-base
   trunk/libgnome-java/debian/libgnome-java-doc.install
   trunk/libgnome-java/debian/libgnome-java.NEWS
Modified:
   trunk/libgnome-java/debian/changelog
   trunk/libgnome-java/debian/compat
   trunk/libgnome-java/debian/control
   trunk/libgnome-java/debian/libgnome-java.install
   trunk/libgnome-java/debian/libgnome-jni.install
   trunk/libgnome-java/debian/rules
Log:
committing merged stuff, there's more to do


Modified: trunk/libgnome-java/debian/changelog
===================================================================
--- trunk/libgnome-java/debian/changelog	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/changelog	2007-04-20 15:51:06 UTC (rev 3284)
@@ -1,3 +1,52 @@
+libgnome-java (2.12.7-1) experimental; urgency=low
+
+  * New upstream release.
+  * Merge with Ubuntu:
+    o new package, libgnome-java-doc, split from libgnome-java
+    o new package, libgnome-java-gcj
+    o adjust dependencies on libgtk-java
+    o reduce package descriptions
+  * Restore shlib for libgnome-jni.
+  * New package, libgnome-cni, split from libgnome-jni.
+  * Switch to debhelper level 5.
+  * Drop dpkg-dev build-dependency, Etch fulfills it.
+  * Drop libgnome2-dev and libgtk2.0-dev build dependencies.
+  * Adjust build-dependencies on java-gcj-compat-dev, cdbs.
+  * Use ${source:Version} instead of ${Source-Version}.
+  * Add autotools-dev build-dependency.
+  * Add docbook build dependency.
+  * Register documentation with doc-base.
+  * Build with gcj from experimental.
+
+ --
+
+libgnome-java (2.12.6-0ubuntu1) feisty; urgency=low
+
+  * New upstream version.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sat,  6 Jan 2007 21:12:36 +0000
+
+libgnome-java (2.12.5-0ubuntu2) edgy; urgency=low
+
+  * Use unversioned jar name for in the classpath config.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon,  9 Oct 2006 23:22:35 +0200
+
+libgnome-java (2.12.5-0ubuntu1) edgy; urgency=low
+
+  * New upstream version (bug fix release).
+  * Use dh_nativejava to build the -gcj package.
+  * Makefile.am: Unconditionalize the doc-stamp target, remove the
+    install-data-hook.
+  * Split out libgnome-java-doc. Configure --without-javadocs, because gjdoc
+    fails on some architectures.
+  * Split out libgnome-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.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon,  9 Oct 2006 22:09:07 +0200
+
 libgnome-java (2.12.3-2) unstable; urgency=low
 
   * debian/control:

Modified: trunk/libgnome-java/debian/compat
===================================================================
--- trunk/libgnome-java/debian/compat	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/compat	2007-04-20 15:51:06 UTC (rev 3284)
@@ -1 +1 @@
-4
+5

Modified: trunk/libgnome-java/debian/control
===================================================================
--- trunk/libgnome-java/debian/control	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/control	2007-04-20 15:51:06 UTC (rev 3284)
@@ -3,14 +3,15 @@
 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, docbook-utils, cdbs, pkg-config, libgtk-java (>= 2.8), libgnome2-dev, libglib-java, libgnomeui-dev, libgnomecanvas2-dev, libgtk2.0-dev (>= 2.8), dpkg-dev (>= 1.13.19)
+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), libglib-java (>= 0.4.2), libgnomeui-dev (>= 2.11.0), libgnomecanvas2-dev (>= 2.11.0), autotools-dev
 Standards-Version: 3.7.2.0
 
 Package: libgnome-java
 Section: libs
 Architecture: all
-Depends: libgnome-jni (>= ${source:Version}), libgtk-java (>=2.8)
+Depends: libgnome-jni (>= ${source:Version}), libgtk-java (>= 2.10.2)
 Replaces: libgnome0-java, libgnome2-java
+Recommends: libgnome-java-gcj
 Conflicts: libgnome2-java
 Description: Gnome bindings for Java
  The Java-Gnome project provides a framework for creating Gtk and Gnome
@@ -21,19 +22,11 @@
  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 the architecture-independent files for gnome 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: libgnome-jni
 Section: libs
 Architecture: any
@@ -49,15 +42,63 @@
  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 the architecture-dependant files for gnome 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: libgnome-java-gcj
+Section: libs
+Architecture: any
+Depends: libgnome-java (= ${source:Version}), libgtk-java-gcj (>= 2.10.2), ${misc:Depends}, ${shlibs:Depends}
+Description: Gnome 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.
+ .
  http://java-gnome.sf.net
+
+Package: libgnome-java-doc
+Section: doc
+Architecture: all
+Depends: classpath-doc
+Replaces: libgnome-java (<< 2.12.5)
+Description: Gnome 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 contains the API documentation for the gnome bindings.
+ .
+ http://java-gnome.sf.net
+
+Package: libgnome-cni
+Section: libs
+Architecture: any
+Depends: libgnome-jni (= ${binary:Version}), ${shlibs:Depends}
+Replaces: libgnome-jni (<< 2.12.7-1)
+Description:  Gnome bindings for Java (native code)
+ 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 for gnome support.
+ .
+ http://java-gnome.sf.net

Added: trunk/libgnome-java/debian/libgnome-cni.install
===================================================================
--- trunk/libgnome-java/debian/libgnome-cni.install	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/libgnome-cni.install	2007-04-20 15:51:06 UTC (rev 3284)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libgnomejava*.so       usr/lib

Added: trunk/libgnome-java/debian/libgnome-cni.lintian
===================================================================
--- trunk/libgnome-java/debian/libgnome-cni.lintian	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/libgnome-cni.lintian	2007-04-20 15:51:06 UTC (rev 3284)
@@ -0,0 +1 @@
+libgnome-cni: package-name-doesnt-match-sonames libgnomejava-2.12

Added: trunk/libgnome-java/debian/libgnome-java-doc.doc-base
===================================================================
--- trunk/libgnome-java/debian/libgnome-java-doc.doc-base	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/libgnome-java-doc.doc-base	2007-04-20 15:51:06 UTC (rev 3284)
@@ -0,0 +1,9 @@
+Document: libgnome-java-doc
+Title: Programmer API for Gnome Java bindings
+Author: Jeffrey S. Morgan <kuzman at gmail.com>
+Abstract: Javadocs programmer API for the Gnome Java bindings
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libgnome-java/api/index.html
+Files: /usr/share/doc/libgnome-java/api/*.html

Added: trunk/libgnome-java/debian/libgnome-java-doc.install
===================================================================
--- trunk/libgnome-java/debian/libgnome-java-doc.install	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/libgnome-java-doc.install	2007-04-20 15:51:06 UTC (rev 3284)
@@ -0,0 +1,3 @@
+doc/api usr/share/doc/libgnome-java
+doc/examples usr/share/doc/libgnome-java
+doc/GNOME-tutorial.html usr/share/doc/libgnome-java

Added: trunk/libgnome-java/debian/libgnome-java.NEWS
===================================================================
--- trunk/libgnome-java/debian/libgnome-java.NEWS	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/libgnome-java.NEWS	2007-04-20 15:51:06 UTC (rev 3284)
@@ -0,0 +1,14 @@
+libgnome-java (2.12.7-1) experimental; urgency=low
+
+  Documentation was moved from libgnome-java to a new libgnome-java-doc
+  package.
+
+  The C++ natively compiled library of libgnome-jni was moved to its own
+  package, libgnome-cni. Debian Java packages should no longer
+  contain ship with CNI libraries, but an exception was granted for
+  java-gnome libraries.
+
+  libgnome-java-gcj, which contains the new GCJ binary compatible native
+  classes is now included.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Fri, 20 Apr 2007 11:00:13 +0000

Modified: trunk/libgnome-java/debian/libgnome-java.install
===================================================================
--- trunk/libgnome-java/debian/libgnome-java.install	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/libgnome-java.install	2007-04-20 15:51:06 UTC (rev 3284)
@@ -1 +1 @@
-debian/tmp/usr/share/*
+debian/tmp/usr/share/java/gnome*.jar

Modified: trunk/libgnome-java/debian/libgnome-jni.install
===================================================================
--- trunk/libgnome-java/debian/libgnome-jni.install	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/libgnome-jni.install	2007-04-20 15:51:06 UTC (rev 3284)
@@ -1 +1,2 @@
-debian/tmp/usr/lib/*
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/lib*jni*.so		usr/lib/jni

Modified: trunk/libgnome-java/debian/rules
===================================================================
--- trunk/libgnome-java/debian/rules	2007-04-20 08:38:33 UTC (rev 3283)
+++ trunk/libgnome-java/debian/rules	2007-04-20 15:51:06 UTC (rev 3284)
@@ -1,29 +1,71 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
 
-CFLAGS = -I/usr/lib/jvm/java-gcj/include
+# make sure we'll run patched distclean: target *before* unpatching
+# because upstream distclean: removes files we want to keep
+clean:: distclean-first
 
-binary-post-install/libgnome-java::
-	-mv debian/libgnome-java/usr/share/doc/libgnome-java-*/* \
-		debian/libgnome-java/usr/share/doc/libgnome-java/
-	-rmdir debian/libgnome-java/usr/share/doc/libgnome-java-*
-	rm -f debian/libgnome-java/usr/share/doc/libgnome-java/COPYING*
-	rm -f debian/libgnome-java/usr/share/doc/libgnome-java/INSTALL*
-	rm -f debian/libgnome-java/usr/share/doc/libgnome-java/NEWS*
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-binary-post-install/libgnome-jni::
-	-mv debian/libgnome-jni/usr/share/doc/libgnome-jni-*/* \
-		debian/libgnome-jni/usr/share/doc/libgnome-jni/
-	-rmdir debian/libgnome-jni/usr/share/doc/libgnome-jni-*
-	rm -f debian/libgnome-jni/usr/share/doc/libgnome-jni/COPYING*
-	rm -f debian/libgnome-jni/usr/share/doc/libgnome-jni/INSTALL*
-	rm -f debian/libgnome-jni/usr/share/doc/libgnome-jni/NEWS*
+base = libgnome-java
+jar  = gnome2.12.jar
+jni  = libgnome-jni
+cni  = libgnome-cni
 
+include /usr/share/gcj/debian_defaults
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture qDEB_HOST_ARCH)
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_native := yes
+endif
+
+DEB_CONFIGURE_EXTRA_FLAGS = --without-javadocs
+
+# we distclean: before unpatching so we don't need cleaning after
+DEB_MAKE_CLEAN_TARGET =
+
+DEB_MAKE_INSTALL_TARGET  := install DESTDIR=$(CURDIR)/debian/tmp/ \
+	docdir='$$(datadir)/doc/$(base)' \
+	apidir='$$(datadir)/doc/$(base)-doc/api'
+
+DEB_DH_MAKESHLIBS_ARGS_$(jni) = -n -V "$(jni) (>= 2.12.7)"
+DEB_DH_MAKESHLIBS_ARGS_$(cni) = -V "$(cni) (>= 2.12.7)"
+DEB_DH_SHLIBDEPS_ARGS_$(jni) = -l/usr/lib/jni
+DEB_COMPRESS_EXCLUDE = .java
+
+common-post-build-indep::
+	$(MAKE) doc-stamp \
+	    JAVADOC=gjdoc \
+	    JAVADOC_OPTIONS='' \
+	    JAVADOC_FOOTER=''
+
+binary-post-install/$(jni)::
+	sed -i -e 's/\r$$//' -e 's/-[0-9.]*\.jar$$/.jar/' \
+	    debian/$(jni)/usr/lib/pkgconfig/gnome2-java.pc
+
+binary-post-install/$(cni)::
+	mkdir -p debian/$(cni)/usr/share/lintian/overrides
+	cp debian/$(cni).lintian debian/$(cni)/usr/share/lintian/overrides/$(cni)
+
+binary-post-install/$(base)-gcj:: binary-post-install/$(base)
+	rm -rf debian/$(base)-gcj/usr/share/doc/$(base)-gcj
+	ln -s $(base) \
+	    debian/$(base)-gcj/usr/share/doc/$(base)-gcj
+ifeq ($(with_native),yes)
+	dh_nativejava -p$(base)-gcj
+endif
+
+binary-post-install/$(base)-doc::
+	rm -f debian/$(base)-doc/usr/share/doc/$(base)-doc/changelog
+	rm -f debian/$(base)-doc/usr/share/doc/$(base)/examples/runExample.sh.in
+
 clean::
-	-rm -rf doc/api/
-	find -name *.Plo | xargs rm -f
+	rm -rf doc/api
+	find -name *.Plo | xargs -r rm -f
 
+DEB_PHONY_RULES += distclean-first
+
+distclean-first:
+	-test -f debian/stamp-patched && $(DEB_MAKE_INVOKE) -k distclean




More information about the pkg-java-commits mailing list