[med-svn] [Git][med-team/drop-seq][master] Work on Java build

[Andreas Tille]

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


Commits:
e9afeca9 by Andreas Tille at 2020-05-20T12:52:54+02:00
Work on Java build

- - - - -


5 changed files:

- debian/control
- + debian/patches/debian_packaged_libs.patch
- + debian/patches/no_git.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: debhelper-compat (= 12),
+               javahelper,
                libpicard-java,
                libcommons-collections4-java,
                libcommons-lang-java,
@@ -21,6 +22,7 @@ Package: drop-seq-tools
 Architecture: any
 Depends: ${java:Depends},
          ${misc:Depends},
+         picard-tools,
          libpicard-java,
          libcommons-collections4-java,
          libcommons-lang-java,


=====================================
debian/patches/debian_packaged_libs.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/build.xml
++++ b/build.xml
+@@ -35,7 +35,7 @@
+     <property name="classes.test" location="testclasses"/>
+     <property name="test.output" location="dist/test"/>
+     <property name="javadoc" location="javadoc"/>
+-    <property name="picard.executable.dir" location="../../3rdParty/picard"/>
++    <property name="picard.executable.dir" location="/usr/bin/picard-tools"/>
+     <property name="public.dir" location="."/>
+ 
+     <!-- INIT -->


=====================================
debian/patches/no_git.patch
=====================================
@@ -0,0 +1,14 @@
+--- a/src/ant/defs.xml
++++ b/src/ant/defs.xml
+@@ -24,11 +24,6 @@
+ 
+ <!-- To be included in build.xml -->
+ <!-- Get GIT hash, if available, otherwise leave it blank.  -->
+-<exec executable="git" outputproperty="repository.revision" failifexecutionfails="true" errorproperty="">
+-    <arg value="log"/>
+-    <arg value="-1"/>
+-    <arg value="--pretty=format:%h_%at"/>
+-</exec>
+ <property name="repository.revision" value=""/>
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+no_git.patch
+debian_packaged_libs.patch


=====================================
debian/rules
=====================================
@@ -17,15 +17,16 @@ include /usr/share/dpkg/default.mk
 # for hardening you might like to uncomment this:
 # export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+JAVA_HOME  := /usr/lib/jvm/default-java
+
+DEBJAR    := /usr/share/java
+CLASS_PATH := $(DEBJAR)/picard.jar:$(DEBJAR)/commons-collections4.jar
+
 %:
-	dh $@
+	dh $@ --with javahelper
 
 ### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
 #override_dh_auto_test:
 #ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 #	do_stuff_for_testing
 #endif
-
-### If you **really** can not use uscan (even not with mode=git) use a debian/get-orig-script
-#get-orig-source:
-#	. debian/get-orig-source



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

-- 
View it on GitLab: https://salsa.debian.org/med-team/drop-seq/-/commit/e9afeca975181cc7050fb4aad26d56ed2fd6dc93
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/7a68bcb8/attachment-0001.html>