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

[Andreas Tille]

Author: tille
Date: 2012-07-25 10:53:43 +0000 (Wed, 25 Jul 2012)
New Revision: 11886

Modified:
   trunk/packages/phy-spread/trunk/debian/changelog
   trunk/packages/phy-spread/trunk/debian/control
   trunk/packages/phy-spread/trunk/debian/patches/encoding.patch
Log:
Some more UTF-8 trouble fixed; Removed libcolorpicker-java from Build-Depends because it is now part of the source


Modified: trunk/packages/phy-spread/trunk/debian/changelog
===================================================================
--- trunk/packages/phy-spread/trunk/debian/changelog	2012-07-24 18:23:57 UTC (rev 11885)
+++ trunk/packages/phy-spread/trunk/debian/changelog	2012-07-25 10:53:43 UTC (rev 11886)
@@ -10,9 +10,12 @@
   * debian/upstream:
      - separate authors by ' and ' rather than by ','
      - Move DOI+PMID to References
-  * debian/copyright
+  * debian/copyright:
      - DEP5
      - new: Files: src/colorpicker/*
+  * debian/control:
+     - drop libcolorpicker-java from Build-Depends because it is
+       implemented in upstream source
 
  -- Andreas Tille <tille at debian.org>  Tue, 24 Jul 2012 16:13:49 +0200
 

Modified: trunk/packages/phy-spread/trunk/debian/control
===================================================================
--- trunk/packages/phy-spread/trunk/debian/control	2012-07-24 18:23:57 UTC (rev 11885)
+++ trunk/packages/phy-spread/trunk/debian/control	2012-07-25 10:53:43 UTC (rev 11886)
@@ -6,7 +6,7 @@
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 8), javahelper (>=0.25),
  ant, ant-optional, openjdk-6-jdk | default-jdk,
- libcolorpicker-java, libjebl2-java, libcolt-java,
+ libjebl2-java, libcolt-java,
  libprocessing-core-java, libkmlframework-java
 Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/phy-spread/trunk/

Modified: trunk/packages/phy-spread/trunk/debian/patches/encoding.patch
===================================================================
--- trunk/packages/phy-spread/trunk/debian/patches/encoding.patch	2012-07-24 18:23:57 UTC (rev 11885)
+++ trunk/packages/phy-spread/trunk/debian/patches/encoding.patch	2012-07-25 10:53:43 UTC (rev 11886)
@@ -14,3 +14,21 @@
  		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 @@
+  * <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
+- * action that the user is most likely to perform if that action isn�t
++ * action that the user is most likely to perform if that action isn't
+  * potentially dangerous."
+  * <P>The YES_NO options should be approached with special reluctance.
+  * Microsoft <A HREF="http://msdn.microsoft.com/en-us/library/aa511331.aspx">cautions</A>,
+  * "Use Yes and No buttons only to respond to yes or no questions."  This seems
+  * obvious enough, but Apple adds, "Button names should correspond to the action
+- * the user performs when pressing the button�for example, Erase, Save, or Delete."
++ * the user performs when pressing the button - for example, Erase, Save, or Delete."
+  * So instead of presenting a YES_NO dialog with the question "Do you want to continue?"
+  * a better dialog might provide the options "Cancel" and "Continue".  In short: we
+  * as developers might tend to lazily use this option and phrase dialogs in such