[pkg-java] r2837 - trunk/gjdoc/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2006-12-04 16:41:33 +0100 (Mon, 04 Dec 2006)
New Revision: 2837

Modified:
   trunk/gjdoc/debian/changelog
   trunk/gjdoc/debian/rules
Log:
gjdoc (0.7.7-7) unstable; urgency=low

  * Use back gcj-dbtool-4.1 and gij-wrapper-4.1 on arm (closes:
    bug#400791). Thanks to Aurelien Jarno.

 -- Arnaud Vandyck <avdyk at debian.org>  Mon,  4 Dec 2006 16:39:35 +0100

Modified: trunk/gjdoc/debian/changelog
===================================================================
--- trunk/gjdoc/debian/changelog	2006-12-04 15:38:52 UTC (rev 2836)
+++ trunk/gjdoc/debian/changelog	2006-12-04 15:41:33 UTC (rev 2837)
@@ -1,3 +1,10 @@
+gjdoc (0.7.7-7) unstable; urgency=low
+
+  * Use back gcj-dbtool-4.1 and gij-wrapper-4.1 on arm (closes:
+    bug#400791). Thanks to Aurelien Jarno.
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Mon,  4 Dec 2006 16:39:35 +0100
+
 gjdoc (0.7.7-6) unstable; urgency=low
 
   * Use gcj-4.1, not gcj.

Modified: trunk/gjdoc/debian/rules
===================================================================
--- trunk/gjdoc/debian/rules	2006-12-04 15:38:52 UTC (rev 2836)
+++ trunk/gjdoc/debian/rules	2006-12-04 15:41:33 UTC (rev 2837)
@@ -21,13 +21,8 @@
 	GCJ=$(GCJ) \
 	ANTLR_JAR=$(ANTLR_JAR)
 
-ifeq ($(DEB_BUILD_ARCH),arm)
-  DEB_CONFIGURE_SCRIPT_ENV += JAVA=true
-  GCJ_DBTOOL = /bin/sh $(CURDIR)/debian/fake-dbtool
-else
-  DEB_CONFIGURE_SCRIPT_ENV += JAVA=/usr/bin/gij-wrapper-4.1
-  GCJ_DBTOOL = /usr/bin/gcj-dbtool-4.1
-endif
+DEB_CONFIGURE_SCRIPT_ENV += JAVA=/usr/bin/gij-wrapper-4.1
+GCJ_DBTOOL = /usr/bin/gcj-dbtool-4.1
 
 DEB_CONFIGURE_USER_FLAGS = --disable-native --enable-xmldoclet