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

[Torsten Werner]

Author: twerner
Date: 2010-06-27 19:28:42 +0000 (Sun, 27 Jun 2010)
New Revision: 12671

Modified:
   trunk/antlr3/debian/changelog
   trunk/antlr3/debian/rules
Log:
* Call dh_nativejava to fill the antlr3-gcj package again. (Closes: #587306)
* Reformat a changelog entry for the last version.
    [TODO] create an antlr3-gunit package and modify maven-debian-helper to
    deploy the gunit jars to this package

Modified: trunk/antlr3/debian/changelog
===================================================================
--- trunk/antlr3/debian/changelog	2010-06-27 19:23:13 UTC (rev 12670)
+++ trunk/antlr3/debian/changelog	2010-06-27 19:28:42 UTC (rev 12671)
@@ -1,5 +1,6 @@
 antlr3 (3.2-2) unstable; urgency=low
 
+  [ Ludovic Claude ]
   * New upstream (Closes: #579504)
   * debian/watch fixes in previous version (Closes: #570684)
   * Add missing antlr3-runtime.jar library to antlr3 wrapper script
@@ -8,8 +9,12 @@
     the whole environement when launching this program
   * Add man page for antlr3 script
 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sat, 26 Jun 2010 15:36:11 +0200
+  [ Torsten Werner ]
+  * Call dh_nativejava to fill the antlr3-gcj package again. (Closes: #587306)
+  * Reformat a changelog entry for the last version.
 
+ -- Torsten Werner <twerner at debian.org>  Sun, 27 Jun 2010 21:01:36 +0200
+
 antlr3 (3.2-1) unstable; urgency=low
 
   [ Ludovic Claude ]
@@ -25,7 +30,8 @@
       - antlr3 Depends: remove java1-runtime, add java5-runtime
       - downgrade antlr3-gcj from Recommands: to Suggests:
       - create an antlr3-doc package that contains the documentation
-      [TODO] create an antlr3-gunit package and modify maven-debian-helper to deploy the gunit jars to this package
+      [TODO] create an antlr3-gunit package and modify maven-debian-helper to
+      deploy the gunit jars to this package
   * debian/rules: remove include simple-patchsys.mk, replaced by
     source format 3.0 (quilt)
   * Add orig-tar to clean up upstream sources

Modified: trunk/antlr3/debian/rules
===================================================================
--- trunk/antlr3/debian/rules	2010-06-27 19:23:13 UTC (rev 12670)
+++ trunk/antlr3/debian/rules	2010-06-27 19:28:42 UTC (rev 12671)
@@ -6,12 +6,12 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
-#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
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_native := yes
+endif
 
 DEB_MAVEN_INSTALL_TO_USJ := false
 DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
@@ -34,6 +34,11 @@
 	rm -rf tool/src/main/java/org/antlr/grammar/v3
 	mh_unpatchpoms -pantlr3
 
+ifeq ($(with_native),yes)
+install/antlr3-gcj:: install/antlr3
+	dh_nativejava -pantlr3-gcj
+endif
+
 binary-post-install/antlr3::
 	mh_linkrepojar -pantlr3 runtime/Java/pom.xml /usr/share/java/antlr3-runtime.jar
 	mh_linkrepojar -pantlr3 tool/pom.xml /usr/share/java/antlr3.jar
@@ -46,9 +51,6 @@
 	rm -rf debian/antlr3-gcj/usr/share/doc/antlr3-gcj
 	ln -s antlr3 \
 	    debian/antlr3-gcj/usr/share/doc/antlr3-gcj
-ifeq ($(with_native),yes)
-	dh_nativejava -pantlr3-gcj
-endif
 
 get-orig-source:
 		-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack