Author: tgg Date: 2008-04-27 20:50:35 +0000 (Sun, 27 Apr 2008) New Revision: 6316
Modified: trunk/libglade-java/debian/changelog trunk/libglade-java/debian/control trunk/libglade-java/debian/copyright trunk/libglade-java/debian/libglade-java-dev.install trunk/libglade-java/debian/rules Log: fix #477880 Modified: trunk/libglade-java/debian/changelog =================================================================== --- trunk/libglade-java/debian/changelog 2008-04-27 20:40:36 UTC (rev 6315) +++ trunk/libglade-java/debian/changelog 2008-04-27 20:50:35 UTC (rev 6316) @@ -1,3 +1,12 @@ +libglade-java (2.12.8-5) 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: #477880. + * Add missing © sign to debian/copyright to fix a lintian warning. + + -- Thomas Girard <[EMAIL PROTECTED]> Sun, 27 Apr 2008 22:47:18 +0200 + libglade-java (2.12.8-4) unstable; urgency=low [ Mark Howard ] Modified: trunk/libglade-java/debian/control =================================================================== --- trunk/libglade-java/debian/control 2008-04-27 20:40:36 UTC (rev 6315) +++ trunk/libglade-java/debian/control 2008-04-27 20:50:35 UTC (rev 6316) @@ -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), gcj, java-gcj-compat-dev (>= 1.0.65-6), docbook-utils, cdbs, pkg-config, libglib-java-dev (>= 0.4.2-7), libgtk-java-dev (>= 2.10.2-4), libgnome-java-dev (>= 2.12.7-3), libglade2-dev (>= 2.5.1), libgnomeui-dev (>= 2.11.0), libgnomecanvas2-dev (>= 2.11.0), quilt (>= 0.29-2), autotools-dev +Build-Depends: debhelper (>> 5), gcj [!alpha !arm !hppa !hurd-i386], default-jdk-builddep, docbook-utils, cdbs, pkg-config, libglib-java-dev (>= 0.4.2-7), libgtk-java-dev (>= 2.10.2-4), libgnome-java-dev (>= 2.12.7-3), libglade2-dev (>= 2.5.1), libgnomeui-dev (>= 2.11.0), libgnomecanvas2-dev (>= 2.11.0), quilt (>= 0.29-2), autotools-dev Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libglade-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libglade-java Modified: trunk/libglade-java/debian/copyright =================================================================== --- trunk/libglade-java/debian/copyright 2008-04-27 20:40:36 UTC (rev 6315) +++ trunk/libglade-java/debian/copyright 2008-04-27 20:50:35 UTC (rev 6316) @@ -12,7 +12,7 @@ Ismael Juma <[EMAIL PROTECTED]> Copyright Holders: - 1998-2005 the Java-Gnome Team + © 1998-2005 the Java-Gnome Team License: The Java-Gnome bindings library is free software distributed under Modified: trunk/libglade-java/debian/libglade-java-dev.install =================================================================== --- trunk/libglade-java/debian/libglade-java-dev.install 2008-04-27 20:40:36 UTC (rev 6315) +++ trunk/libglade-java/debian/libglade-java-dev.install 2008-04-27 20:50:35 UTC (rev 6316) @@ -1,3 +1,2 @@ debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/libgladejni.so usr/lib/jni -debian/tmp/usr/lib/libgladejava.so usr/lib Modified: trunk/libglade-java/debian/rules =================================================================== --- trunk/libglade-java/debian/rules 2008-04-27 20:40:36 UTC (rev 6315) +++ trunk/libglade-java/debian/rules 2008-04-27 20:50:35 UTC (rev 6316) @@ -15,15 +15,19 @@ cni = libglade-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" DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ \ docdir='$$(datadir)/doc/$(base)' \ @@ -43,10 +47,16 @@ binary-post-install/$(dev):: sed -i -e 's/-[0-9.]*\.jar$$/.jar/' \ debian/$(dev)/usr/lib/pkgconfig/glade-java.pc +ifeq ($(with_gcj),yes) + ln -s `readlink debian/tmp/usr/lib/libgladejava.so` \ + debian/$(dev)/usr/lib/libgladejava.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
