[med-svn] [jmodeltest] 06/14: There are better solutions than stripping UTF-8 strings

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository jmodeltest.

commit d26978272d4c2d111010a81b142251b79b509e59
Author: Andreas Tille <tille at debian.org>
Date:   Tue May 10 13:48:18 2016 +0200

    There are better solutions than stripping UTF-8 strings
---
 debian/patches/encoding.patch | 37 -------------------------------------
 debian/patches/series         |  1 -
 2 files changed, 38 deletions(-)

diff --git a/debian/patches/encoding.patch b/debian/patches/encoding.patch
deleted file mode 100644
index 5678f63..0000000
--- a/debian/patches/encoding.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 28 Oct 2015 22:20:54 +0100
-Description: Unfortunately the build throws errors when using non-ASCII characters
-
---- a/src/main/java/es/uvigo/darwin/jmodeltest/exception/InternalException.java
-+++ b/src/main/java/es/uvigo/darwin/jmodeltest/exception/InternalException.java
-@@ -20,7 +20,7 @@ package es.uvigo.darwin.jmodeltest.excep
- /**
-  * The Class ProtTestInternalException.
-  * 
-- * @author Diego Darriba López
-+ * @author Diego Darriba Lopez
-  */
- public class InternalException extends RuntimeException {
- 
---- a/src/main/java/es/uvigo/darwin/jmodeltest/gui/FrameMain.java
-+++ b/src/main/java/es/uvigo/darwin/jmodeltest/gui/FrameMain.java
-@@ -1142,7 +1142,7 @@ public class FrameMain extends JModelTes
- 	private void menuAboutCreditsActionPerformed(java.awt.event.ActionEvent e) {
- 		try {
- 			String credits = "Likelihood calculations with Phyml by Stephane Guindon et al.\n";
--			credits += "Alignment conversion with ALTER by Daniel Glez-Peña et al.\n";
-+			credits += "Alignment conversion with ALTER by Daniel Glez-Pena et al.\n";
- 			credits += "Phylogenetic trees management with PAL: Phylogenetic Analysis Library by A. Drummond and K. Strimmer\n";
- 			credits += "Table utilities by Philip Milne\n";
- 			credits += "BrowserLauncher by Eric Albert and Jeff Chapman\n";
---- a/src/main/java/es/uvigo/darwin/jmodeltest/tree/TreeDistancesCache.java
-+++ b/src/main/java/es/uvigo/darwin/jmodeltest/tree/TreeDistancesCache.java
-@@ -28,7 +28,7 @@ import pal.tree.Tree;
-  * 
-  * This cache support both euclidean and RF distances.
-  * 
-- * @author Diego Darriba López
-+ * @author Diego Darriba Lopez
-  * 
-  * @since 3.0
-  */
diff --git a/debian/patches/series b/debian/patches/series
index 83fdf86..a19efd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-encoding.patch
 use_debian_packaged_jars.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jmodeltest.git