Author: tgg Date: 2008-04-28 19:17:01 +0000 (Mon, 28 Apr 2008) New Revision: 6333
Modified: trunk/libgnome-java/debian/changelog trunk/libgnome-java/debian/control trunk/libgnome-java/debian/copyright trunk/libgnome-java/debian/libgnome-java-dev.install trunk/libgnome-java/debian/rules Log: fix #477872 Modified: trunk/libgnome-java/debian/changelog =================================================================== --- trunk/libgnome-java/debian/changelog 2008-04-28 11:19:07 UTC (rev 6332) +++ trunk/libgnome-java/debian/changelog 2008-04-28 19:17:01 UTC (rev 6333) @@ -1,3 +1,12 @@ +libgnome-java (2.12.7-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: #477872. + * Add missing © sign to debian/copyright to fix a lintian warning. + + -- Thomas Girard <[EMAIL PROTECTED]> Mon, 28 Apr 2008 21:02:28 +0200 + libgnome-java (2.12.7-4) unstable; urgency=low [ Mark Howard ] Modified: trunk/libgnome-java/debian/control =================================================================== --- trunk/libgnome-java/debian/control 2008-04-28 11:19:07 UTC (rev 6332) +++ trunk/libgnome-java/debian/control 2008-04-28 19:17:01 UTC (rev 6333) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java maintainers <[EMAIL PROTECTED]> Uploaders: Mark Howard <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, Thomas Girard <[EMAIL PROTECTED]> -Build-Depends: debhelper (>> 5), 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), libgtk-java-dev (>= 2.10.2-4), 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, docbook-utils, cdbs (>= 0.4.34), pkg-config, libglib-java-dev (>= 0.4.2-7), libgtk-java-dev (>= 2.10.2-4), 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/libgnome-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgnome-java Modified: trunk/libgnome-java/debian/copyright =================================================================== --- trunk/libgnome-java/debian/copyright 2008-04-28 11:19:07 UTC (rev 6332) +++ trunk/libgnome-java/debian/copyright 2008-04-28 19:17:01 UTC (rev 6333) @@ -12,7 +12,7 @@ Ismael Juma <[EMAIL PROTECTED]> Copyright Holders: - 1998-2004 the Java-Gnome Team + © 1998-2004 the Java-Gnome Team License: The Java-Gnome bindings library is free software distributed under Modified: trunk/libgnome-java/debian/libgnome-java-dev.install =================================================================== --- trunk/libgnome-java/debian/libgnome-java-dev.install 2008-04-28 11:19:07 UTC (rev 6332) +++ trunk/libgnome-java/debian/libgnome-java-dev.install 2008-04-28 19:17:01 UTC (rev 6333) @@ -1,3 +1,2 @@ debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/libgnomejni.so usr/lib/jni -debian/tmp/usr/lib/libgnomejava.so usr/lib Modified: trunk/libgnome-java/debian/rules =================================================================== --- trunk/libgnome-java/debian/rules 2008-04-28 11:19:07 UTC (rev 6332) +++ trunk/libgnome-java/debian/rules 2008-04-28 19:17:01 UTC (rev 6333) @@ -15,15 +15,19 @@ cni = libgnome-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/gnome2-java.pc +ifeq ($(with_gcj),yes) + ln -s `readlink debian/tmp/usr/lib/libgnomejava.so` \ + debian/$(dev)/usr/lib/libgnomejava.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
