[DebianGIS-dev] CVS Update: openjump/debian rules control

[pere at haydn.debian.org]

  User: pere    
  Date: 06/03/11 13:11:09

  Modified:    debian   rules control
  Log:
  Switch to ecj and add lots of build dependencies.
  
  Revision  Changes    Path
  1.5       +9 -4      openjump/debian/rules
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?annotate=1.5&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules.diff?r1=1.5&r2=1.4&cvsroot=
  
  -----------------------------------
  
  Index: rules
  ===================================================================
  RCS file: /cvsroot/pkg-grass/openjump/debian/rules,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- rules	11 Mar 2006 12:52:38 -0000	1.4
  +++ rules	11 Mar 2006 13:11:09 -0000	1.5
  @@ -9,15 +9,20 @@
   
   JAVA_HOME := /usr/lib/kaffe
   ANT_HOME := /usr/share/ant
  -DEB_ANT_COMPILER := jikes
  -DEB_ANT_ARGS := -f debian/openjump-build.xml
   
  -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jts log4j-1.2
  +DEB_ANT_BUILDFILE    := debian/openjump-build.xml
   DEB_ANT_BUILD_TARGET := jar
  +DEB_JARS             = $(ANT_HOME)/lib/ant-launcher.jar jts log4j-1.2 xercesImpl jdom1 jama junit
  +
  +# Jikes
  +#DEB_ANT_COMPILER     := jikes
  +# ECJ
  +DEB_ANT_COMPILER     := org.eclipse.jdt.core.JDTCompilerAdapter
  +DEB_JARS             := $(DEB_JARS) ecj
   
   clean::
   	rm -rf build lib
  -	
  +
   install/openjump::
   #	install -m 644 dist/bsh-$(UPSTREAM_VERSION).jar debian/bsh/usr/share/java/bsh-$(UPSTREAM_VERSION).jar
   #	ln -s bsh-$(UPSTREAM_VERSION).jar debian/bsh/usr/share/java/bsh.jar
  
  
  
  1.3       +1 -1      openjump/debian/control
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/control?annotate=1.3&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/control?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/control.diff?r1=1.3&r2=1.2&cvsroot=
  
  -----------------------------------
  
  Index: control
  ===================================================================
  RCS file: /cvsroot/pkg-grass/openjump/debian/control,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- control	11 Mar 2006 12:52:38 -0000	1.2
  +++ control	11 Mar 2006 13:11:09 -0000	1.3
  @@ -3,7 +3,7 @@
   Priority: optional
   Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
   Uploaders: Petter Reinholdtsen <pere at debian.org>
  -Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-1), ant, libjts-java, liblog4j1.2-java
  +Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-1), ant, libjts-java, liblog4j1.2-java, libxerces2-java, libjdom1-java, libjama-java, junit
   Standards-Version: 3.6.2
   
   Package: openjump