[jlm] 06/11: new upstream release

[Martin Quinson]

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

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

commit e5385d917aff0a18d1ac85dbeb965a47ac181ebe
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Sun Aug 4 23:29:48 2013 +0200

    new upstream release
---
 debian/changelog          |    7 +++++++
 debian/patches/no-twitter |   26 ++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2815e45..0344267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jlm (2.0-1) UNRELEASED; urgency=low
+
+  * New upstream release. 
+    - Refresh our patches.
+
+ -- Martin Quinson <mquinson at debian.org>  Sun, 04 Aug 2013 23:29:19 +0200
+
 jlm (1.98-1) unstable; urgency=low
 
   * Initial release. (Closes: #622324)
diff --git a/debian/patches/no-twitter b/debian/patches/no-twitter
index 65d37bc..b38d3f4 100644
--- a/debian/patches/no-twitter
+++ b/debian/patches/no-twitter
@@ -1,6 +1,12 @@
+---
+ src/jlm/core/model/tracking/TwitterSpy.java |   35 ++++------------------------
+ 1 file changed, 5 insertions(+), 30 deletions(-)
+
+Index: b/src/jlm/core/model/tracking/TwitterSpy.java
+===================================================================
 --- a/src/jlm/core/model/tracking/TwitterSpy.java
 +++ b/src/jlm/core/model/tracking/TwitterSpy.java
-@@ -1,42 +1,18 @@
+@@ -1,39 +1,14 @@
  package jlm.core.model.tracking;
  
 -import twitter4j.Twitter;
@@ -12,10 +18,7 @@
  public class TwitterSpy implements ProgressSpyListener {
 -	private String username;
 -	private Twitter twitter;
-+   public TwitterSpy() {
-+      /* twitter4j is not packaged in Debian; remove this */
-+   }
- 
+-
 -	public TwitterSpy() {
 -		username = System.getenv("USER");
 -		if (username == null)
@@ -31,7 +34,7 @@
 -
 -	@Override
 -	public void executed(Exercise exo) {
--		if (Game.getInstance().studentWork.getPassed(exo.getId(), exo.lastResult.language)) {
+-		if (Game.getInstance().studentWork.getPassed(exo, exo.lastResult.language)) {
 -			try {
 -				twitter.updateStatus(username+" solved "+exo.getName()+" in "+exo.lastResult.language+"!");
 -			} catch (Exception e) {
@@ -40,12 +43,11 @@
 -			}
 -		}
 -	}
++   public TwitterSpy() {
++      /* twitter4j is not packaged in Debian; remove this */
++   }
 +   @Override
-+   public void executed(Exercise exo) {}
- 
-     @Override
--    public void switched(Exercise exo) {    /* i don't care, i'm a viking */    }
-+    public void switched(Exercise exo) {}
++   public void executed(Exercise exo) { }
  
      @Override
-     public void heartbeat() {}
+     public void switched(Exercise exo) {    /* i don't care, i'm a viking */    }

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/jlm.git