This is an automated email from the git hooks/post-receive script. mquinson pushed a commit to branch debian in repository plm.
commit e895723e97580dc59fbe04f2fdfc750dc20591ab Author: Martin Quinson <[email protected]> Date: Wed Oct 22 22:51:03 2014 +0200 Twitter support was removed upstream --- debian/changelog | 1 + debian/patches/no-twitter | 85 ----------------------------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 86 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4bdebf..09c2944 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ plm (2.4.11+repack-1) UNRELEASED; urgency=medium - User data gets saved in a git, which is more robust. - Translation to French, and partially to Brazilian and Italian. - Experimental support for the C programming language + - Twitter support was removed upstream - Scala still cut of Debian package since we need a recent scala * Suggests jython to make python usable diff --git a/debian/patches/no-twitter b/debian/patches/no-twitter deleted file mode 100644 index fd21995..0000000 --- a/debian/patches/no-twitter +++ /dev/null @@ -1,85 +0,0 @@ ---- - 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; --import twitter4j.Status; --import twitter4j.Twitter; --import twitter4j.TwitterFactory; --import twitter4j.conf.ConfigurationBuilder; -- --public class TwitterSpy implements ProgressSpyListener { -- private String username; -- private Twitter twitter; -- -- public TwitterSpy() { -- username = System.getenv("USER"); -- if (username == null) -- username = System.getenv("USERNAME"); -- if (username == null) -- username = "John Doe"; -- -- ConfigurationBuilder cb = new ConfigurationBuilder(); -- cb.setDebugEnabled(true) -- .setOAuthConsumerKey(Game.getProperty("plm.oauth.consumerKey")) -- .setOAuthConsumerSecret(Game.getProperty("plm.oauth.consumerSecret")) -- .setOAuthAccessToken(Game.getProperty("plm.oauth.accessToken")) -- .setOAuthAccessTokenSecret(Game.getProperty("plm.oauth.tokenSecret")); -- TwitterFactory tf = new TwitterFactory(cb.build()); -- twitter = tf.getInstance(); -- } -- -- @Override -- public void executed(Exercise exo) { -- if (Game.getInstance().studentWork.getPassed(exo, exo.lastResult.language)) { -- try { -- Status status = twitter.updateStatus(username+" solved "+exo.getName()+" in "+exo.lastResult.language+"!"); -- if (Game.getInstance().isDebugEnabled()) -- System.out.println("Twitted! Status: "+status.toString()); -- } catch (Exception e) { -- // silently ignore network unavailability ;) -- if (Game.getInstance().isDebugEnabled()) -- e.printStackTrace(); -- } -- } -- } -- -- @Override -- public void switched(Exercise exo) { /* i don't care, i'm a viking */ } -- -- @Override -- public void heartbeat() {} -- -- @Override -- public String join() { return ""; } -- -- @Override -- public void leave() { -- } - -+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 @@ - 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 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)); - } diff --git a/debian/patches/series b/debian/patches/series index 4a88585..91eca40 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ system-ant-tasks -no-twitter no-scala -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
