[pkg-java] r3215 - trunk/libgtk-java/debian
Thomas Girard
tgg at alioth.debian.org
Sat Apr 14 17:44:43 UTC 2007
Author: tgg
Date: 2007-04-14 17:44:43 +0000 (Sat, 14 Apr 2007)
New Revision: 3215
Added:
trunk/libgtk-java/debian/libgtk-cni.install
trunk/libgtk-java/debian/libgtk-cni.lintian
trunk/libgtk-java/debian/libgtk-java.NEWS
Modified:
trunk/libgtk-java/debian/changelog
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:
commiting before I get asleep
Modified: trunk/libgtk-java/debian/changelog
===================================================================
--- trunk/libgtk-java/debian/changelog 2007-04-14 16:38:17 UTC (rev 3214)
+++ trunk/libgtk-java/debian/changelog 2007-04-14 17:44:43 UTC (rev 3215)
@@ -5,13 +5,16 @@
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}.
+ * Tighten build-dependency on libgtk2.0-dev.
+ * Drop build-dependency on docbook.
* Use dh_nativejava to build libgtk-java-gcj package.
- * Keep C++ ABI natively compiled classes in libgtk-jni.
+ * Move the CNI native code into new package libgtk-cni.
* Bump debhelper compat level to 5.
- * Build depend on autotools-dev.
+ * Build depend on autotools-dev and quilt.
+ * Move headers and pkgconfig files into libgtk-jni.
+ * TODO add missing dep for cairojava
- -- Thomas Girard <thomas.g.girard at free.fr> Thu, 29 Mar 2007 23:41:57 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr> Fri, 30 Mar 2007 22:48:31 +0000
libgtk-java (2.10.1-0ubuntu2) feisty; urgency=low
Modified: trunk/libgtk-java/debian/control
===================================================================
--- trunk/libgtk-java/debian/control 2007-04-14 16:38:17 UTC (rev 3214)
+++ trunk/libgtk-java/debian/control 2007-04-14 17:44:43 UTC (rev 3215)
@@ -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), libgtk2.0-dev (>= 2.10.0), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java (>= 0.4.2), libcairo-java (>= 1.0.8), dpkg-dev (>= 1.13.19), autotools-dev
+Build-Depends: debhelper (>> 5), libgtk2.0-dev (>= 2.10.0), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java (>= 0.4.2-4), libglib-cni, libcairo-java (>= 1.0.8-2), libcairo-cni, quilt (>= 0.29-2), autotools-dev
Standards-Version: 3.7.2.0
Package: libgtk-java
@@ -32,7 +32,7 @@
Depends: ${shlibs:Depends}
Replaces: libgtk0-jni, libgtk2-jni
Conflicts: libgtk2-jni
-Description: GTK+ bindings for Java
+Description: GTK+ bindings for Java (native library)
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
@@ -46,10 +46,28 @@
.
http://java-gnome.sf.net
+Package: libgtk-cni
+Section: libs
+Architecture: any
+Depends: libgtk-jni (= ${binary:Version}), ${shlibs:Depends}
+Description: GTK+ 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 GTK+ bindings.
+ .
+ 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}
+Depends: libgtk-java (>= ${source:Version}), libglib-java-gcj, libcairo-java-gcj, ${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
@@ -68,7 +86,7 @@
Section: doc
Architecture: all
Depends: classpath-doc, libglib-java-doc, libcairo-java-doc
-Conflicts: libgtk-java (<< 2.10.2-1)
+Replaces: 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
Added: trunk/libgtk-java/debian/libgtk-cni.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-cni.install 2007-04-14 16:38:17 UTC (rev 3214)
+++ trunk/libgtk-java/debian/libgtk-cni.install 2007-04-14 17:44:43 UTC (rev 3215)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libgtkjava*.so usr/lib
Added: trunk/libgtk-java/debian/libgtk-cni.lintian
===================================================================
--- trunk/libgtk-java/debian/libgtk-cni.lintian 2007-04-14 16:38:17 UTC (rev 3214)
+++ trunk/libgtk-java/debian/libgtk-cni.lintian 2007-04-14 17:44:43 UTC (rev 3215)
@@ -0,0 +1 @@
+libgtk-cni: package-name-doesnt-match-sonames libgtkjava-2.10
Added: trunk/libgtk-java/debian/libgtk-java.NEWS
===================================================================
--- trunk/libgtk-java/debian/libgtk-java.NEWS 2007-04-14 16:38:17 UTC (rev 3214)
+++ trunk/libgtk-java/debian/libgtk-java.NEWS 2007-04-14 17:44:43 UTC (rev 3215)
@@ -0,0 +1,14 @@
+libgtk-java (1.0.8-2) experimental; urgency=low
+
+ Documentation was moved from libgtk-java to a new libgtk-java-doc
+ package.
+
+ The C++ natively compiled library of libgtk-jni was moved to its own
+ package, libgtk-cni. Debian Java packages should no longer
+ contain ship with CNI libraries, but an exception was granted for
+ java-gnome libraries.
+
+ libgtk-java-gcj, which contains the new GCJ binary compatible native
+ classes is now included.
+
+ -- Thomas Girard <thomas.g.girard at free.fr> Sat, 14 Apr 2007 17:38:37 +0000
Modified: trunk/libgtk-java/debian/libgtk-java.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-java.install 2007-04-14 16:38:17 UTC (rev 3214)
+++ trunk/libgtk-java/debian/libgtk-java.install 2007-04-14 17:44:43 UTC (rev 3215)
@@ -1,4 +1 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/share/java
-debian/tmp/usr/share/libgtk-java
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/java/gtk*.jar
Modified: trunk/libgtk-java/debian/libgtk-jni.install
===================================================================
--- trunk/libgtk-java/debian/libgtk-jni.install 2007-04-14 16:38:17 UTC (rev 3214)
+++ trunk/libgtk-java/debian/libgtk-jni.install 2007-04-14 17:44:43 UTC (rev 3215)
@@ -1,2 +1,4 @@
+debian/tmp/usr/share/libgtk-java
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
debian/tmp/usr/lib/lib*jni*.so usr/lib/jni
-debian/tmp/usr/lib/libgtkjava*.so usr/lib
Modified: trunk/libgtk-java/debian/rules
===================================================================
--- trunk/libgtk-java/debian/rules 2007-04-14 16:38:17 UTC (rev 3214)
+++ trunk/libgtk-java/debian/rules 2007-04-14 17:44:43 UTC (rev 3215)
@@ -1,12 +1,18 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
+# make sure we'll run patched distclean: target *before* unpatching
+# because upstream distclean: removes files we want to keep
+clean:: distclean-first
+
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
base = libgtk-java
jar = gtk2.10.jar
-pc = gtk2-java.pc
+jni = libgtk-jni
+cni = libgtk-cni
include /usr/share/gcj/debian_defaults
@@ -17,11 +23,15 @@
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_ALL = -Xlibgtkjni
+DEB_DH_MAKESHLIBS_ARGS_$(jni) = -n -V "$(jni) (>= 2.10.2)"
+DEB_DH_SHLIBDEPS_ARGS_$(jni) = -l/usr/lib/jni
DEB_COMPRESS_EXCLUDE = .java
common-post-build-indep::
@@ -30,10 +40,14 @@
JAVADOC_OPTIONS='' \
JAVADOC_FOOTER=''
-binary-post-install/$(base)::
+binary-post-install/$(jni)::
sed -i -e 's/\r$$//' -e 's/-[0-9.]*\.jar$$/.jar/' \
- debian/$(base)/usr/lib/pkgconfig/$(pc)
+ debian/$(base)/usr/lib/pkgconfig/gtk2-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) \
@@ -49,3 +63,8 @@
clean::
rm -rf doc/api
find -name *.Plo | xargs -r rm -f
+
+DEB_PHONY_RULES += distclean-first
+
+distclean-first: debian/stamp-patched
+ -$(DEB_MAKE_INVOKE) -k distclean
More information about the pkg-java-commits
mailing list