[javassist] 05/08: Build with maven-debian-helper instead of Ant

Thu Jun 30 22:11:33 UTC 2016

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

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

commit c7f1e079e19ae0b2bac947ae1c05a25df6006928
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 29 11:05:43 2016 +0200

    Build with maven-debian-helper instead of Ant
---
 debian/changelog                      |  1 +
 debian/control                        |  6 +++---
 debian/libjavassist-java-doc.doc-base |  4 ++--
 debian/libjavassist-java-doc.install  |  2 +-
 debian/libjavassist-java.poms         | 29 ++++++++++++++++++++++++++++-
 debian/maven.ignoreRules              |  2 ++
 debian/maven.properties               |  5 +++++
 debian/maven.publishedRules           |  1 -
 debian/maven.rules                    |  2 ++
 debian/rules                          | 23 ++++++-----------------
 10 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6cdb222..af8b7a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ javassist (1:3.20.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
   * Removed Niels Thykier from the uploaders (Closes: #770578)
+  * Build with maven-debian-helper instead of Ant
   * Updated the Homepage field
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
diff --git a/debian/control b/debian/control
index 98edf57..a0689ff 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 9), cdbs
-Build-Depends-Indep: ant, default-jdk, maven-repo-helper, ant-optional, junit
+Build-Depends: debhelper (>= 9), maven-debian-helper (>= 2.0), default-jdk, junit, libmaven-bundle-plugin-java, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/javassist.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/javassist.git
@@ -12,7 +11,8 @@ Homepage: http://jboss-javassist.github.io/javassist/
 
 Package: libjavassist-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
 Description: library for editing bytecodes in Java
  This library makes Java bytecode manipulation simple. It enables Java
  programs to define a new class at runtime and to modify a class file
diff --git a/debian/libjavassist-java-doc.doc-base b/debian/libjavassist-java-doc.doc-base
index 3c4d886..5ace8f1 100644
--- a/debian/libjavassist-java-doc.doc-base
+++ b/debian/libjavassist-java-doc.doc-base
@@ -6,5 +6,5 @@ Abstract: This is the programmer API of javassist, a library for
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libjavassist-java-doc/api/index.html
-Files: /usr/share/doc/libjavassist-java-doc/api/*.html
+Index: /usr/share/doc/libjavassist-java/api/index.html
+Files: /usr/share/doc/libjavassist-java/api/*.html
diff --git a/debian/libjavassist-java-doc.install b/debian/libjavassist-java-doc.install
index cf7fa15..6656e5a 100644
--- a/debian/libjavassist-java-doc.install
+++ b/debian/libjavassist-java-doc.install
@@ -1 +1 @@
-html/* /usr/share/doc/libjavassist-java-doc/api/
+target/apidocs/* /usr/share/doc/libjavassist-java/api/
diff --git a/debian/libjavassist-java.poms b/debian/libjavassist-java.poms
index d4f7111..1d885c3 100644
--- a/debian/libjavassist-java.poms
+++ b/debian/libjavassist-java.poms
@@ -1 +1,28 @@
-pom.xml
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+pom.xml --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..ebc9a76
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,2 @@
+
+org.apache.maven.plugins maven-source-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e593715
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
deleted file mode 100644
index 4c47ff7..0000000
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1 +0,0 @@
-s/jboss/javassist/ javassist * s/.*/debian/
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..9d87a49
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+
+junit junit jar s/3\..*/3.x/ * *
diff --git a/debian/rules b/debian/rules
index d0ba585..6c0a4a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=maven
 
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jar javadocs
-DEB_ANT_CHECK_TARGET := test
-DEB_JARS             := ant-junit junit
-ANT_OPTS             := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
-
-clean::
-	$(RM) javassist-src.jar
-
-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml $(PACKAGE).jar
+override_dh_clean:
+	dh_clean
+	rm -Rf runtest
 
 get-orig-source:
-	uscan --download-version $(VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename --repack --compression xz

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

