[jlm] 06/11: Prepare the integration of scala programming language

[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 7838448ad4bd2435e1604df41afcdbcca9a97de5
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Wed Sep 4 15:04:28 2013 +0200

    Prepare the integration of scala programming language
    
    Not finished yet, as we need 2.10 in Debian first
---
 debian/changelog    |    8 +++++++-
 debian/control      |    3 ++-
 debian/plm.manifest |    2 +-
 debian/rules        |    5 +++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dcc52b..655fd7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 plm (2.2+repack-1) UNRELEASED; urgency=low
 
-  * New upstream release: the software was renamed from JLM to PLM.
+  * New upstream release: 
+    - the software was renamed from JLM to PLM.
+    - Scala can now be used to solve the exercises
+    - Two new lessons: recreative applications of sorting,
+    - New lesson: Turtle Art
+  * Update our packaging to the new upstream release
     - drop d/p/review_french: integrated upstream
     - drop d/p/no-xmpp: upstream dropped XMPP too
     - update the other patches
+    - build-dep on scala
 
  -- Martin Quinson <mquinson at debian.org>  Wed, 04 Sep 2013 14:32:19 +0200
 
diff --git a/debian/control b/debian/control
index e223da2..432e8b1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Martin Quinson <mquinson at debian.org>
 Build-Depends: debhelper (>> 8), javahelper (>= 0.32), ant, quilt
 Build-Depends-Indep: openjdk-6-jdk, libmiglayout-java, libjsyntaxpane-java,
-  jython, junit4, libgettext-commons-java, libjson-simple-java, libhttpclient-java
+  junit4, libgettext-commons-java, libjson-simple-java, libhttpclient-java,
+  jython, scala
 Standards-Version: 3.9.4
 Homepage: http://www.loria.fr/~quinson/Teaching/PLM/
 
diff --git a/debian/plm.manifest b/debian/plm.manifest
index 6978e24..4beafb0 100644
--- a/debian/plm.manifest
+++ b/debian/plm.manifest
@@ -1,3 +1,3 @@
 usr/share/java/plm.jar:
  Main-Class: plm.core.ui.ProgrammersLearningMachine
- Class-Path: miglayout.jar jsyntaxpane.jar gettext-commons.jar json_simple.jar jython.jar httpclient.jar httpcore.jar
+ Class-Path: miglayout.jar jsyntaxpane.jar gettext-commons.jar json_simple.jar httpclient.jar httpcore.jar jython.jar scala-compiler.jar scala-library.jar
diff --git a/debian/rules b/debian/rules
index ac3ee60..01e9177 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,9 @@ ICONS      := $(DESTDIR)/usr/share/icons/hicolor
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 depspath= /usr/share/java/miglayout.jar:/usr/share/java/jsyntaxpane.jar:/usr/share/java/gettext-commons.jar:/usr/share/java/junit4.jar
+scalapath=/usr/share/java/scala-compiler.jar:/usr/share/java/scala-library.jar
 langpath=/usr/share/java/json_simple.jar:/usr/share/java/jython.jar:.
-identica=/usr/share/java/httpclient.jar:/usr/share/java/httpcore.jar
-export CLASSPATH=$(depspath):$(langpath):$(identica):.
+export CLASSPATH=$(depspath):$(langpath):$(identica):$(scalapath):.
 
 %:
 	dh  $@  --with javahelper --with quilt
@@ -26,6 +26,7 @@ override_jh_build:
 	# Copy other mandated files in place
 	jarctn=`find src -name "*.py"; \
 		find src -name "*.java"; \
+		find src -name "*.scala"; \
 	        find src -name "*.html"; \
 	        find src -name "*.png"; \
 		find src -name  "*.map"`; \

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