[DebianGIS-dev] r2835 - packages/openjump/trunk/debian

Tue Apr 20 09:31:03 UTC 2010

Author: frankie
Date: 2010-04-20 09:31:03 +0000 (Tue, 20 Apr 2010)
New Revision: 2835

Modified:
   packages/openjump/trunk/debian/ant.properties
   packages/openjump/trunk/debian/changelog
   packages/openjump/trunk/debian/compat
   packages/openjump/trunk/debian/control
   packages/openjump/trunk/debian/copyright
   packages/openjump/trunk/debian/openjump.sh
   packages/openjump/trunk/debian/rules
Log:
Updated to current policy.


Modified: packages/openjump/trunk/debian/ant.properties
===================================================================

--- packages/openjump/trunk/debian/ant.properties	2010-04-19 16:20:16 UTC (rev 2834)
+++ packages/openjump/trunk/debian/ant.properties	2010-04-20 09:31:03 UTC (rev 2835)
@@ -1,2 +1,4 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
 javadoc-dir=api
 build.sysclasspath=only

Modified: packages/openjump/trunk/debian/changelog
===================================================================
--- packages/openjump/trunk/debian/changelog	2010-04-19 16:20:16 UTC (rev 2834)
+++ packages/openjump/trunk/debian/changelog	2010-04-20 09:31:03 UTC (rev 2835)
@@ -1,13 +1,32 @@
-openjump (1.3.1-1) unstable; urgency=low
+openjump (1.0-4.1) unstable; urgency=low
 
-  * New upstream long due release. All patches merged.
-  * Policy bumped to 3.8.4, without changes.
-  * Now depending strictly on default-jre.
-  * Added me as uploader.
-  * Added Vcs-* fields to debian/control.
+  * Policy bumped to 3.8.4.
+  * Debhelper level set to 7.
+  * Added me among uploaders.
+  * Removed obsolete java-runtime dependency.
+  * Added -Djava.net.preferIPv4Stack=true to circumvent the net.ipv6.bindv6only=1
+    setting currently used in Squeeze.
+  * Revised debian/copyright file to reflect current status of openjump.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 14 Apr 2010 18:07:10 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 20 Apr 2010 11:25:09 +0200
 
+openjump (1.0-4) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * Replace libdom0-java dep/b-d with libjdom1-java. (Closes: #500535).
+  * Build-dep on default-jdk instead of java-gcj-compat-dev.
+  * Depend on default-jre instead of java-gcj-compat.
+  * Add ${misc:Depends} for debhelper package.
+  * Update debian/ant.properties to use JVM 1.5.
+  * Update debian/copyright.
+  * Add watch file.
+  * Bump Standards Version to 3.8.3.
+
+  [ Kumar Appaiah ]
+  * Remove myself from uploaders.
+
+ -- Kumar Appaiah <akumar at debian.org>  Wed, 11 Nov 2009 14:42:09 -0600
+
 openjump (1.0-3) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: packages/openjump/trunk/debian/compat
===================================================================
--- packages/openjump/trunk/debian/compat	2010-04-19 16:20:16 UTC (rev 2834)
+++ packages/openjump/trunk/debian/compat	2010-04-20 09:31:03 UTC (rev 2835)
@@ -1 +1 @@
-7
+5

Modified: packages/openjump/trunk/debian/control
===================================================================
--- packages/openjump/trunk/debian/control	2010-04-19 16:20:16 UTC (rev 2834)
+++ packages/openjump/trunk/debian/control	2010-04-20 09:31:03 UTC (rev 2835)
@@ -2,9 +2,11 @@
 Section: contrib/science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Petter Reinholdtsen <pere at debian.org>, Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>, Francesco Paolo Lovergine <frankie at debian.org>
+Uploaders: Petter Reinholdtsen <pere at debian.org>, Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>, 
+ Varun Hiremath <varunhiremath at gmail.com>, Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: debhelper (>= 7), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ant, libjts-java, liblog4j1.2-java, libxerces2-java, libjdom0-java, libjama-java, junit, bsh, libbatik-java, libbuoy-java (>= 1.8)
+Build-Depends-Indep: default-jdk, ant, libjts-java, liblog4j1.2-java, libxerces2-java, libjdom1-java, libjama-java, junit, bsh, 
+ libbatik-java, libbuoy-java (>= 1.8)
 Standards-Version: 3.8.4
 Homepage: http://jump-pilot.sourceforge.net/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/openjump/trunk
@@ -12,8 +14,8 @@
 
 Package: openjump
 Architecture: all
-Depends: default-jre, libjts-java, libjama-java, libjdom0-java, libxerces2-java, bsh, liblog4j1.2-java, junit, 
- libbatik-java, libbuoy-java (>= 1.8)
+Depends: ${misc:Depends}, default-jre, libjts-java, libjama-java, libjdom1-java, libxerces2-java, bsh, liblog4j1.2-java, 
+ junit, libbatik-java, libbuoy-java (>= 1.8)
 Description: Open Java Unified Mapping Platform JUMP
  The Open Java Unified Mapping Platform (JUMP) is a GUI-based application
  for viewing and processing spatial data.  It includes many common spatial

Modified: packages/openjump/trunk/debian/copyright
===================================================================
--- packages/openjump/trunk/debian/copyright	2010-04-19 16:20:16 UTC (rev 2834)
+++ packages/openjump/trunk/debian/copyright	2010-04-20 09:31:03 UTC (rev 2835)
@@ -2,11 +2,14 @@
 Sat Mar 11 13:02:10 CET 2006.
 
 It was downloaded from <URL:http://www.openjump.org/>
+New upstream location is at: http://jump-pilot.sourceforge.net/
 
 Copyright:
+	Copyright (C) 2003 Vivid Solutions
+	Copyright (C) 1996 by Jef Poskanzer <jef at acme.com>
+	Copyright (C) 2004 Integrated Systems Analysts, Inc.
+	Copyright (C) Stefan Steiniger
 
-  Copyright Vivid Solutions and the OpenJump developers.
-
 License:
 
   This program is free software; you can redistribute it and/or
@@ -25,4 +28,4 @@
   USA.
 
   On Debian systems, the complete text of the GNU Lesser General
-  Public License can be found in `/usr/share/common-licenses/LGPL'.
+  Public License can be found in `/usr/share/common-licenses/LGPL-2'.

Modified: packages/openjump/trunk/debian/openjump.sh
===================================================================
--- packages/openjump/trunk/debian/openjump.sh	2010-04-19 16:20:16 UTC (rev 2834)
+++ packages/openjump/trunk/debian/openjump.sh	2010-04-20 09:31:03 UTC (rev 2835)
@@ -83,7 +83,7 @@
 # List of java jar libraries from $DEB_JAR_PATH to load
 JARS="\
     jump-api jump-workbench \
-    bsh buoy jama jdom0 jts xercesImpl xml-apis log4j-1.2 batik-all \
+    bsh buoy jama jdom1 jts xercesImpl xml-apis log4j-1.2 batik-all \
     "
 
 JUMP_CLASSPATH=
@@ -112,6 +112,7 @@
 
 exec ${JAVACMD} \
     ${JAVA_ARGS} \
+    -Djava.net.preferIPv4Stack=true \
     -Dlog4j.configuration=file:$LOG4JFILE \
     -cp ${JUMP_CLASSPATH} \
     com.vividsolutions.jump.workbench.JUMPWorkbench \

Modified: packages/openjump/trunk/debian/rules
===================================================================
--- packages/openjump/trunk/debian/rules	2010-04-19 16:20:16 UTC (rev 2834)
+++ packages/openjump/trunk/debian/rules	2010-04-20 09:31:03 UTC (rev 2835)
@@ -5,21 +5,21 @@
 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/jvm/default-java
 ANT_HOME := /usr/share/ant
 
-#DEB_ANT_BUILDFILE    := debian/openjump-build.xml
-DEB_ANT_BUILDFILE    := debian/build.xml
+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 buoy
+	xercesImpl jdom1 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=$(DEB_UPSTREAM_VERSION)
 
-DEB_ANT_COMPILER     := org.eclipse.jdt.core.JDTCompilerAdapter
-DEB_JARS             := $(DEB_JARS) ecj
+#Not sure why this would be needed?
+#DEB_ANT_COMPILER     := org.eclipse.jdt.core.JDTCompilerAdapter
+#DEB_JARS             := $(DEB_JARS) ecj
 
 clean::
 	$(RM) -rf build lib


