[plm] 04/06: refresh our patches

[Martin Quinson]

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

mquinson pushed a commit to branch debian-debian
in repository plm.

commit 0deccaec69d32247f83ebbd50c77b3af3601555f
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Thu Sep 12 21:58:54 2013 +0200

    refresh our patches
---
 debian/changelog                |    1 +
 debian/patches/no-scala         |    2 +-
 debian/patches/no-twitter       |    2 +-
 debian/patches/system-ant-tasks |    8 +++++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cfbd74e..c15fab9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ plm (2.2.3+repack-1) UNRELEASED; urgency=low
 
   * New upstream release (Insane amount of bug fixes and polishing
     after extensive tests of this year's students and some colleagues)
+    - refresh our patches
 
  -- Martin Quinson <mquinson at debian.org>  Thu, 12 Sep 2013 21:55:06 +0200
 
diff --git a/debian/patches/no-scala b/debian/patches/no-scala
index 3875325..637c49b 100644
--- a/debian/patches/no-scala
+++ b/debian/patches/no-scala
@@ -194,7 +194,7 @@ Index: b/src/plm/core/ui/PlmHtmlEditorKit.java
 @@ -68,18 +68,22 @@
  		
  		String res = in.replaceAll("\\[!thelang/?\\]", "[!java]Java[/!][!python]python[/!][!scala]Scala[/!]");
- 		res = res.replaceAll("\\[!configfile/?\\]", Game.getSavingLocation()+File.separator+"plm.properties");
+ 		res = res.replaceAll("\\[!configfile/?\\]", Game.getSavingLocation()+File.separator+"plm.properties".replaceAll("\\\\", "\\\\"));
 +		ProgrammingLanguage []theProgLangs = new ProgrammingLanguage[Game.getProgrammingLanguages().length+1];
 +		for (int i=0; i<Game.getProgrammingLanguages().length;i++) 
 +			theProgLangs[i] = Game.getProgrammingLanguages()[i];
diff --git a/debian/patches/no-twitter b/debian/patches/no-twitter
index 14389c7..16173b0 100644
--- a/debian/patches/no-twitter
+++ b/debian/patches/no-twitter
@@ -72,7 +72,7 @@ Index: b/src/plm/core/model/Game.java
 ===================================================================
 --- a/src/plm/core/model/Game.java
 +++ b/src/plm/core/model/Game.java
-@@ -182,8 +182,8 @@
+@@ -184,8 +184,8 @@
  		addProgressSpyListener(new LocalFileSpy(SAVE_DIR));
  		
  		if (getProperty(PROP_PROGRESS_TWITTER, "true",true).equalsIgnoreCase("true")) {
diff --git a/debian/patches/system-ant-tasks b/debian/patches/system-ant-tasks
index 0b34ab6..d07f2bc 100644
--- a/debian/patches/system-ant-tasks
+++ b/debian/patches/system-ant-tasks
@@ -1,6 +1,12 @@
+---
+ build.xml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/build.xml
+===================================================================
 --- a/build.xml
 +++ b/build.xml
-@@ -158,7 +158,7 @@
+@@ -163,7 +163,7 @@
        </propertyfile>
      </target>
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plm.git