[med-svn] [rambo-k] 01/01: Move JARs to /usr/share/rambo-k

[Andreas Tille]

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

tille pushed a commit to branch master
in repository rambo-k.

commit b3dd90a1fa318ac3c359a759464cdaa7f7e9bf0d
Author: Andreas Tille <tille at debian.org>
Date:   Sat Nov 19 09:42:21 2016 +0100

    Move JARs to /usr/share/rambo-k
---
 debian/jlibs    |  4 ++--
 debian/links    |  2 --
 debian/manifest |  6 +++---
 debian/rules    | 19 ++++++++++---------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/debian/jlibs b/debian/jlibs
index e90d537..0a35c24 100644
--- a/debian/jlibs
+++ b/debian/jlibs
@@ -1,2 +1,2 @@
-rambo-k-classifier.jar
-rambo-k-trainer.jar
+classifier.jar
+trainer.jar
diff --git a/debian/links b/debian/links
index c2ac194..a0c148e 100644
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1 @@
 usr/share/rambo-k/RAMBOK.py		usr/bin/rambo-k
-usr/share/java/rambo-k-classifier.jar	usr/share/rambo-k/classifier.jar
-usr/share/java/rambo-k-classifier.jar	usr/share/rambo-k/trainer.jar
diff --git a/debian/manifest b/debian/manifest
index 36ff03e..1a4e25b 100644
--- a/debian/manifest
+++ b/debian/manifest
@@ -1,7 +1,7 @@
-/usr/share/java/rambo-k-classifier.jar:
+/usr/share/rambo-k/classifier.jar:
  Main-Class: org.rki.readclassifier.Classifier
  Class-Path: /usr/share/java/commons-cli.jar
 
-/usr/share/java/rambo-k-trainer.jar:
+/usr/share/rambo-k/trainer.jar:
  Main-Class: org.rki.readtrainer.Trainer
- Class-Path: /usr/share/java/commons-cli.jar
+ Class-Path: /usr/share/java/commons-cli.jar /usr/share/rambo-k/classifier.jar
diff --git a/debian/rules b/debian/rules
index 4d372f4..36f88e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,15 +7,17 @@ DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 %:
 	dh $@ --with javahelper --with python2
 
-makejarsimple:
-	javac -classpath /usr/share/java/commons-cli.jar:ReadTrainer_eclipse/src/org/rki/readtrainer/ \
-		ReadClassifier_eclipse/src/org/rki/readclassifier/*.java \
-		ReadTrainer_eclipse/src/org/rki/readtrainer/*.java
-
 override_dh_auto_build:
-	CLASSPATH=/usr/share/java/commons-cli.jar:ReadTrainer_eclipse/src/org/rki/readtrainer/:ReadClassifier_eclipse/src/ jh_build rambo-k-classifier.jar ReadClassifier_eclipse
-	find . -name "*.class" -delete
-	CLASSPATH=/usr/share/java/commons-cli.jar:rambo-k-classifier.jar:ReadTrainer_eclipse/src/org/rki/readtrainer/ jh_build rambo-k-trainer.jar ReadTrainer_eclipse
+	CLASSPATH=/usr/share/java/commons-cli.jar:ReadTrainer_eclipse/src/org/rki/readtrainer/:ReadClassifier_eclipse/src/ jh_build classifier.jar ReadClassifier_eclipse
+	CLASSPATH=/usr/share/java/commons-cli.jar:classifier.jar:ReadTrainer_eclipse/src/org/rki/readtrainer/ jh_build trainer.jar ReadTrainer_eclipse
+
+override_jh_installlibs:
+	jh_installlibs
+	# jlibs by default moves JARs to /usr/share/java but these JARs
+	# are very specific to RAMBO-K, do not have any general use and
+	# finally have quite generic names
+	mv debian/$(DEBPKGNAME)/usr/share/java/*.jar debian/$(DEBPKGNAME)/usr/share/rambo-k
+	rmdir debian/$(DEBPKGNAME)/usr/share/java/
 
 override_dh_fixperms:
 	dh_fixperms
@@ -23,4 +25,3 @@ override_dh_fixperms:
 
 get-orig-source:
 	. debian/get-orig-source
-	# uscan --verbose --force-download --compress xz --repack

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/rambo-k.git