[pkg-java] r7191 - trunk/antlr3/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-10-23 22:06:19 +0000 (Thu, 23 Oct 2008)
New Revision: 7191

Modified:
   trunk/antlr3/debian/changelog
   trunk/antlr3/debian/rules
Log:
antlr3 (3.0.1+dfsg-4) unstable; urgency=low

  * Fix build failure for binary-arch only builds. Closes: #502660.
  * Compile java files with -source 1.4.

 -- Matthias Klose <doko at debian.org>  Thu, 23 Oct 2008 01:32:35 +0200


Modified: trunk/antlr3/debian/changelog
===================================================================
--- trunk/antlr3/debian/changelog	2008-10-20 18:43:51 UTC (rev 7190)
+++ trunk/antlr3/debian/changelog	2008-10-23 22:06:19 UTC (rev 7191)
@@ -1,3 +1,10 @@
+antlr3 (3.0.1+dfsg-4) unstable; urgency=low
+
+  * Fix build failure for binary-arch only builds. Closes: #502660.
+  * Compile java files with -source 1.4.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 23 Oct 2008 01:32:35 +0200
+
 antlr3 (3.0.1+dfsg-3) unstable; urgency=low
 
   * antlr3: Depend on default-jre-headless.

Modified: trunk/antlr3/debian/rules
===================================================================
--- trunk/antlr3/debian/rules	2008-10-20 18:43:51 UTC (rev 7190)
+++ trunk/antlr3/debian/rules	2008-10-23 22:06:19 UTC (rev 7191)
@@ -12,14 +12,19 @@
 endif
 
 JAVA_HOME := /usr/lib/jvm/default-java
-
+ANT_OPTS = -Dant.build.javac.source=1.4
 DEB_JARS := ant-antlr antlr junit
 
 build/antlr3::
-	install -m 644 -D build/antlr.jar debian/antlr3/usr/share/java/antlr3-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -pantlr3 /usr/share/java/antlr3-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/antlr3.jar
+	install -m 644 -D build/antlr.jar \
+		debian/antlr3/usr/share/java/antlr3-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -pantlr3 /usr/share/java/antlr3-$(DEB_UPSTREAM_VERSION).jar \
+		/usr/share/java/antlr3.jar
 
 binary-post-install/antlr3-gcj:: binary-post-install/antlr3
+	[ -f debian/antlr3/usr/share/java/antlr3-$(DEB_UPSTREAM_VERSION).jar ] \
+	  || install -m 644 -D build/antlr.jar \
+		debian/antlr3/usr/share/java/antlr3-$(DEB_UPSTREAM_VERSION).jar
 	rm -rf debian/antlr3-gcj/usr/share/doc/antlr3-gcj
 	ln -s antlr3 \
 	    debian/antlr3-gcj/usr/share/doc/antlr3-gcj