[med-svn] [Git][med-team/drop-seq][master] Make sure Debian JARs will be found

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / drop-seq


Commits:
0566b745 by Andreas Tille at 2020-05-20T22:02:49+02:00
Make sure Debian JARs will be found

- - - - -


2 changed files:

- debian/patches/debian_packaged_libs.patch
- debian/rules


Changes:

=====================================
debian/patches/debian_packaged_libs.patch
=====================================
@@ -1,6 +1,6 @@
 --- a/build.xml
 +++ b/build.xml
-@@ -35,7 +35,7 @@
+@@ -35,12 +35,12 @@
      <property name="classes.test" location="testclasses"/>
      <property name="test.output" location="dist/test"/>
      <property name="javadoc" location="javadoc"/>
@@ -9,3 +9,9 @@
      <property name="public.dir" location="."/>
  
      <!-- INIT -->
+     <path id="classpath">
+-        <fileset dir="${lib}">
++        <fileset dir="/usr/share/java">
+             <include name="*.jar"/>
+         </fileset>
+     </path>


=====================================
debian/rules
=====================================
@@ -19,9 +19,6 @@ include /usr/share/dpkg/default.mk
 
 JAVA_HOME  := /usr/lib/jvm/default-java
 
-DEBJAR    := /usr/share/java
-CLASS_PATH := $(DEBJAR)/htsjdk.jar:$(DEBJAR)/picard.jar:$(DEBJAR)/commons-collections4.jar
-
 %:
 	dh $@ --with javahelper
 



View it on GitLab: https://salsa.debian.org/med-team/drop-seq/-/commit/0566b745b8a76653e50414e15aad92e734fa1905

-- 
View it on GitLab: https://salsa.debian.org/med-team/drop-seq/-/commit/0566b745b8a76653e50414e15aad92e734fa1905
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200520/a1bc10d0/attachment-0001.html>