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

[Torsten Werner]

Author: twerner
Date: 2011-09-27 20:59:14 +0000 (Tue, 27 Sep 2011)
New Revision: 15080

Modified:
   trunk/antlr3/debian/changelog
   trunk/antlr3/debian/control
   trunk/antlr3/debian/rules
Log:
* Team upload.
* Add missing Build-Depends: libmaven-plugin-tools-java. (Closes: #643493)
* Do no longer build antlr3-gcj.

Modified: trunk/antlr3/debian/changelog
===================================================================
--- trunk/antlr3/debian/changelog	2011-09-27 20:39:46 UTC (rev 15079)
+++ trunk/antlr3/debian/changelog	2011-09-27 20:59:14 UTC (rev 15080)
@@ -1,3 +1,11 @@
+antlr3 (3.2-6) unstable; urgency=low
+
+  * Team upload.
+  * Add missing Build-Depends: libmaven-plugin-tools-java. (Closes: #643493)
+  * Do no longer build antlr3-gcj.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 27 Sep 2011 22:49:38 +0200
+
 antlr3 (3.2-5) unstable; urgency=low
 
   * Team upload.

Modified: trunk/antlr3/debian/control
===================================================================
--- trunk/antlr3/debian/control	2011-09-27 20:39:46 UTC (rev 15079)
+++ trunk/antlr3/debian/control	2011-09-27 20:59:14 UTC (rev 15080)
@@ -7,7 +7,7 @@
  maven-debian-helper (>= 1.1), libstringtemplate-java (>= 3.2.1),
  libantlr-maven-plugin-java (>= 2.1), libmaven-plugin-testing-java,
  libmaven-javadoc-plugin-java, libmaven-install-plugin-java,
- default-jdk-doc, gcj-native-helper
+ default-jdk-doc, libmaven-plugin-tools-java
 Standards-Version: 3.9.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr3
@@ -20,7 +20,6 @@
  java5-runtime-headless | java6-runtime-headless,
  libstringtemplate-java
 Recommends: ${maven:OptionalDepends}
-Suggests: antlr3-gcj
 Description: language tool for constructing recognizers, compilers etc
  ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is 
  a language tool that provides a framework for constructing recognizers,
@@ -36,17 +35,6 @@
  files (e.g., HTML, SGML).  ANTLR is designed to handle all of your 
  translation tasks.
 
-Package: antlr3-gcj
-Architecture: any
-Depends: antlr3 (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: language tool for constructing recognizers, compilers etc (native code)
- ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is 
- a language tool that provides a framework for constructing recognizers,
- compilers, and translators from grammatical descriptions containing C++
- or Java actions [You can use PCCTS 1.xx to generate C-based parsers].
- . 
- This package contains the natively compiled code for use by gij.
-
 Package: antlr3-doc
 Architecture: all
 Section: doc

Modified: trunk/antlr3/debian/rules
===================================================================
--- trunk/antlr3/debian/rules	2011-09-27 20:39:46 UTC (rev 15079)
+++ trunk/antlr3/debian/rules	2011-09-27 20:59:14 UTC (rev 15080)
@@ -6,13 +6,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
-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_MAVEN_INSTALL_TO_USJ := false
 DEB_MAVEN_BUILD_TARGET := package install
 DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
@@ -35,24 +28,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
 	mh_linkrepojar -plibantlr3-gunit-java gunit/pom.xml /usr/share/java/antlr3-gunit.jar
 	dh_installman -pantlr3
 
-binary-post-install/antlr3-gcj:: binary-post-install/antlr3
-	[ -f debian/antlr3/usr/share/java/antlr3-$(DEB_UPSTREAM_VERSION).jar ] \
-	  || install -m 644 -D tool/target/antlr-$(DEB_UPSTREAM_VERSION).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
-
 get-orig-source:
 		-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack