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

[Andreas Tille]

Author: tille
Date: 2012-12-19 08:52:18 +0000 (Wed, 19 Dec 2012)
New Revision: 12698

Modified:
   trunk/packages/spread-phy/trunk/debian/changelog
   trunk/packages/spread-phy/trunk/debian/patches/build_xml.patch
   trunk/packages/spread-phy/trunk/debian/patches/encoding.patch
Log:
New upstream version - adapted patches


Modified: trunk/packages/spread-phy/trunk/debian/changelog
===================================================================
--- trunk/packages/spread-phy/trunk/debian/changelog	2012-12-19 08:49:54 UTC (rev 12697)
+++ trunk/packages/spread-phy/trunk/debian/changelog	2012-12-19 08:52:18 UTC (rev 12698)
@@ -1,6 +1,9 @@
-spread-phy (1.0.4+dfsg-1) UNRELEASED; urgency=low
+spread-phy (1.0.5+dfsg-1) UNRELEASED; urgency=low
 
-  * debian/watch: dversionmangle to deal with +dfsg suffix
+  * New upstream version
+  * debian/watch:
+     - dversionmangle to deal with +dfsg suffix
+     - change in download URL
   * debian/copyright:
     Add Files-Excluded to document what was removed from original source
 

Modified: trunk/packages/spread-phy/trunk/debian/patches/build_xml.patch
===================================================================
--- trunk/packages/spread-phy/trunk/debian/patches/build_xml.patch	2012-12-19 08:49:54 UTC (rev 12697)
+++ trunk/packages/spread-phy/trunk/debian/patches/build_xml.patch	2012-12-19 08:52:18 UTC (rev 12698)
@@ -3,8 +3,8 @@
 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
+--- a/build.xml
++++ b/build.xml
 @@ -35,10 +35,10 @@
  <!--<attribute name="Classpath" value="." />-->
  </manifest>
@@ -20,8 +20,8 @@
  <!--        <zipgroupfileset dir="lib" includes="ColorPicker.jar"/>-->
          <!--
          <zipgroupfileset dir="lib" includes="quaqua.jar"/>
---- Spread-phy-1.0.4.orig/.classpath
-+++ Spread-phy-1.0.4/.classpath
+--- a/.classpath
++++ b/.classpath
 @@ -1,11 +1,10 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>

Modified: trunk/packages/spread-phy/trunk/debian/patches/encoding.patch
===================================================================
--- trunk/packages/spread-phy/trunk/debian/patches/encoding.patch	2012-12-19 08:49:54 UTC (rev 12697)
+++ trunk/packages/spread-phy/trunk/debian/patches/encoding.patch	2012-12-19 08:52:18 UTC (rev 12698)
@@ -3,9 +3,9 @@
 Description: Java called in a pbuilder environment just fails if
  finding the '°' character in the comment - so it was replaced
 
---- Spread-phy-1.0.4.orig/src/utils/Utils.java
-+++ Spread-phy-1.0.4/src/utils/Utils.java
-@@ -414,7 +414,7 @@
+--- a/src/utils/Utils.java
++++ b/src/utils/Utils.java
+@@ -571,7 +571,7 @@ public class Utils {
  		// line
  		// gives
  		// dPhi=0
@@ -14,9 +14,9 @@
  		if (dLon > Math.PI)
  			dLon = 2 * Math.PI - dLon;
  		double distance = Math.sqrt(dLat * dLat + q * q * dLon * dLon)
---- Spread-phy-1.0.4.orig/src/colorpicker/swing/DialogFooter.java
-+++ Spread-phy-1.0.4/src/colorpicker/swing/DialogFooter.java
-@@ -74,13 +74,13 @@
+--- a/src/colorpicker/swing/DialogFooter.java
++++ b/src/colorpicker/swing/DialogFooter.java
+@@ -74,13 +74,13 @@ import colorpicker.util.JVM;
   * <P>In each constant the first option is the default button unless
   * you specify otherwise.  The Apple Interface Guidelines advises:
   * "The default button should be the button that represents the