[plm] 01/01: let's be ubuntu-friendly

[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 fd3b93704a1e801c36e7889cc89fe8787ecd65e4
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Mon Jun 30 18:28:42 2014 +0200

    let's be ubuntu-friendly
---
 debian/patches/no-twitter | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/patches/no-twitter b/debian/patches/no-twitter
index 16173b0..fd21995 100644
--- a/debian/patches/no-twitter
+++ b/debian/patches/no-twitter
@@ -1,13 +1,13 @@
----
- src/plm/core/model/Game.java                |    4 +-
- src/plm/core/model/tracking/TwitterSpy.java |   55 +---------------------------
- 2 files changed, 4 insertions(+), 55 deletions(-)
-
-Index: b/src/plm/core/model/tracking/TwitterSpy.java
-===================================================================
---- a/src/plm/core/model/tracking/TwitterSpy.java
-+++ b/src/plm/core/model/tracking/TwitterSpy.java
-@@ -2,58 +2,7 @@
+---
+ src/plm/core/model/Game.java                |    4 +-
+ src/plm/core/model/tracking/TwitterSpy.java |   55 +---------------------------
+ 2 files changed, 4 insertions(+), 55 deletions(-)
+
+Index: b/src/plm/core/model/tracking/TwitterSpy.java
+===================================================================
+--- a/src/plm/core/model/tracking/TwitterSpy.java
++++ b/src/plm/core/model/tracking/TwitterSpy.java
+@@ -2,58 +2,7 @@
  
  import plm.core.model.Game;
  import plm.core.model.lesson.Exercise;
@@ -68,17 +68,17 @@ Index: b/src/plm/core/model/tracking/TwitterSpy.java
 +public class TwitterSpy {
 +	/* twitter4j is not packaged in Debian; remove this */
  }
-Index: b/src/plm/core/model/Game.java
-===================================================================
---- a/src/plm/core/model/Game.java
-+++ b/src/plm/core/model/Game.java
-@@ -184,8 +184,8 @@
+Index: b/src/plm/core/model/Game.java
+===================================================================
+--- a/src/plm/core/model/Game.java
++++ b/src/plm/core/model/Game.java
+@@ -184,8 +184,8 @@
  		addProgressSpyListener(new LocalFileSpy(SAVE_DIR));
  		
  		if (getProperty(PROP_PROGRESS_TWITTER, "true",true).equalsIgnoreCase("true")) {
 -			System.err.println(i18n.tr("Your progress will be posted to https://twitter.com/jlmlovers This can be turned off through the property {0}",Game.PROP_PROGRESS_TWITTER));
 -			addProgressSpyListener(new TwitterSpy());
-+			System.err.println(i18n.tr("Twitter logging is not available in Debian, sorry.",Game.PROP_PROGRESS_TWITTER));
++			System.err.println(i18n.tr("Twitter logging is not available in Debian nor in its derivatives such as Ubuntu, sorry.",Game.PROP_PROGRESS_TWITTER));
 +//			addProgressSpyListener(new TwitterSpy());
  		} else {
  			System.err.println(i18n.tr("Your progress will NOT be posted to twitter, as requested by the property {0}",Game.PROP_PROGRESS_TWITTER));			

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