[pkg-java] r15135 - trunk/antlr/debian

Thu Sep 29 20:35:37 UTC 2011

Author: twerner
Date: 2011-09-29 20:35:37 +0000 (Thu, 29 Sep 2011)
New Revision: 15135

Modified:
   trunk/antlr/debian/changelog
   trunk/antlr/debian/control
   trunk/antlr/debian/rules
Log:
Do no longer build packages cantlr and libantlr-java-gcj.

Modified: trunk/antlr/debian/changelog
===================================================================

--- trunk/antlr/debian/changelog	2011-09-29 20:16:09 UTC (rev 15134)
+++ trunk/antlr/debian/changelog	2011-09-29 20:35:37 UTC (rev 15135)
@@ -2,8 +2,9 @@
 
   * Remove 2 non-free files from orig tarball. Thanks to Sam Geeraerts.
     (Closes: #643576)
+  * Do no longer build packages cantlr and libantlr-java-gcj.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 29 Sep 2011 22:14:51 +0200
+ -- Torsten Werner <twerner at debian.org>  Thu, 29 Sep 2011 22:29:52 +0200
 
 antlr (2.7.7-17) unstable; urgency=low
 

Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control	2011-09-29 20:16:09 UTC (rev 15134)
+++ trunk/antlr/debian/control	2011-09-29 20:35:37 UTC (rev 15135)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7), default-jdk, gcj-native-helper, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
+Build-Depends: debhelper (>= 7), default-jdk, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
 Build-Depends-Indep: maven-repo-helper, python-support (>= 0.3), nant, cli-common-dev (>= 0.7), mono-devel | c-sharp-compiler, libmono-winforms2.0-cil
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr
@@ -32,7 +32,6 @@
 Package: libantlr-java
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: libantlr-java-gcj
 Replaces: antlr (<< 2.7.7-8)
 Breaks: antlr (<< 2.7.7-8)
 Description: language tool for constructing recognizers, compilers etc (java library)
@@ -44,18 +43,6 @@
  This package contains the java libraries without a dependency on any runtime
  to be able to bootstrap gcj without a dependency on a java runtime.
 
-Package: libantlr-java-gcj
-Architecture: any
-Depends: ${misc:Depends}, libantlr-java (>= ${source:Version}),
- ${shlibs:Depends}
-Replaces: antlr-gcj
-Description: language tool for constructing recognizers, compilers etc
- Native support for gcj for antlr. ANTLR stands for ANother
- Tool for Language Recognition, (formerly PCCTS). It is  a language tool
- that provides a framework for constructing recognizers, compilers, and
- translators from grammatical descriptions containing C++
- or Java actions.
-
 Package: libantlr-dev
 Section: libdevel
 Architecture: any
@@ -82,22 +69,6 @@
  .
  This package contains the C# (CLI) libraries.
 
-Package: cantlr
-Section: devel
-Architecture: any
-Depends: ${misc:Depends}, 
- gcj-jre | gcj-jre-headless, 
- libantlr-java-gcj, 
- ${shlibs:Depends}
-Description: language tool for constructing recognizers, compilers etc
- This is the native-compiled version of antlr. ANTLR stands for ANother
- Tool for Language Recognition, (formerly PCCTS). It 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].
- .
- See antlr package for a complete description.
-
 Package: antlr-doc
 Section: doc
 Architecture: all

Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules	2011-09-29 20:16:09 UTC (rev 15134)
+++ trunk/antlr/debian/rules	2011-09-29 20:35:37 UTC (rev 15135)
@@ -4,16 +4,9 @@
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR = $(shell pwd)/debian
 
-include /usr/share/gcj/debian_defaults
-
 PACKAGE     := antlr
 VERSION		:= $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d- -f1 | cut -d+ -f1)
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
-  with_native := yes
-endif
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -91,8 +84,6 @@
 	dh_link -a
 	$(MAKE) -C lib/cpp install prefix=`pwd`/debian/libantlr-dev/usr
 	install -m755 scripts/antlr-config debian/libantlr-dev/usr/bin
-	install -m755 debian/cantlr.sh debian/cantlr/usr/bin
-	install -m644 -D CHANGES.txt debian/cantlr/usr/share/doc/cantlr/changelog
 	install -m644 -D CHANGES.txt debian/libantlr-dev/usr/share/doc/libantlr-dev/changelog
 	install -m644 debian/libantlr-pic.a debian/libantlr-dev/usr/lib/
 
@@ -163,41 +154,22 @@
 
 
 binary-arch: build install
-	# libantlr-dev and cantlr
+	# libantlr-dev
 	dh_testdir
 	dh_testroot
-	dh_installdocs -plibantlr-dev -pcantlr
-	dh_installexamples -plibantlr-dev -pcantlr
-	dh_installman -pcantlr
-	dh_installchangelogs -plibantlr-dev -pcantlr
-	dh_strip -plibantlr-dev -pcantlr
-	dh_compress -plibantlr-dev -pcantlr
-	dh_fixperms -plibantlr-dev -pcantlr
-	dh_makeshlibs -plibantlr-dev -pcantlr
-	dh_installdeb -plibantlr-dev -pcantlr
-	dh_shlibdeps -plibantlr-dev -pcantlr
-	dh_gencontrol -plibantlr-dev -pcantlr
-	dh_md5sums -plibantlr-dev -pcantlr
-	dh_builddeb -plibantlr-dev -pcantlr
+	dh_installdocs -plibantlr-dev
+	dh_installexamples -plibantlr-dev
+	dh_installchangelogs -plibantlr-dev
+	dh_strip -plibantlr-dev
+	dh_compress -plibantlr-dev
+	dh_fixperms -plibantlr-dev
+	dh_makeshlibs -plibantlr-dev
+	dh_installdeb -plibantlr-dev
+	dh_shlibdeps -plibantlr-dev
+	dh_gencontrol -plibantlr-dev
+	dh_md5sums -plibantlr-dev
+	dh_builddeb -plibantlr-dev
 
-ifeq ($(with_native),yes)
-	if [ ! -f debian/libantlr-java/usr/share/java/antlr.jar ]; then \
-	  $(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/libantlr-java; \
-	fi
-	mkdir -p debian/libantlr-java-gcj/usr/share/doc
-	ln -s libantlr-java debian/libantlr-java-gcj/usr/share/doc/libantlr-java-gcj
-	dh_nativejava -plibantlr-java-gcj
-	dh_strip -plibantlr-java-gcj
-	dh_compress -plibantlr-java-gcj
-	dh_fixperms -plibantlr-java-gcj
-	dh_makeshlibs -plibantlr-java-gcj
-	dh_installdeb -plibantlr-java-gcj
-	dh_shlibdeps -plibantlr-java-gcj
-	dh_gencontrol -plibantlr-java-gcj
-	dh_md5sums -plibantlr-java-gcj
-	dh_builddeb -plibantlr-java-gcj
-endif
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
 


