[med-svn] r11884 - in trunk/packages/phy-spread/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-07-24 15:02:14 +0000 (Tue, 24 Jul 2012)
New Revision: 11884

Modified:
   trunk/packages/phy-spread/trunk/debian/changelog
   trunk/packages/phy-spread/trunk/debian/patches/build_xml.patch
   trunk/packages/phy-spread/trunk/debian/patches/encoding.patch
   trunk/packages/phy-spread/trunk/debian/patches/series
Log:
Adapt patches to new upstream version


Modified: trunk/packages/phy-spread/trunk/debian/changelog
===================================================================
--- trunk/packages/phy-spread/trunk/debian/changelog	2012-07-24 14:45:47 UTC (rev 11883)
+++ trunk/packages/phy-spread/trunk/debian/changelog	2012-07-24 15:02:14 UTC (rev 11884)
@@ -1,6 +1,6 @@
 phy-spread (1.0.4-1) UNRELEASED; urgency=low
 
-  * New upstream version
+  * New upstream version (+ adapted patches)
   * debian/watch: Fixed to obtain properly from Github download area
   * debian/get-orig-source:
      - handle new name for upstream tarball

Modified: trunk/packages/phy-spread/trunk/debian/patches/build_xml.patch
===================================================================
--- trunk/packages/phy-spread/trunk/debian/patches/build_xml.patch	2012-07-24 14:45:47 UTC (rev 11883)
+++ trunk/packages/phy-spread/trunk/debian/patches/build_xml.patch	2012-07-24 15:02:14 UTC (rev 11884)
@@ -1,25 +1,28 @@
---- spread-1.0.2.orig/build.xml
-+++ spread-1.0.2/build.xml
-@@ -34,11 +34,11 @@
- <attribute name="Main-Class" value="${main_class_SpreadApp}" />
+Author: Andreas Tille <tille at debian.org>
+Date: Tue, 24 Jul 2012 16:13:49 +0200
+Description: Use Debian packaged libraries instead of binary JARs
+ which ware removed in get-orig-source anyway
+
+--- Spread-phy-1.0.4.orig/build.xml
++++ Spread-phy-1.0.4/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="lib" includes="colt.jar"/>
--        <zipgroupfileset dir="lib" includes="ColorPicker.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="/usr/share/java" includes="colt.jar"/>
-+        <zipgroupfileset dir="/usr/share/java" includes="ColorPicker.jar"/>
+ <!--        <zipgroupfileset dir="lib" includes="ColorPicker.jar"/>-->
          <!--
          <zipgroupfileset dir="lib" includes="quaqua.jar"/>
-         -->
---- spread-1.0.2.orig/.classpath
-+++ spread-1.0.2/.classpath
-@@ -1,12 +1,11 @@
+--- Spread-phy-1.0.4.orig/.classpath
++++ Spread-phy-1.0.4/.classpath
+@@ -1,11 +1,10 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
  	<classpathentry kind="src" path="src"/>
@@ -31,9 +34,7 @@
 +	<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="lib/ColorPicker.jar"/>
 -	<classpathentry kind="lib" path="release/Mac/lib/quaqua.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/colt.jar"/>
-+	<classpathentry kind="lib" path="/usr/share/java/ColorPicker.jar"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>

Modified: trunk/packages/phy-spread/trunk/debian/patches/encoding.patch
===================================================================
--- trunk/packages/phy-spread/trunk/debian/patches/encoding.patch	2012-07-24 14:45:47 UTC (rev 11883)
+++ trunk/packages/phy-spread/trunk/debian/patches/encoding.patch	2012-07-24 15:02:14 UTC (rev 11884)
@@ -3,8 +3,8 @@
 Description: Java called in a pbuilder environment just fails if
  finding the '°' character in the comment - so it was replaced
 
---- spread-1.0.2.orig/src/utils/Utils.java
-+++ spread-1.0.2/src/utils/Utils.java
+--- Spread-phy-1.0.4.orig/src/utils/Utils.java
++++ Spread-phy-1.0.4/src/utils/Utils.java
 @@ -414,7 +414,7 @@
  		// line
  		// gives

Modified: trunk/packages/phy-spread/trunk/debian/patches/series
===================================================================
--- trunk/packages/phy-spread/trunk/debian/patches/series	2012-07-24 14:45:47 UTC (rev 11883)
+++ trunk/packages/phy-spread/trunk/debian/patches/series	2012-07-24 15:02:14 UTC (rev 11884)
@@ -1,3 +1,2 @@
-follow_hint_from_README.patch
 build_xml.patch
 encoding.patch