[med-svn] r19475 - in trunk/packages/spread-phy/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Fri Jul 3 04:17:42 UTC 2015
Author: tille
Date: 2015-07-03 04:17:41 +0000 (Fri, 03 Jul 2015)
New Revision: 19475
Modified:
trunk/packages/spread-phy/trunk/debian/changelog
trunk/packages/spread-phy/trunk/debian/control
trunk/packages/spread-phy/trunk/debian/patches/build_xml.patch
trunk/packages/spread-phy/trunk/debian/patches/encoding.patch
trunk/packages/spread-phy/trunk/debian/rules
Log:
Try to adapt to new upstream version that requires fest-assert (but does not build :-()
Modified: trunk/packages/spread-phy/trunk/debian/changelog
===================================================================
--- trunk/packages/spread-phy/trunk/debian/changelog 2015-07-03 04:15:11 UTC (rev 19474)
+++ trunk/packages/spread-phy/trunk/debian/changelog 2015-07-03 04:17:41 UTC (rev 19475)
@@ -1,3 +1,13 @@
+spread-phy (1.0.7+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+ * Build against libcolt-free-java (and thus go to main)
+ * Drop libkmlframework-java from Build-Depends since it is not needed
+ any more
+ * Add libfest-assert-java to Build-Depends
+
+ -- Andreas Tille <tille at debian.org> Sun, 15 Mar 2015 19:27:06 +0100
+
spread-phy (1.0.5+dfsg-1) unstable; urgency=low
* New upstream version
Modified: trunk/packages/spread-phy/trunk/debian/control
===================================================================
--- trunk/packages/spread-phy/trunk/debian/control 2015-07-03 04:15:11 UTC (rev 19474)
+++ trunk/packages/spread-phy/trunk/debian/control 2015-07-03 04:17:41 UTC (rev 19475)
@@ -1,13 +1,13 @@
Source: spread-phy
-Section: contrib/science
+Section: science
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>
Build-Depends: debhelper (>= 9), javahelper (>=0.25),
ant, ant-optional, default-jdk (>= 1:1.6),
- libjebl2-java, libcolt-java,
- libprocessing-core-java, libkmlframework-java
+ libjebl2-java, libcolt-free-java,
+ libprocessing-core-java,
+ libfest-assert-java
Standards-Version: 3.9.4
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/spread-phy/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/spread-phy/trunk/
Modified: trunk/packages/spread-phy/trunk/debian/patches/build_xml.patch
===================================================================
--- trunk/packages/spread-phy/trunk/debian/patches/build_xml.patch 2015-07-03 04:15:11 UTC (rev 19474)
+++ trunk/packages/spread-phy/trunk/debian/patches/build_xml.patch 2015-07-03 04:17:41 UTC (rev 19475)
@@ -5,36 +5,35 @@
--- a/build.xml
+++ b/build.xml
-@@ -35,10 +35,10 @@
- <!--<attribute name="Classpath" value="." />-->
- </manifest>
- <fileset dir="classes"/>
-- <zipgroupfileset dir="lib" includes="core.jar"/>
-- <zipgroupfileset dir="lib" includes="jebl.jar"/>
-- <zipgroupfileset dir="lib" includes="colt.jar"/>
-- <zipgroupfileset dir="lib" includes="org.boehn.kmlframework_20090320.jar"/>
-+ <zipgroupfileset dir="/usr/share/java" includes="processing-core.jar"/>
-+ <zipgroupfileset dir="/usr/share/java" includes="jebl.jar"/>
-+ <zipgroupfileset dir="/usr/share/java" includes="colt.jar"/>
-+ <zipgroupfileset dir="/usr/share/java" includes="org.boehn.kmlframework.jar"/>
- <!-- <zipgroupfileset dir="lib" includes="ColorPicker.jar"/>-->
- <!--
- <zipgroupfileset dir="lib" includes="quaqua.jar"/>
+@@ -43,9 +43,9 @@
+ </manifest>
+
+ <fileset dir="${buildDir}" />
+- <zipgroupfileset dir="${lib}" includes="colt.jar" />
+- <zipgroupfileset dir="${lib}" includes="core.jar" />
+- <zipgroupfileset dir="${lib}" includes="jebl.jar" />
++ <zipgroupfileset dir="/usr/share/java" includes="colt.jar" />
++ <zipgroupfileset dir="/usr/share/java" includes="core.jar" />
++ <zipgroupfileset dir="/usr/share/java" includes="jebl.jar" />
+ <!-- <zipgroupfileset dir="${lib}" includes="org.boehn.kmlframework_20090320.jar"/> -->
+ <!-- <zipgroupfileset dir="${lib}" includes="ColorPicker.jar"/> -->
+ <!-- <zipgroupfileset dir="${lib}" includes="quaqua.jar"/> -->
--- a/.classpath
+++ b/.classpath
-@@ -1,11 +1,10 @@
+@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="lib/core.jar"/>
- <classpathentry kind="lib" path="lib/jebl.jar"/>
-- <classpathentry kind="lib" path="lib/org.boehn.kmlframework_20090320.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/processing-core.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/jebl.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/org.boehn.kmlframework.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/colt.jar"/>
- <classpathentry kind="lib" path="release/Mac/lib/quaqua.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/colt.jar"/>
+ <classpathentry kind="lib" path="lib/fest.jar"/>
+- <classpathentry kind="lib" path="lib/junit-4.8.2.jar"/>
++ <classpathentry kind="lib" path="/usr/share/lib/junit4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/packages/spread-phy/trunk/debian/patches/encoding.patch
===================================================================
--- trunk/packages/spread-phy/trunk/debian/patches/encoding.patch 2015-07-03 04:15:11 UTC (rev 19474)
+++ trunk/packages/spread-phy/trunk/debian/patches/encoding.patch 2015-07-03 04:17:41 UTC (rev 19475)
@@ -5,7 +5,7 @@
--- a/src/utils/Utils.java
+++ b/src/utils/Utils.java
-@@ -571,7 +571,7 @@ public class Utils {
+@@ -614,7 +614,7 @@ public class Utils {
// line
// gives
// dPhi=0
Modified: trunk/packages/spread-phy/trunk/debian/rules
===================================================================
--- trunk/packages/spread-phy/trunk/debian/rules 2015-07-03 04:15:11 UTC (rev 19474)
+++ trunk/packages/spread-phy/trunk/debian/rules 2015-07-03 04:17:41 UTC (rev 19475)
@@ -7,7 +7,7 @@
#export DH_VERBOSE=1
DEBJAR := /usr/share/java
-CLASSPATH := $(DEBJAR)/jebl.jar:$(DEBJAR)/colt.jar:$(DEBJAR)/org.boehn.kmlframework.jar:$(DEBJAR)/ColorPicker.jar:$(DEBJAR)/processing-core.jar
+CLASSPATH := $(DEBJAR)/jebl.jar:$(DEBJAR)/colt.jar:$(DEBJAR)/ColorPicker.jar:$(DEBJAR)/processing-core.jar:$(DEBJAR)/fest-assert-core.jar
%:
dh $@ --with javahelper
More information about the debian-med-commit
mailing list