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

2006-03-11 Thread pere

  User: pere
  Date: 06/03/11 22:52:04

  Modified:debian   rules
  Log:
  Use DESTDIR variable.
  
  Revision  ChangesPath
  1.11  +7 -6  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.11&cvsroot=
  
  CVSWeb: View this file: 
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?rev=1.11&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.11&r2=1.10&cvsroot=
  
  ---
  
  Index: rules
  ===
  RCS file: /cvsroot/pkg-grass/openjump/debian/rules,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- rules 11 Mar 2006 22:29:50 -  1.10
  +++ rules 11 Mar 2006 22:52:04 -  1.11
  @@ -28,12 +28,13 @@
   clean::
rm -rf build lib
   
  +DESTDIR=debian/openjump
   install/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-api-$(UPSTREAM_VERSION).jar 
$(DESTDIR)/usr/share/java/jump-api-$(UPSTREAM_VERSION).jar
  + ln -s jump-api-$(UPSTREAM_VERSION).jar 
$(DESTDIR)/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 -m644 build/jump-workbench-$(UPSTREAM_VERSION).jar 
$(DESTDIR)/usr/share/java/jump-workbench-$(UPSTREAM_VERSION).jar
  + ln -s jump-workbench-$(UPSTREAM_VERSION).jar 
$(DESTDIR)/usr/share/java/jump-workbench.jar
   
  - install -m755 debian/openjump.sh debian/openjump/usr/bin/openjump
  - install -m644 debian/log4j.xml debian/openjump/usr/share/openjump/
  + install -m755 debian/openjump.sh $(DESTDIR)/usr/bin/openjump
  + install -m644 debian/log4j.xml $(DESTDIR)/usr/share/openjump/
  
  
  

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


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

2006-03-11 Thread pere

  User: pere
  Date: 06/03/11 15:04:57

  Modified:debian   rules
  Log:
  Document that buoy is missing on the jars list.
  
  Revision  ChangesPath
  1.8   +1 -1  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.8&cvsroot=
  
  CVSWeb: View this file: 
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?rev=1.8&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.8&r2=1.7&cvsroot=
  
  ---
  
  Index: rules
  ===
  RCS file: /cvsroot/pkg-grass/openjump/debian/rules,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- rules 11 Mar 2006 15:04:10 -  1.7
  +++ rules 11 Mar 2006 15:04:57 -  1.8
  @@ -13,7 +13,7 @@
   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 jdom0 jama junit bsh batik
  + xercesImpl jdom0 jama junit bsh batik # buoy
   
   # Jikes
   #DEB_ANT_COMPILER := jikes
  
  
  

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


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

2006-03-11 Thread pere

  User: pere
  Date: 06/03/11 15:04:10

  Modified:debian   rules control
  Log:
  Change runtime to gcj.
  
  Revision  ChangesPath
  1.7   +1 -1  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.7&cvsroot=
  
  CVSWeb: View this file: 
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?rev=1.7&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.7&r2=1.6&cvsroot=
  
  ---
  
  Index: rules
  ===
  RCS file: /cvsroot/pkg-grass/openjump/debian/rules,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- rules 11 Mar 2006 14:14:36 -  1.6
  +++ rules 11 Mar 2006 15:04:10 -  1.7
  @@ -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/kaffe
  +JAVA_HOME := /usr/lib/jvm/java-gcj
   ANT_HOME := /usr/share/ant
   
   DEB_ANT_BUILDFILE:= debian/openjump-build.xml
  
  
  
  1.5   +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.5&cvsroot=
  
  CVSWeb: View this file: 
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/control?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/control.diff?r1=1.5&r2=1.4&cvsroot=
  
  ---
  
  Index: control
  ===
  RCS file: /cvsroot/pkg-grass/openjump/debian/control,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- control   11 Mar 2006 14:14:36 -  1.4
  +++ control   11 Mar 2006 15:04:10 -  1.5
  @@ -3,7 +3,7 @@
   Priority: optional
   Maintainer: Debian GIS Project 
   Uploaders: Petter Reinholdtsen <[EMAIL PROTECTED]>
  -Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-1), ant, 
libjts-java, liblog4j1.2-java, libxerces2-java, libjdom0-java, libjama-java, 
junit, bsh, libbatik-java
  +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
   Standards-Version: 3.6.2
   
   Package: openjump
  
  
  

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


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

2006-03-11 Thread pere

  User: pere
  Date: 06/03/11 14:14:36

  Modified:debian   rules control
  Log:
  More dependencies.
  
  Revision  ChangesPath
  1.6   +2 -1  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.6&cvsroot=
  
  CVSWeb: View this file: 
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?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/rules.diff?r1=1.6&r2=1.5&cvsroot=
  
  ---
  
  Index: rules
  ===
  RCS file: /cvsroot/pkg-grass/openjump/debian/rules,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- rules 11 Mar 2006 13:11:09 -  1.5
  +++ rules 11 Mar 2006 14:14:36 -  1.6
  @@ -12,7 +12,8 @@
   
   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
  +DEB_JARS = $(ANT_HOME)/lib/ant-launcher.jar jts log4j-1.2 \
  + xercesImpl jdom0 jama junit bsh batik
   
   # Jikes
   #DEB_ANT_COMPILER := jikes
  
  
  
  1.4   +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.4&cvsroot=
  
  CVSWeb: View this file: 
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/control?rev=1.4&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.4&r2=1.3&cvsroot=
  
  ---
  
  Index: control
  ===
  RCS file: /cvsroot/pkg-grass/openjump/debian/control,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- control   11 Mar 2006 13:11:09 -  1.3
  +++ control   11 Mar 2006 14:14:36 -  1.4
  @@ -3,7 +3,7 @@
   Priority: optional
   Maintainer: Debian GIS Project 
   Uploaders: Petter Reinholdtsen <[EMAIL PROTECTED]>
  -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
  +Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-1), ant, 
libjts-java, liblog4j1.2-java, libxerces2-java, libjdom0-java, libjama-java, 
junit, bsh, libbatik-java
   Standards-Version: 3.6.2
   
   Package: openjump
  
  
  

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


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

2006-03-11 Thread pere

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

  Modified:debian   rules control
  Log:
  Switch to ecj and add lots of build dependencies.
  
  Revision  ChangesPath
  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 -  1.4
  +++ rules 11 Mar 2006 13:11:09 -  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 -  1.2
  +++ control   11 Mar 2006 13:11:09 -  1.3
  @@ -3,7 +3,7 @@
   Priority: optional
   Maintainer: Debian GIS Project 
   Uploaders: Petter Reinholdtsen <[EMAIL PROTECTED]>
  -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
  
  
  

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


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

2006-03-11 Thread pere

  User: pere
  Date: 06/03/11 12:44:42

  Modified:debian   rules
  Log:
  Try to build with jikes.
  
  Revision  ChangesPath
  1.3   +3 -2  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.3&cvsroot=
  
  CVSWeb: View this file: 
http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/rules?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/rules.diff?r1=1.3&r2=1.2&cvsroot=
  
  ---
  
  Index: rules
  ===
  RCS file: /cvsroot/pkg-grass/openjump/debian/rules,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- rules 11 Mar 2006 12:32:00 -  1.2
  +++ rules 11 Mar 2006 12:44:41 -  1.3
  @@ -9,13 +9,14 @@
   
   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 servlet-2.3 bsf javacc
  +DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
   DEB_ANT_BUILD_TARGET := jar
   
   clean::
  - rm -rf build
  + rm -rf build lib

   install/openjump::
   #install -m 644 dist/bsh-$(UPSTREAM_VERSION).jar 
debian/bsh/usr/share/java/bsh-$(UPSTREAM_VERSION).jar
  
  
  

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