This is an automated email from the git hooks/post-receive script.
vdanjean pushed a commit to branch master
in repository htsjdk.
commit 3a308e04bb95aa104e53e63f7fdf964647babe98
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date: Wed Jul 6 01:38:36 2016 +0200
Re-enable tests and doc
---
debian/libhtsjdk-java-doc.javadoc | 2 +-
debian/libhtsjdk-java.classpath | 2 +-
debian/maven.rules | 19 +++++++++++++++++++
debian/patches/20-fix-version.patch | 32 +++++++++++++++++++++++++++++++-
debian/rules | 20 ++++----------------
5 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/debian/libhtsjdk-java-doc.javadoc b/debian/libhtsjdk-java-doc.javadoc
index 583a10f..bba5a8f 100644
--- a/debian/libhtsjdk-java-doc.javadoc
+++ b/debian/libhtsjdk-java-doc.javadoc
@@ -1 +1 @@
-javadoc /usr/share/doc/libhtsjdk-java/api/
+build/doc/javadoc /usr/share/doc/libhtsjdk-java/api/
diff --git a/debian/libhtsjdk-java.classpath b/debian/libhtsjdk-java.classpath
index 86481b0..0b82687 100644
--- a/debian/libhtsjdk-java.classpath
+++ b/debian/libhtsjdk-java.classpath
@@ -1 +1 @@
-usr/share/java/htsjdk.jar /usr/share/java/commons-compress.jar /usr/share/java/commons-jexl2.jar /usr/share/java/jbzip2.jar /usr/share/java/snappy-java.jar /usr/share/java/testng.jar
+usr/share/java/htsjdk.jar /usr/share/java/commons-compress.jar /usr/share/java/commons-jexl2.jar /usr/share/java/jbzip2.jar /usr/share/java/snappy-java.jar
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..c505baa
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,19 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
+org.testng testng jar s/6.*/6.x/ * *
diff --git a/debian/patches/20-fix-version.patch b/debian/patches/20-fix-version.patch
index 578e7ba..e2e85ec 100644
--- a/debian/patches/20-fix-version.patch
+++ b/debian/patches/20-fix-version.patch
@@ -5,7 +5,37 @@ Forwarded: not-needed
Last-Updated: 2016-07-05
--- a/build.gradle
+++ b/build.gradle
-@@ -45,9 +45,17 @@
+@@ -8,29 +8,12 @@
+ id "java"
+ id 'maven'
+ id 'signing'
+- id 'jacoco'
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+-jacocoTestReport {
+- dependsOn test
+- group = "Reporting"
+- description = "Generate Jacoco coverage reports after running tests."
+- additionalSourceDirs = files(sourceSets.main.allJava.srcDirs)
+-
+- reports {
+- xml.enabled = true // coveralls plugin depends on xml format report
+- html.enabled = true
+- }
+-}
+-
+-jacoco {
+- toolVersion = "0.7.5.201505241946"
+-}
+-
+ dependencies {
+ compile "org.apache.commons:commons-jexl:2.1.1"
+ compile "commons-logging:commons-logging:1.1.1"
+@@ -45,9 +28,17 @@
sourceCompatibility = 1.8
targetCompatibility = 1.8
diff --git a/debian/rules b/debian/rules
index 0e9e13c..b4efec7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,23 +11,11 @@ export LC_ALL=C.UTF-8
%:
dh $@ --buildsystem=gradle --with javahelper
-#override_dh_auto_configure:
-# [ -d lib ] || mkdir lib # This empty directory is lost in the packages's Git clone.
-# dh_auto_configure
+override_dh_auto_build:
+ dh_auto_build -- build
-#override_dh_auto_build:
-# dh_auto_build -- \
-# -Dant.build.javac.source=1.8 \
-# -Dant.build.javac.target=1.8 \
-# -Ddebug=true \
-# htsjdk-jar javadoc
-
-#override_dh_auto_test:
-# dh_auto_build -- \
-# -Dant.build.javac.source=1.8 \
-# -Dant.build.javac.target=1.8 \
-# -Ddebug=true \
-# test
+override_dh_auto_test:
+ dh_auto_build -- test
override_jh_installlibs:
jh_installlibs --version-strip='[+]dfsg\.[0-9]*'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htsjdk.git