User: pere    
  Date: 06/03/11 20:36:28

  Modified:    debian   ant.properties changelog control openjump.dirs
                        rules
  Added:       debian   openjump-wrapper
  Log:
  Get the build working (except missing buoy).
  
  Revision  Changes    Path
  1.2       +1 -0      openjump/debian/ant.properties
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/ant.properties?annotate=1.2&cvsroot=
  
  CVSWeb: View this file:             
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/ant.properties?rev=1.2&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/ant.properties.diff?r1=1.2&r2=1.1&cvsroot=
  
  -----------------------------------
  
  Index: ant.properties
  ===================================================================
  RCS file: /cvsroot/pkg-grass/openjump/debian/ant.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties    11 Mar 2006 12:11:34 -0000      1.1
  +++ ant.properties    11 Mar 2006 20:36:08 -0000      1.2
  @@ -1 +1,2 @@
   javadoc-dir=api
  +build.sysclasspath=only
  
  
  
  1.2       +3 -0      openjump/debian/changelog
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/changelog?annotate=1.2&cvsroot=
  
  CVSWeb: View this file:             
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/changelog?rev=1.2&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/changelog.diff?r1=1.2&r2=1.1&cvsroot=
  
  -----------------------------------
  
  Index: changelog
  ===================================================================
  RCS file: /cvsroot/pkg-grass/openjump/debian/changelog,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- changelog 11 Mar 2006 12:11:34 -0000      1.1
  +++ changelog 11 Mar 2006 20:36:09 -0000      1.2
  @@ -1,6 +1,9 @@
   openjump (1.0-1) unstable; urgency=low
   
     * Initial Release.
  +  * Add 01_unused_sunapi.diff to avoid importing unused private SUN API.
  +  * Add 02_imageio.patch to rewrite the JPEG reading code to use the
  +    publicly documented API instead of the private SUN API.
   
    -- Petter Reinholdtsen <[EMAIL PROTECTED]>  Sun, 11 Jul 1999 12:41:22 +0200
   
  
  
  
  1.6       +2 -2      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.6&cvsroot=
  
  CVSWeb: View this file:             
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/control?rev=1.6&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.6&r2=1.5&cvsroot=
  
  -----------------------------------
  
  Index: control
  ===================================================================
  RCS file: /cvsroot/pkg-grass/openjump/debian/control,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- control   11 Mar 2006 15:04:10 -0000      1.5
  +++ control   11 Mar 2006 20:36:09 -0000      1.6
  @@ -3,13 +3,13 @@
   Priority: optional
   Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
   Uploaders: Petter Reinholdtsen <[EMAIL PROTECTED]>
  -Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, java-gcj-compat-dev, ant, 
libjts-java, liblog4j1.2-java, libxerces2-java, libjdom0-java, libjama-java, 
junit, bsh, libbatik-java
  +Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe, ant, libjts-java, 
liblog4j1.2-java, libxerces2-java, libjdom0-java, libjama-java, junit, bsh, 
libbatik-java
   Standards-Version: 3.6.2
   
   Package: openjump
   Section: devel
   Architecture: all
  -Depends: kaffe | java1-runtime | java2-runtime
  +Depends: kaffe | java1-runtime | java2-runtime, libjts-java, 
liblog4j1.2-java, libxerces2-java, libjdom0-java, libjama-java, junit, bsh, 
libbatik-java
   Recommends: xlibs
   Description: Geographic Information System
    OpenJump is a extendable GIS toolbox written in Java.
  
  
  
  1.2       +1 -0      openjump/debian/openjump.dirs
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/openjump.dirs?annotate=1.2&cvsroot=
  
  CVSWeb: View this file:             
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/openjump.dirs?rev=1.2&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/openjump.dirs.diff?r1=1.2&r2=1.1&cvsroot=
  
  -----------------------------------
  
  Index: openjump.dirs
  ===================================================================
  RCS file: /cvsroot/pkg-grass/openjump/debian/openjump.dirs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- openjump.dirs     11 Mar 2006 12:11:34 -0000      1.1
  +++ openjump.dirs     11 Mar 2006 20:36:09 -0000      1.2
  @@ -1,2 +1,3 @@
   usr/share/java
  +usr/share/openjump
   usr/bin
  
  
  
  1.9       +13 -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.9&cvsroot=
  
  CVSWeb: View this file:             
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?rev=1.9&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.9&r2=1.8&cvsroot=
  
  -----------------------------------
  
  Index: rules
  ===================================================================
  RCS file: /cvsroot/pkg-grass/openjump/debian/rules,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- rules     11 Mar 2006 15:04:57 -0000      1.8
  +++ rules     11 Mar 2006 20:36:28 -0000      1.9
  @@ -7,7 +7,7 @@
   include /usr/share/cdbs/1/class/ant.mk
   include /usr/share/cdbs/1/rules/simple-patchsys.mk
   
  -JAVA_HOME := /usr/lib/jvm/java-gcj
  +JAVA_HOME := /usr/lib/kaffe
   ANT_HOME := /usr/share/ant
   
   DEB_ANT_BUILDFILE    := debian/openjump-build.xml
  @@ -15,6 +15,10 @@
   DEB_JARS             = $(ANT_HOME)/lib/ant-launcher.jar jts log4j-1.2 \
        xercesImpl jdom0 jama junit bsh batik # buoy
   
  +# Make sure the jars are built using the upstream version number
  +# instead of the source release date.
  +DEB_ANT_ARGS += -Dversion=$(UPSTREAM_VERSION)
  +
   # Jikes
   #DEB_ANT_COMPILER     := jikes
   # ECJ
  @@ -25,6 +29,11 @@
        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
  -     install -m 755 debian/openjump debian/openjump/usr/bin/openjump
  +     install -m644 build/jump-api-$(UPSTREAM_VERSION).jar 
debian/openjump/usr/share/java/jump-api-$(UPSTREAM_VERSION).jar
  +     ln -s jump-api-$(UPSTREAM_VERSION).jar 
debian/openjump/usr/share/java/jump-api.jar
  +
  +     install -m644 build/jump-workbench-$(UPSTREAM_VERSION).jar 
debian/openjump/usr/share/java/jump-workbench-$(UPSTREAM_VERSION).jar
  +     ln -s jump-workbench-$(UPSTREAM_VERSION).jar 
debian/openjump/usr/share/java/jump-workbench.jar
  +
  +     install -m755 debian/openjump-wrapper debian/openjump/usr/bin/openjump
  +     install -m644 debian/log4j.xml debian/openjump/usr/share/openjump/
  
  
  
  1.1                  openjump/debian/openjump-wrapper
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/openjump-wrapper?annotate=1.1&cvsroot=
  
  CVSWeb: View this file:             
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/openjump-wrapper?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=
  
  -----------------------------------
  
  Index: openjump-wrapper
  ===================================================================
  #!/bin/sh
  
  LIBDIR=/usr/share/openjump
  
  PLUGINDIR=$LIBDIR/ext
  PROPFILE=$LIBDIR/workbench-properties.xml
  
  LOG4JFILE=$LIBDIR/log4j.xml
  
  if [ -z "$JAVA" ] ; then
          JAVA=java
  fi
  
  # List of java packages from /usr/share/java to load
  JARS="bsh buoy jama jdom0 jts xercesImpl xml-apis log4j-1.2 batik-all \
      jump-api jump-workbench"
  
  CLASSPATH=
  for jar in $JARS; do
      if [ -f /usr/share/java/$jar.jar ] ; then
        CLASSPATH="$CLASSPATH:/usr/share/java/$jar.jar"
      else
        echo error: missing /usr/share/java/$jar.jar
      fi
  done
  
  exec $JAVA \
      -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel \
      -Dlog4j.configuration=file:$LOG4JFILE \
      -Xms256M \
      -Xmx256M \
      -cp $CLASSPATH \
      com.vividsolutions.jump.workbench.JUMPWorkbench \
      -properties $PROPFILE \
      -plug-in-directory $PLUGINDIR
  
  
  

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to