Author: tgg Date: 2008-04-28 21:11:40 +0000 (Mon, 28 Apr 2008) New Revision: 6341
Modified: trunk/libgtk-java/debian/changelog trunk/libgtk-java/debian/control trunk/libgtk-java/debian/copyright trunk/libgtk-java/debian/libgtk-java-dev.install trunk/libgtk-java/debian/rules Log: fix #477873. Prepare package for upload. Modified: trunk/libgtk-java/debian/changelog =================================================================== --- trunk/libgtk-java/debian/changelog 2008-04-28 20:43:49 UTC (rev 6340) +++ trunk/libgtk-java/debian/changelog 2008-04-28 21:11:40 UTC (rev 6341) @@ -1,3 +1,15 @@ +libgtk-java (2.10.2-7) unstable; urgency=low + + * Build-depends on default-jdk-builddep, and set JAVA_HOME to + /usr/lib/jvm/default-java. Do not build-depend on gcj or attempt to + build -cni package on unsupported arches. Closes: #477873. + * Add missing © sign to debian/copyright to fix a lintian warning. + * New patch, 02_bz_516078.diff, taken from GNOME bugzilla: + http://bugzilla.gnome.org/show_bug.cgi?id=516078 + Thanks to Andrew Cagney for pointing this out. Closes: #478320. + + -- Thomas Girard <[EMAIL PROTECTED]> Mon, 28 Apr 2008 22:54:58 +0200 + libgtk-java (2.10.2-6) unstable; urgency=low * Alter DEB_CONFIGURE_SCRIPT_ENV to pass -I/usr/lib/jvm/java-gcj/include Modified: trunk/libgtk-java/debian/control =================================================================== --- trunk/libgtk-java/debian/control 2008-04-28 20:43:49 UTC (rev 6340) +++ trunk/libgtk-java/debian/control 2008-04-28 21:11:40 UTC (rev 6341) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java maintainers <[EMAIL PROTECTED]> Uploaders: Mark Howard <[EMAIL PROTECTED]>, Thomas Girard <[EMAIL PROTECTED]> -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-dev (>= 0.4.2-7), libcairo-java-dev (>= 1.0.8-5), quilt (>= 0.29-2), autotools-dev +Build-Depends: debhelper (>> 5), libgtk2.0-dev (>= 2.10.0), gcj [!alpha !arm !hppa !hurd-i386], default-jdk-builddep, docbook, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java-dev (>= 0.4.2-7), libcairo-java-dev (>= 1.0.8-5), quilt (>= 0.29-2), autotools-dev Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgtk-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgtk-java Modified: trunk/libgtk-java/debian/copyright =================================================================== --- trunk/libgtk-java/debian/copyright 2008-04-28 20:43:49 UTC (rev 6340) +++ trunk/libgtk-java/debian/copyright 2008-04-28 21:11:40 UTC (rev 6341) @@ -28,7 +28,7 @@ Sean Coughlan <[EMAIL PROTECTED]> Copyright Holders: - 1998-2006 the Java-Gnome Team + © 1998-2006 the Java-Gnome Team License: The Java-Gnome bindings library is free software distributed under Modified: trunk/libgtk-java/debian/libgtk-java-dev.install =================================================================== --- trunk/libgtk-java/debian/libgtk-java-dev.install 2008-04-28 20:43:49 UTC (rev 6340) +++ trunk/libgtk-java/debian/libgtk-java-dev.install 2008-04-28 21:11:40 UTC (rev 6341) @@ -1,4 +1,3 @@ debian/tmp/usr/include debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/libgtkjni.so usr/lib/jni -debian/tmp/usr/lib/libgtkjava.so usr/lib Modified: trunk/libgtk-java/debian/rules =================================================================== --- trunk/libgtk-java/debian/rules 2008-04-28 20:43:49 UTC (rev 6340) +++ trunk/libgtk-java/debian/rules 2008-04-28 21:11:40 UTC (rev 6341) @@ -15,15 +15,19 @@ cni = libgtk-cni dev = $(base)-dev -include /usr/share/gcj/debian_defaults +-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 +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_archs))) + with_gcj := yes +endif +JAVA_HOME := /usr/lib/jvm/default-java DEB_CONFIGURE_EXTRA_FLAGS = --without-javadocs -DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="-I/usr/lib/jvm/java-gcj/include" +DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="-I/usr/lib/jvm/default-java/include" # we distclean: before unpatching so we don't need cleaning after DEB_MAKE_CLEAN_TARGET = @@ -46,10 +50,16 @@ binary-post-install/$(dev):: sed -i -e 's/\r$$//' -e 's/-[0-9.]*\.jar$$/.jar/' \ debian/$(dev)/usr/lib/pkgconfig/gtk2-java.pc +ifeq ($(with_gcj),yes) + ln -s `readlink debian/tmp/usr/lib/libgtkjava.so` \ + debian/$(dev)/usr/lib/libgtkjava.so +endif +ifeq ($(with_gcj),yes) binary-post-install/$(cni):: mkdir -p debian/$(cni)/usr/share/lintian/overrides cp debian/$(cni).lintian debian/$(cni)/usr/share/lintian/overrides/$(cni) +endif binary-post-install/$(base)-gcj:: binary-post-install/$(base) rm -rf debian/$(base)-gcj/usr/share/doc/$(base)-gcj _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
