[pkg-java] r3018 - trunk/javacc/debian

[Paul Cager]

Author: paulcager-guest
Date: 2007-02-25 23:52:57 +0100 (Sun, 25 Feb 2007)
New Revision: 3018

Added:
   trunk/javacc/debian/compat
Modified:
   trunk/javacc/debian/README.Debian
   trunk/javacc/debian/changelog
   trunk/javacc/debian/control
   trunk/javacc/debian/rules
Log:
Interim commit for JavaCC - not yet ready for upload.
  * New upstream release
  * Now true BSD license (Closes: #276302)
  * Added myself to co-maintainers
  * Upgraded to standards version 3.7.2
  * Bumped debhelper to version 5
  * Uses java-gcj compiler, rather than kaffe
  * Moved ant from build-depends-indep to build-depends as
    required by java-policy (and lintian)
  * Created watch file
  * Split into separate "-doc" binary package
  * Added a doc-base



Modified: trunk/javacc/debian/README.Debian
===================================================================
--- trunk/javacc/debian/README.Debian	2007-02-22 22:33:19 UTC (rev 3017)
+++ trunk/javacc/debian/README.Debian	2007-02-25 22:52:57 UTC (rev 3018)
@@ -1,6 +1,12 @@
 Debian README for JavaCC
 ------------------------
 
+JavaCC is now released under a pure, BSD license, including
+the bootstrap Jar. There is now no longer any need for a
+non-standard bootstrap Jar.
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Wed,  7 Feb 2007 11:34:45 +0000
+
 JavaCC was built using JavaCC (bootstrapped).
 The upstream bootstrap/javacc.jar classes were built
 using a non-free compiler and closed-source classes

Modified: trunk/javacc/debian/changelog
===================================================================
--- trunk/javacc/debian/changelog	2007-02-22 22:33:19 UTC (rev 3017)
+++ trunk/javacc/debian/changelog	2007-02-25 22:52:57 UTC (rev 3018)
@@ -1,3 +1,19 @@
+javacc (4.0+cvs20070207-1) experimental; urgency=low
+
+  * New upstream release
+  * Now true BSD license (Closes: #276302)
+  * Added myself to co-maintainers
+  * Upgraded to standards version 3.7.2
+  * Bumped debhelper to version 5
+  * Uses java-gcj compiler, rather than kaffe
+  * Moved ant from build-depends-indep to build-depends as
+    required by java-policy (and lintian)
+  * Created watch file
+  * Split into separate "-doc" binary package
+  * Added a doc-base
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Wed,  7 Feb 2007 11:34:45 +0000
+
 javacc (3.2+0-3) unstable; urgency=low
 
   * ant transition (closes: #331648).

Added: trunk/javacc/debian/compat
===================================================================
--- trunk/javacc/debian/compat	2007-02-22 22:33:19 UTC (rev 3017)
+++ trunk/javacc/debian/compat	2007-02-25 22:52:57 UTC (rev 3018)
@@ -0,0 +1 @@
+5

Modified: trunk/javacc/debian/control
===================================================================
--- trunk/javacc/debian/control	2007-02-22 22:33:19 UTC (rev 3017)
+++ trunk/javacc/debian/control	2007-02-25 22:52:57 UTC (rev 3018)
@@ -2,20 +2,35 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Nicolas Sabouret <nico at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), ant, libxerces-java | libxerces2-java, kaffe, jikes, docbook-to-man
-Standards-Version: 3.6.2
+Uploaders: Nicolas Sabouret <nico at debian.org>, Paul Cager <paul-debian at home.paulcager.org>
+Build-Depends: debhelper (>= 5), ant
+Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.65), libxerces2-java, docbook-to-man
+Standards-Version: 3.7.2
 
 Package: javacc
 Architecture: all
-Depends: kaffe | java-runtime | java1-runtime | java2-runtime
+Depends: kaffe | gij | sablevm | java-virtual-machine
+Suggests: javacc-doc
 Description: A parser generator for use with Java
- Java Compiler Compiler [tm] (JavaCC [tm]) is (according to sun)
+ Java Compiler Compiler (JavaCC) is (according to sun)
  "the most popular parser generator" for use with Java [tm]
  applications.
+ .
  A parser generator is a tool that reads a grammar specification
  and converts it to a Java program that can recognize matches to
  the grammar. In addition to the parser generator itself, JavaCC
  provides other standard capabilities related to parser
  generation such as tree building (via a tool called JJTree
  included with JavaCC), actions, debugging, etc. 
+ .
+  Homepage: http://javacc.dev.java.net/
+
+Package: javacc-doc
+Architecture: all
+Section: doc
+Depends: classpath-doc
+Suggests: javacc
+Description: Documentation for the JavaCC Parser Generator
+ Documentation and examples for JavaCC parser generator.
+ .
+  Homepage: http://javacc.dev.java.net/

Modified: trunk/javacc/debian/rules
===================================================================
--- trunk/javacc/debian/rules	2007-02-22 22:33:19 UTC (rev 3017)
+++ trunk/javacc/debian/rules	2007-02-25 22:52:57 UTC (rev 3018)
@@ -4,35 +4,30 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-DESTDIR=`pwd`/debian/tmp
+DESTDIR=`pwd`/debian/javacc
 
-# Java home directory and the JVM executable
-export JAVA_HOME=/usr/lib/kaffe
-export JAVACMD=${JAVA_HOME}/bin/java
+export JAVACMD=/usr/bin/gij
 
 # Class path: Ant requires an JAXP-compatible XML parser
 # You need to set CLASSPATH here (even if your build.xml assembles its own
 # class path) to ensure the same build results in all cases
 JARS=/usr/share/java
 ANT_HOME=/usr/share/ant
-export CLASSPATH=${JARS}/xmlParserAPI.jar:${JARS}/xmlImpl.jar:${ANT_HOME}/lib/ant.jar:${ANT_HOME}/lib/ant-launcher.jar
+export CLASSPATH=${JARS}/xmlParserAPI.jar:${JARS}/xmlImpl.jar:${ANT_HOME}/lib/ant.jar:${ANT_HOME}/lib/ant-launcher.jar:$(JARS)/junit.jar:${JARS}/ecj.jar
 
 # Ant options
-ANT_OPTS=-Dbuild.compiler=jikes -Dant.home=${ANT_HOME}
+ANT_OPTS=-Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter -Dant.home=${ANT_HOME} -Dant.build.javac.target=1.4
 ANT=${JAVACMD} org.apache.tools.ant.Main ${ANT_OPTS}
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
-
 	touch configure-stamp
 
 
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	# Add here commands to compile the package.
 	${ANT}
 	docbook-to-man debian/manpage.sgml > debian/javacc.1
 
@@ -42,7 +37,6 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	# Add here commands to clean up after the build process.
 	rm -f debian/javacc.1
 	${ANT} realclean
 
@@ -53,7 +47,6 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	# Add here commands to install the package into debian/javacc.
 	install -d $(DESTDIR)/usr/bin
 	install -m 0755 bin/javacc bin/jjdoc bin/jjtree $(DESTDIR)/usr/bin
 	install -d $(DESTDIR)/usr/share/java
@@ -67,27 +60,15 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
-	dh_installdocs www/doc
-	dh_installexamples examples/*
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
+	# Install docs in -doc package, but to /usr/share/doc/javacc/
+	dh_install -pjavacc-doc www/doc usr/share/doc/javacc
+	dh_installdocs -pjavacc -pjavacc-doc
+	dh_installexamples -pjavacc-doc examples/*
 	dh_installman debian/javacc.1
 	dh_link usr/share/man/man1/javacc.1 usr/share/man/man1/jjtree.1
 	dh_link usr/share/man/man1/javacc.1 usr/share/man/man1/jjdoc.1
-#	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol