This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository h2database.
commit d824dc3c082f62a92006f6a83e9fee95268f19d3
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Nov 24 12:53:07 2017 +0100
Fixed the build failure with Java 9 when maven-debian-helper is installed
(Closes: #875366)
---
debian/changelog | 1 +
debian/rules | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cc6b5f1..caeeefa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
h2database (1.4.196-2) UNRELEASED; urgency=medium
* Fixed the build failure when maven-debian-helper is installed
+ (Closes: #875366)
-- Emmanuel Bourg <ebo...@apache.org> Fri, 24 Nov 2017 11:54:45 +0100
diff --git a/debian/rules b/debian/rules
index a25f25b..696638e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,13 @@ JAVA_HOME=/usr/lib/jvm/default-java
VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
%:
- dh $@ --with javahelper
+ dh $@ --buildsystem=makefile --with javahelper
override_dh_auto_build:
mkdir -p temp bin
JAVA_HOME=${JAVA_HOME} "${JAVA_HOME}/bin/javac" -sourcepath src/tools
-d bin src/tools/org/h2/build/*.java
JAVA_HOME=${JAVA_HOME} "${JAVA_HOME}/bin/java" -Xmx256m -cp
"bin:${JAVA_HOME}/lib/tools.jar:temp" org.h2.build.Build jar javadoc
-override_dh_auto_test:
-
override_dh_auto_install:
dh_auto_install
mh_installpom -plibh2-java --set-version=$(VERSION)
--has-package-version src/installer/pom-template.xml
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/h2database.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
