[pkg-java] r3108 - trunk/libgtk-java/debian
Thomas Girard
tgg at alioth.debian.org
Sun Mar 25 18:45:47 CET 2007
Author: tgg
Date: 2007-03-25 17:45:47 +0000 (Sun, 25 Mar 2007)
New Revision: 3108
Added:
trunk/libgtk-java/debian/libgtk-java-doc.doc-base
trunk/libgtk-java/debian/libgtk-java-doc.install
Removed:
trunk/libgtk-java/debian/libgtk-jni.lintian
trunk/libgtk-java/debian/patches/
Modified:
trunk/libgtk-java/debian/changelog
trunk/libgtk-java/debian/compat
trunk/libgtk-java/debian/control
trunk/libgtk-java/debian/libgtk-java.install
trunk/libgtk-java/debian/libgtk-jni.install
trunk/libgtk-java/debian/rules
Log:
Merge with Ubuntu and update to latest release.
Modified: trunk/libgtk-java/debian/changelog
===================================================================
--- trunk/libgtk-java/debian/changelog 2007-03-25 09:06:43 UTC (rev 3107)
+++ trunk/libgtk-java/debian/changelog 2007-03-25 17:45:47 UTC (rev 3108)
@@ -1,3 +1,56 @@
+libgtk-java (2.10.2-1) experimental; urgency=low
+
+ * Merge with Ubuntu:
+ o splits libgtk-java into libgtk-java, libgtkjava-doc and libgtkjava-gcj.
+ o build depends on java-gcj-compat-dev >= 1.0.65-1.
+ * New upstream release.
+ * Tighten dpkg-dev dependency for ${source:Version}.
+ * Use dh_nativejava to build libgtk-java-gcj package.
+ * Bump debhelper compat level to 5.
+
+ -- Thomas Girard <thomas.g.girard at free.fr> Sun, 25 Mar 2007 17:29:48 +0000
+
+libgtk-java (2.10.1-0ubuntu2) feisty; urgency=low
+
+ * Tighten (build-)dependency on libcairo-java.
+
+ -- Matthias Klose <doko at ubuntu.com> Sun, 7 Jan 2007 00:33:15 +0000
+
+libgtk-java (2.10.1-0ubuntu1) feisty; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 6 Jan 2007 20:57:28 +0000
+
+libgtk-java (2.9.3-0ubuntu2) edgy; urgency=low
+
+ * debian/rules:
+ - use the .jar from the build rather than the installed copy, fix the build
+ when the "arch: all" packages are not built (Ubuntu: #59385)
+
+ -- Sebastien Bacher <seb128 at canonical.com> Thu, 21 Sep 2006 00:05:33 +0200
+
+libgtk-java (2.9.3-0ubuntu1) edgy; urgency=low
+
+ * New upstream version
+ * Rebuild with new libgcj (Ubuntu: #59319)
+
+ -- Sebastien Bacher <seb128 at canonical.com> Wed, 20 Sep 2006 19:50:53 +0200
+
+libgtk-java (2.9.1-0ubuntu1) edgy; urgency=low
+
+ * New upstream release
+ * Makefile.am: Unconditionalize the doc-stamp target, remove the
+ install-data-hook.
+ * Split out libgtk-java-doc. Configure --without-javadocs, because gjdoc
+ fails on some architectures.
+ * Split out libgtk-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> Wed, 16 Aug 2006 21:49:39 +0200
+
libgtk-java (2.8.5-1.2) unstable; urgency=medium
* Non-maintainer upload.
Modified: trunk/libgtk-java/debian/compat
===================================================================
--- trunk/libgtk-java/debian/compat 2007-03-25 09:06:43 UTC (rev 3107)
+++ trunk/libgtk-java/debian/compat 2007-03-25 17:45:47 UTC (rev 3108)
@@ -1 +1 @@
-4
+5
Modified: trunk/libgtk-java/debian/control
===================================================================
--- trunk/libgtk-java/debian/control 2007-03-25 09:06:43 UTC (rev 3107)
+++ trunk/libgtk-java/debian/control 2007-03-25 17:45:47 UTC (rev 3108)
@@ -2,14 +2,14 @@
Section: libs
Priority: optional
Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Howard <mh at debian.org>
-Build-Depends: debhelper (>> 5), libgtk2.0-dev (>=2.6), gcj, java-gcj-compat-dev, docbook, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java, libcairo-java
+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-1), docbook, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java-gcj (>= 0.4.2-2), libcairo-java-gcj (>= 1.0.8-2), dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2.0
Package: libgtk-java
Section: libs
Architecture: all
-Depends: libglib-java, libcairo-java, libgtk-jni (= ${source:Version})
+Depends: libgtk-jni (>= ${source:Version}), libglib-java (>= 0.4.2), libcairo-java (>= 1.0.8)
Replaces: libgtk0-java, libgtk2-java
Conflicts: libgtk2-java
Description: GTK+ bindings for Java
@@ -21,18 +21,10 @@
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 gtk+ 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.
+ This package provides the architecture-independant files for gtk+ support.
.
- http://java-gnome.sf.net
+ http://java-gnome.sf.net
Package: libgtk-jni
Section: libs
@@ -52,12 +44,39 @@
.
This package provides the architecture-dependant files for gtk+ 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: libgtk-java-gcj
+Section: libs
+Architecture: any
+Depends: libgtk-java (>= ${source:Version}), libglib-java-gcj (>= 0.4.2-2), libcairo-java-gcj (>= 1.0.8-2), ${shlibs:Depends}, ${misc:Depends}
+Description: GTK+ 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: libgtk-java-doc
+Section: doc
+Architecture: all
+Depends: classpath-doc, libglib-java-doc, libcairo-java-doc
+Conflicts: libgtk-java (<< 2.10.2-1)
+Description: GTK+ 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 gtk+ bindings.
Added: trunk/libgtk-java/debian/libgtk-java-doc.doc-base
===================================================================
--- trunk/libgtk-java/debian/libgtk-java-doc.doc-base 2007-03-25 09:06:43 UTC (rev 3107)
+++ trunk/libgtk-java/debian/libgtk-java-doc.doc-base 2007-03-25 17:45:47 UTC (rev 3108)
@@ -0,0 +1,9 @@
+Document: libgtk-java-doc
+Title: Programmer API for GTK+ Java bindings
+Author: Jeffrey S. Morgan <kuzman at gmail.com>
+Abstract: Javadocs programmer API for the GTK+ Java bindings
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libgtk-java/api/index.html
+Files: /usr/share/doc/libgtk-java/api/*.html
Added: trunk/libgtk-java/debian/libgtk-java-doc.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-java-doc.install 2007-03-25 09:06:43 UTC (rev 3107)
+++ trunk/libgtk-java/debian/libgtk-java-doc.install 2007-03-25 17:45:47 UTC (rev 3108)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/libgtk-java-*/examples usr/share/doc/libgtk-java
+doc/api usr/share/doc/libgtk-java
Modified: trunk/libgtk-java/debian/libgtk-java.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-java.install 2007-03-25 09:06:43 UTC (rev 3107)
+++ trunk/libgtk-java/debian/libgtk-java.install 2007-03-25 17:45:47 UTC (rev 3108)
@@ -1,2 +1,4 @@
debian/tmp/usr/include/*
-debian/tmp/usr/share/*
+debian/tmp/usr/share/java
+debian/tmp/usr/share/libgtk-java
+debian/tmp/usr/lib/pkgconfig
Modified: trunk/libgtk-java/debian/libgtk-jni.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-jni.install 2007-03-25 09:06:43 UTC (rev 3107)
+++ trunk/libgtk-java/debian/libgtk-jni.install 2007-03-25 17:45:47 UTC (rev 3108)
@@ -1 +1 @@
-debian/tmp/usr/lib/*
+debian/tmp/usr/lib/lib*jni*.so usr/lib/jni
Deleted: trunk/libgtk-java/debian/libgtk-jni.lintian
===================================================================
--- trunk/libgtk-java/debian/libgtk-jni.lintian 2007-03-25 09:06:43 UTC (rev 3107)
+++ trunk/libgtk-java/debian/libgtk-jni.lintian 2007-03-25 17:45:47 UTC (rev 3108)
@@ -1,2 +0,0 @@
-libgtk-jni: package-name-doesnt-match-sonames libgtkjni-2.8 libgtkjava-2.8
-
Modified: trunk/libgtk-java/debian/rules
===================================================================
--- trunk/libgtk-java/debian/rules 2007-03-25 09:06:43 UTC (rev 3107)
+++ trunk/libgtk-java/debian/rules 2007-03-25 17:45:47 UTC (rev 3108)
@@ -1,27 +1,51 @@
#!/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
+base = libgtk-java
+jar = gtk2.10.jar
+pc = gtk2-java.pc
-binary-post-install/libgtk-jni::
- -mv debian/libgtk-jni/usr/share/doc/libgtk-jni-*/* \
- debian/libgtk-jni/usr/share/doc/libgtk-jni/
- -rmdir debian/libgtk-jni/usr/share/doc/libgtk-jni-*
- rm -f debian/libgtk-jni/usr/share/doc/libgtk-jni/COPYING*
- rm -f debian/libgtk-jni/usr/share/doc/libgtk-jni/INSTALL*
+include /usr/share/gcj/debian_defaults
-binary-post-install/libgtk-java::
- mv debian/libgtk-java/usr/share/doc/libgtk-java-*/* \
- debian/libgtk-java/usr/share/doc/libgtk-java/
- rmdir debian/libgtk-java/usr/share/doc/libgtk-java-*
- rm -f debian/libgtk-java/usr/share/doc/libgtk-java/COPYING*
- rm -f debian/libgtk-java/usr/share/doc/libgtk-java/INSTALL*
+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 --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 = -Xlibgtkjni
+DEB_COMPRESS_EXCLUDE = .java
+
+common-post-build-indep::
+ $(MAKE) doc-stamp \
+ JAVADOC=gjdoc \
+ JAVADOC_OPTIONS='' \
+ JAVADOC_FOOTER=''
+
+binary-post-install/$(base)::
+ sed -i -e 's/\r$$//' -e 's/-[0-9.]*\.jar$$/.jar/' \
+ debian/$(base)/usr/lib/pkgconfig/$(pc)
+
+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
More information about the pkg-java-commits
mailing list