[plm] 08/13: fix our dependencies to follow upstream changes

Martin Quinson mquinson at moszumanska.debian.org
Sat Nov 1 07:28:06 UTC 2014


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

mquinson pushed a commit to branch debian
in repository plm.

commit 48285aa1b04832df204af56146a9f29a5484215b
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Fri Oct 24 20:50:21 2014 +0200

    fix our dependencies to follow upstream changes
    
    - jsyntaxpane was replaced with rtextpane
    - git dependency was added
---
 debian/control      | 4 ++--
 debian/plm.manifest | 2 +-
 debian/rules        | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 27e3145..70f79b7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
 Priority: extra
 Maintainer: Martin Quinson <mquinson at debian.org>
 Build-Depends: debhelper (>> 8), javahelper (>= 0.32), ant, quilt
-Build-Depends-Indep: openjdk-7-jdk, libmiglayout-java, libjsyntaxpane-java,
-  junit4, libgettext-commons-java, libjson-simple-java, libhttpclient-java, libhttpmime-java, 
+Build-Depends-Indep: openjdk-7-jdk, libmiglayout-java, librsyntaxtextarea-java,
+  junit4, libgettext-commons-java, libjson-simple-java, libhttpclient-java, libhttpmime-java, libjgit-java,
   jython, libgettext-ant-tasks-java, imagemagick
 #, scala
 Standards-Version: 3.9.5
diff --git a/debian/plm.manifest b/debian/plm.manifest
index 4d7281a..1193183 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 httpclient.jar httpcore.jar jython.jar scala-compiler.jar scala-library.jar
+ Class-Path: miglayout.jar rsyntaxtextarea.jar gettext-commons.jar json-simple.jar httpclient.jar httpcore.jar jython.jar scala-compiler.jar scala-library.jar org.eclipse.jgit.jar
diff --git a/debian/rules b/debian/rules
index 5049dba..e109485 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,13 @@ 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
+depspath=/usr/share/java/miglayout.jar:/usr/share/java/rsyntaxtextarea.jar:/usr/share/java/gettext-commons.jar:/usr/share/java/junit4.jar
+gitpath=/usr/share/java/org.eclipse.jgit.jar
 scalapath=.
 #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:.
 httppath=/usr/share/java/httpclient.jar:/usr/share/java/httpcore.jar:/usr/share/java/commons-logging.jar:/usr/share/java/httpmime.jar
-export CLASSPATH=$(depspath):$(langpath):$(httppath):$(scalapath):.
+export CLASSPATH=$(depspath):$(gitpath):$(langpath):$(httppath):$(scalapath):.
 
 %:
 	dh  $@  --with javahelper --with quilt

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



More information about the pkg-java-commits mailing list