[pkg-java] r6335 - trunk/libvte-java/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-04-28 19:33:58 +0000 (Mon, 28 Apr 2008)
New Revision: 6335

Modified:
   trunk/libvte-java/debian/changelog
   trunk/libvte-java/debian/copyright
   trunk/libvte-java/debian/libvte-java-dev.install
   trunk/libvte-java/debian/rules
Log:
fix #477894


Modified: trunk/libvte-java/debian/changelog
===================================================================
--- trunk/libvte-java/debian/changelog	2008-04-28 19:29:45 UTC (rev 6334)
+++ trunk/libvte-java/debian/changelog	2008-04-28 19:33:58 UTC (rev 6335)
@@ -1,3 +1,12 @@
+libvte-java (0.12.3-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: #477894.
+  * Add missing © sign to debian/copyright to fix a lintian warning.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Mon, 28 Apr 2008 21:29:32 +0200
+
 libvte-java (0.12.3-4) unstable; urgency=low
 
   [ Mark Howard ]

Modified: trunk/libvte-java/debian/copyright
===================================================================
--- trunk/libvte-java/debian/copyright	2008-04-28 19:29:45 UTC (rev 6334)
+++ trunk/libvte-java/debian/copyright	2008-04-28 19:33:58 UTC (rev 6335)
@@ -11,7 +11,7 @@
 	Luca De Rugeriis <piedamaro at fastwebnet.it>
 
 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/libvte-java/debian/libvte-java-dev.install
===================================================================
--- trunk/libvte-java/debian/libvte-java-dev.install	2008-04-28 19:29:45 UTC (rev 6334)
+++ trunk/libvte-java/debian/libvte-java-dev.install	2008-04-28 19:33:58 UTC (rev 6335)
@@ -1,3 +1,2 @@
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/lib/libvtejni.so		usr/lib/jni
-debian/tmp/usr/lib/libvtejava.so	usr/lib

Modified: trunk/libvte-java/debian/rules
===================================================================
--- trunk/libvte-java/debian/rules	2008-04-28 19:29:45 UTC (rev 6334)
+++ trunk/libvte-java/debian/rules	2008-04-28 19:33:58 UTC (rev 6335)
@@ -15,15 +15,18 @@
 cni  = libvte-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
 
 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 =
@@ -47,10 +50,16 @@
 binary-post-install/$(dev)::
 	sed -i -e 's/-[0-9.]*\.jar$$/.jar/' \
 	    debian/$(dev)/usr/lib/pkgconfig/vte-java.pc
+ifeq ($(with_gcj),yes)
+	ln -s `readlink debian/tmp/usr/lib/libvtejava.so` \
+	      debian/$(dev)/usr/lib/libvtejava.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