This is an automated email from the git hooks/post-receive script. mquinson pushed a commit to branch debian-debian in repository jlm.
commit ffe2417e849966f2e991d99986f7d307e8b6a861 Author: Martin Quinson <[email protected]> Date: Wed Sep 4 14:52:53 2013 +0200 the package was renamed upstream (jlm->plm) --- debian/changelog | 6 +++++ debian/control | 32 ++++++++++++---------- debian/copyright | 10 +++---- debian/javabuild | 2 +- debian/jlm.jlibs | 1 - debian/jlm.manpages | 1 - debian/jlm.menu | 3 --- debian/{jlm.1 => plm.1} | 47 +++++++++++++++++++-------------- debian/{jlm.desktop => plm.desktop} | 10 +++---- debian/plm.jlibs | 1 + debian/{jlm.manifest => plm.manifest} | 5 ++-- debian/plm.manpages | 1 + debian/plm.menu | 3 +++ debian/{jlm.sh => plm.sh} | 4 +-- debian/rules | 34 ++++++++++++------------ 15 files changed, 88 insertions(+), 72 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f5a757..9cd38a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +plm (2.0+repack-2) UNRELEASED; urgency=low + + * New upstream release: the software was renamed from JLM to PLM. + + -- Martin Quinson <[email protected]> Wed, 04 Sep 2013 14:32:19 +0200 + jlm (2.0+repack-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 1f18af3..e223da2 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: jlm +Source: plm Section: java Priority: optional Maintainer: Martin Quinson <[email protected]> @@ -6,29 +6,33 @@ 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 Standards-Version: 3.9.4 -Homepage: http://www.loria.fr/~quinson/Teaching/JLM/ +Homepage: http://www.loria.fr/~quinson/Teaching/PLM/ -Package: jlm +Package: plm Architecture: all Depends: ${java:Depends}, ${misc:Depends}, openjdk-6-jdk -Description: Learning Management System for programming exercises in Java, Python and others - The Java Learning Machine (JLM) is a free cross-platform programming +Description: Programming exerciser in Java, Python, Scala and others + The Programmer's Learning Machine (PLM) is a free cross-platform programming exerciser. It lets you explore various concepts of programming through - over 130 interactive exercises, that you can solve in either Java or python. + over 160 interactive exercises, that you can solve in either Java, + Python or Scala. . - The JLM interface and content is througfully translated to English + The PLM interface and content is througfully translated to English and French; we hope that other translations will be contributed in the future. . - The following lessons are included in this package: + The following concepts are included in this package: . - Welcome: teach basics of programming to absolute beginners - - Sort: classical sorting algorithms for intermediate - - Recursion: classical logo algorithms for intermediate - Maze: classical maze escaping algorithms for intermediate - - LightBot: little programming game for intermediate and advanced + - Sort: classical sorting algorithms for intermediate. One + introduction lesson presents the basics of the sorting algorithms + while two additional lessons apply them in more recreative settings. + - Recursion: classical logo algorithms for intermediate + - Turtle Art: explore a few classical LOGO figures + - LightBot: little programmer's brain teaser for intermediate and advanced . Other lessons are planned to explore new concepts, such as the - backtracking, object-oriented programming or the standard libraries - of python and Java. Other programming languages (such as scala, ruby - or JavaScript) may be added in the future. \ No newline at end of file + backtracking, dynamic programming, object-oriented programming or the + standard libraries of python and Java. Other programming languages + (such as ruby or JavaScript) may be added in the future. \ No newline at end of file diff --git a/debian/copyright b/debian/copyright index 79b1579..6889ea7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,17 +1,17 @@ Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174 -Upstream-name: jlm +Upstream-name: plm Upstream-contact: Martin Quinson and Gerald Oster ([email protected]) Source: https://github.com/oster/JLM Files: * -Copyright: Copyright 2008-2013 the JLM team +Copyright: Copyright 2008-2013 the PLM team License: GPLv3+ On Debian systems, the complete text of the GPL-3 can be found in /usr/share/common-licenses/GPL-3. Files: src/lessons/* -Copyright: Copyright 2008-2013 the JLM team +Copyright: Copyright 2008-2013 the PLM team License: CC-BY-SA-3.0 Files: @@ -30,8 +30,8 @@ Files: img/world_hanoi.png img/world_sorting.png img/btn-reset.png - jlm/universe/bugglequest/ui/egg.png - jlm/universe/bugglequest/ui/rabbit.png + plm/universe/bugglequest/ui/egg.png + plm/universe/bugglequest/ui/rabbit.png img/btn-demo.png img/btn-switch-exo.png img/btn-debug-step.png diff --git a/debian/javabuild b/debian/javabuild index 5806712..00019d3 100644 --- a/debian/javabuild +++ b/debian/javabuild @@ -1 +1 @@ -jlm.jar src/ +plm.jar src/ diff --git a/debian/jlm.jlibs b/debian/jlm.jlibs deleted file mode 100644 index e4d8e6c..0000000 --- a/debian/jlm.jlibs +++ /dev/null @@ -1 +0,0 @@ -jlm.jar \ No newline at end of file diff --git a/debian/jlm.manpages b/debian/jlm.manpages deleted file mode 100644 index c207d9c..0000000 --- a/debian/jlm.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/jlm.1 diff --git a/debian/jlm.menu b/debian/jlm.menu deleted file mode 100644 index 3c4b441..0000000 --- a/debian/jlm.menu +++ /dev/null @@ -1,3 +0,0 @@ -?package(jlm):needs="X11" section="Applications/Education" \ - title="JLM" command="/usr/bin/jlm" - \ No newline at end of file diff --git a/debian/jlm.1 b/debian/plm.1 similarity index 54% rename from debian/jlm.1 rename to debian/plm.1 index e8149e7..2750116 100644 --- a/debian/jlm.1 +++ b/debian/plm.1 @@ -1,18 +1,18 @@ -.TH JLM 1 "June 16, 2012" JLM "JLM - Java Learning Machine" +.TH PLM 1 "June 16, 2012" PLM "PLM - Programmer's Learning Machine" .SH NAME -.B JLM -\- Java Cross-platform Programming Exerciser +.B PLM +\- Cross-platform Programming Exerciser .SH SYNOPSIS -.B "jlm " +.B "plm " .SH DESCRIPTION -The \fBJava Learning Machine (JLM)\fP is a free cross-platform +The \fBProgrammer's Learning Machine (PLM)\fP is a free cross-platform programming exerciser. It lets you explore various concepts of programming through interactive exercises, that you can solve in -either Java or python. The interface and the whole content is +either Java, python or scala. The interface and the whole content is througfully translated to English and French. The following lessons are included in this package: @@ -22,20 +22,27 @@ The following lessons are included in this package: Teaches the basics of programming to absolute beginners .TP 13 +.B . Maze: +Presentes some classical maze escaping algorithms for intermediate + +.TP 13 .B . Sort: -Focuses on the classical sorting algorithms for intermediate +Focuses on the classical sorting algorithms for intermediate. One +introduction lesson presents the basics of the sorting algorithms +while two additional lessons apply them in more recreative settings. .TP 13 .B . Recursion: -Dives into classical logo algorithms for intermediate +Dives into classical logo algorithms for intermediate .TP 13 -.B . Maze: -Presentes some classical maze escaping algorithms for intermediate +.B . Turtle Art: +Presents a few classical LOGO figures; your imagination will certainly +explore this world further. .TP 13 .B . LightBot: -Constitutes a little programming game for intermediate and advanced +Constitutes a little programmer's brain teaser for intermediate and advanced .PP This program is released under the GNU General Public License, while @@ -44,34 +51,34 @@ version 1.6 or higher, either from OpenJDK or from another vendor. .SH CONFIGURATION -\fBJLM\fP does not accept any command-line switch or +\fBPLM\fP does not accept any command-line switch or options; every elements are configured either through the user-defined property file, or within the graphical interface directly. .SH FUTURE EVOLUTIONS Other lessons are planned to explore new concepts, such as the -backtracking, object-oriented programming or the standard libraries of -python and Java. Other programming languages (such as scala, ruby or -JavaScript) may be added in the future. We hope that the translation -of the interface and content to other human languages will be -contributed by the community in the future. +backtracking, dynamic programming, object-oriented programming or the +standard libraries of python and Java. Other programming languages +(such as ruby or JavaScript) may be added in the future. We hope that +the translation of the interface and content to other human languages +will be contributed by the community in the future. .SH FILES .TP -~/.jlm/jlm.properties +~/.plm/plm.properties User-configured properties. .TP -~/.jlm/*.zip +~/.plm/*.zip Save files for each lesson. This contains the text that you provided to solve the exercises. You can copy them over to another machine to continue your work. .SH "LICENSE" -The JLM program is distributed under the GNU GPL version 3 or later +The PLM program is distributed under the GNU GPL version 3 or later (GPLv3+) license, available from http://gnu.org/licenses/gpl.html The content is distributed under the CC-BY-SA license. diff --git a/debian/jlm.desktop b/debian/plm.desktop similarity index 59% rename from debian/jlm.desktop rename to debian/plm.desktop index 424a190..f0cd655 100644 --- a/debian/jlm.desktop +++ b/debian/plm.desktop @@ -1,13 +1,13 @@ [Desktop Entry] -Name=JLM -GenericName=Java Learning Machine +Name=PLM +GenericName=Programmer's Learning Machine Comment=Learn programming interactively Comment[fr]=Apprendre la programmation interactivement -Exec=jlm %U -Icon=/usr/share/icons/hicolor/22x22/apps/jlm.png +Exec=plm %U +Icon=/usr/share/icons/hicolor/22x22/apps/plm.png Terminal=false Type=Application Categories=Development;TextEditor;Education; StartupNotify=true MimeType=text/plain; -Keywords=Code;Programming;Java;Python; +Keywords=Code;Programming;Java;Python;Scala; diff --git a/debian/plm.jlibs b/debian/plm.jlibs new file mode 100644 index 0000000..01bb1ab --- /dev/null +++ b/debian/plm.jlibs @@ -0,0 +1 @@ +plm.jar \ No newline at end of file diff --git a/debian/jlm.manifest b/debian/plm.manifest similarity index 60% rename from debian/jlm.manifest rename to debian/plm.manifest index 8d01385..6978e24 100644 --- a/debian/jlm.manifest +++ b/debian/plm.manifest @@ -1,4 +1,3 @@ -usr/share/java/jlm.jar: - Main-Class: jlm.core.ui.JavaLearningMachine +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 - \ No newline at end of file diff --git a/debian/plm.manpages b/debian/plm.manpages new file mode 100644 index 0000000..790b187 --- /dev/null +++ b/debian/plm.manpages @@ -0,0 +1 @@ +debian/plm.1 diff --git a/debian/plm.menu b/debian/plm.menu new file mode 100644 index 0000000..f2e4811 --- /dev/null +++ b/debian/plm.menu @@ -0,0 +1,3 @@ +?package(plm):needs="X11" section="Applications/Education" \ + title="PLM" command="/usr/bin/plm" + \ No newline at end of file diff --git a/debian/jlm.sh b/debian/plm.sh similarity index 75% rename from debian/jlm.sh rename to debian/plm.sh index 1534037..9bd9870 100755 --- a/debian/jlm.sh +++ b/debian/plm.sh @@ -8,6 +8,6 @@ export JYTHON_OPTS="${JYTHON_OPTS} -Dpython.cachedir=${HOME}/.jython_cachedir" find_java_runtime java6 -find_jars /usr/share/java/jlm.jar +find_jars /usr/share/java/plm.jar -run_java jlm.core.ui.JavaLearningMachine "$@" +run_java plm.core.ui.ProgrammersLearningMachine "$@" diff --git a/debian/rules b/debian/rules index df523e9..ac3ee60 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DESTDIR := $(CURDIR)/debian/jlm +DESTDIR := $(CURDIR)/debian/plm ICONS := $(DESTDIR)/usr/share/icons/hicolor @@ -16,12 +16,12 @@ export CLASSPATH=$(depspath):$(langpath):$(identica):. override_jh_build: # Copy our resource within the wannabe jar file - mkdir -p debian/_jh_build.jlm - cp -r lib/resources debian/_jh_build.jlm + mkdir -p debian/_jh_build.plm + cp -r lib/resources debian/_jh_build.plm # Copy our image files (but prune the svg files) - cp -r img debian/_jh_build.jlm - find debian/_jh_build.jlm -name "*.svg" -print0 | xargs -0 rm + cp -r img debian/_jh_build.plm + find debian/_jh_build.plm -name "*.svg" -print0 | xargs -0 rm # Copy other mandated files in place jarctn=`find src -name "*.py"; \ @@ -31,12 +31,12 @@ override_jh_build: find src -name "*.map"`; \ for file in $$jarctn ; do\ whereto=`echo $$file|sed 's|^src/||'` ; \ - install -D -m 644 $$file debian/_jh_build.jlm/$$whereto; \ + install -D -m 644 $$file debian/_jh_build.plm/$$whereto; \ done # Generate the translation files ant i18n-generate-jar - cd debian/_jh_build.jlm && jar xf ../../lib/jlm-messages.jar org + cd debian/_jh_build.plm && jar xf ../../lib/plm-messages.jar org # Finally, ask the scripts to compile our stuff, too jh_build --javacopts="-source 1.6 -target 1.6" --no-javadoc @@ -52,33 +52,33 @@ override_dh_auto_install: mkdir -p $(ICONS)/$${i}x$${i}/apps; \ convert img/logo.png -colorspace RGB \ -resize $${i}x$${i} -colorspace sRGB \ - $(ICONS)/$${i}x$${i}/apps/jlm.png; \ + $(ICONS)/$${i}x$${i}/apps/plm.png; \ done install -d -m 755 $(DESTDIR)/usr/share/pixmaps convert img/logo.png -colorspace RGB \ -resize 32x32 -colorspace sRGB \ - $(DESTDIR)/usr/share/pixmaps/jlm.xpm + $(DESTDIR)/usr/share/pixmaps/plm.xpm # desktop - install -D -m 644 debian/jlm.desktop $(DESTDIR)/usr/share/applications/jlm.desktop + install -D -m 644 debian/plm.desktop $(DESTDIR)/usr/share/applications/plm.desktop # wrapper script install -d -m 755 $(DESTDIR)/usr/bin - cp debian/jlm.sh $(DESTDIR)/usr/bin/jlm - chmod 755 $(DESTDIR)/usr/bin/jlm + cp debian/plm.sh $(DESTDIR)/usr/bin/plm + chmod 755 $(DESTDIR)/usr/bin/plm version=$(shell uscan --report-status | head -2 | tail -1 | cut -d' ' -f7 | cut -d, -f1) tmpdir:=$(shell mktemp -d) wrkdir:=$(shell pwd) get-orig-source: - rm -f ${wrkdir}/../jlm_${version}+repack.orig.tar.gz - rm -f ${wrkdir}/../jlm_${version}.orig.tar.gz + rm -f ${wrkdir}/../plm_${version}+repack.orig.tar.gz + rm -f ${wrkdir}/../plm_${version}.orig.tar.gz uscan --verbose --force-download && cp ../${version}.tar.gz ${tmpdir} || true set +ex; cd ${tmpdir} && \ tar xf ${version}.tar.gz && rm -f ${version}.tar.gz && \ cd JLM-${version} && find lib -name '*.jar' | xargs rm && \ - tar cf ${wrkdir}/../jlm_${version}+repack.orig.tar * ; \ - gzip --best ${wrkdir}/../jlm_${version}+repack.orig.tar + tar cf ${wrkdir}/../plm_${version}+repack.orig.tar * ; \ + gzip --best ${wrkdir}/../plm_${version}+repack.orig.tar rm -rf ${tmpdir} - @echo "successfully created new tarball: ${wrkdir}/../jlm_${version}+repack.orig.tar.gz" + @echo "successfully created new tarball: ${wrkdir}/../plm_${version}+repack.orig.tar.gz" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jlm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
