[javaparser] 07/13: Build with maven-debian-helper instead of javahelper

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository javaparser.

commit 83660b501c6d9c211b7d50e29c88e7ef5644edca
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 3 10:27:39 2017 +0200

    Build with maven-debian-helper instead of javahelper
---
 debian/changelog                      | 4 +++-
 debian/control                        | 9 +++++----
 debian/javabuild                      | 1 -
 debian/libjavaparser-java-doc.install | 1 +
 debian/libjavaparser-java-doc.javadoc | 1 -
 debian/libjavaparser-java.jlibs       | 1 -
 debian/libjavaparser-java.poms        | 1 +
 debian/maven.rules                    | 1 +
 debian/rules                          | 6 +-----
 9 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88c4fe0..cb1a93b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-javaparser (1.0.8-2) UNRELEASED; urgency=medium
+javaparser (1.0.9-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+  * Build with maven-debian-helper instead of javahelper
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index f4c11fa..f2ecea2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Benjamin Mesing <ben at debian.org>
-Build-Depends: debhelper (>= 10), javahelper (>= 0.4)
+Build-Depends: debhelper (>= 10), maven-debian-helper, libmaven-javadoc-plugin-java, libjavacc-maven-plugin-java, libbuild-helper-maven-plugin-java, junit4
 Build-Depends-Indep: default-jdk, default-jdk-doc
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/javaparser.git
@@ -12,7 +12,8 @@ Homepage: http://javaparser.org
 
 Package: libjavaparser-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
+Recommends: ${maven:OptionalDepends}
 Suggests: libjavaparser-java-doc
 Description: Java library for parsing Java 1.5.
  The library features abstract syntax tree (AST) generation and supports 
@@ -30,8 +31,8 @@ Description: Java library for parsing Java 1.5.
 Package: libjavaparser-java-doc
 Architecture: all
 Section: doc
-Depends: ${java:Depends}, ${misc:Depends}
-Recommends: default-jdk-doc, librsyntaxtextarea-java-doc
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Recommends: ${maven:DocOptionalDepends}, default-jdk-doc, librsyntaxtextarea-java-doc
 Suggests: libautocomplete-java
 Description: Java library for parsing Java 1.5.
  The library features abstract syntax tree (AST) generation and supports 
diff --git a/debian/javabuild b/debian/javabuild
deleted file mode 100644
index df8e1ab..0000000
--- a/debian/javabuild
+++ /dev/null
@@ -1 +0,0 @@
-javaparser.jar src/
diff --git a/debian/libjavaparser-java-doc.install b/debian/libjavaparser-java-doc.install
new file mode 100644
index 0000000..9f1ec54
--- /dev/null
+++ b/debian/libjavaparser-java-doc.install
@@ -0,0 +1 @@
+target/apidocs/* /usr/share/doc/libjavaparser-java/api/
diff --git a/debian/libjavaparser-java-doc.javadoc b/debian/libjavaparser-java-doc.javadoc
deleted file mode 100644
index ce83b25..0000000
--- a/debian/libjavaparser-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-internal
diff --git a/debian/libjavaparser-java.jlibs b/debian/libjavaparser-java.jlibs
deleted file mode 100644
index b1b445d..0000000
--- a/debian/libjavaparser-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-javaparser.jar
\ No newline at end of file
diff --git a/debian/libjavaparser-java.poms b/debian/libjavaparser-java.poms
new file mode 100644
index 0000000..4a8e4d5
--- /dev/null
+++ b/debian/libjavaparser-java.poms
@@ -0,0 +1 @@
+pom.xml --no-parent --has-âckage-version --java-lib
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..d6696a1
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+junit junit * s/.*/4.x/ * *
diff --git a/debian/rules b/debian/rules
index c3bc558..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-
-VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
-
 %:
-	dh $@ --with javahelper
+	dh $@
 
 get-orig-source:
 	uscan --download-current-version --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javaparser.git