[libmetadata-extractor-java] 06/22: Switch from cdbs to dh sequencer and from Ant to Maven build system.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository libmetadata-extractor-java.

commit 8c5e546cd0184c6bb6bad35233b28ca827d1926a
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jun 30 21:30:00 2017 +0200

    Switch from cdbs to dh sequencer and from Ant to Maven build system.
---
 debian/ant.properties                       |  5 -----
 debian/control                              |  8 ++------
 debian/libmetadata-extractor-java.classpath |  1 -
 debian/libmetadata-extractor-java.poms      | 28 ++++++++++++++++++++++++++++
 debian/maven.properties                     |  3 +++
 debian/rules                                | 23 +++--------------------
 6 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 7adf5bd..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-ant.build.javac.source=1.6
-ant.build.javac.target=1.6
-verbose=false
-debug=true
-javadoc=api
diff --git a/debian/control b/debian/control
index 3795cb9..85b9e5b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,12 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant,
-               ant-optional,
-               cdbs,
-               debhelper (>= 10),
+Build-Depends: debhelper (>= 10),
                default-jdk,
                default-jdk-doc,
-               javahelper,
                junit4,
                libxmpcore-java,
-               maven-repo-helper
+               maven-debian-helper
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libmetadata-extractor-java.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-java/libmetadata-extractor-java.git
diff --git a/debian/libmetadata-extractor-java.classpath b/debian/libmetadata-extractor-java.classpath
deleted file mode 100644
index 4f0cc92..0000000
--- a/debian/libmetadata-extractor-java.classpath
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/metadata-extractor.jar xmpcore.jar
diff --git a/debian/libmetadata-extractor-java.poms b/debian/libmetadata-extractor-java.poms
new file mode 100644
index 0000000..5ad70f2
--- /dev/null
+++ b/debian/libmetadata-extractor-java.poms
@@ -0,0 +1,28 @@
+# 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 --no-parent --has-package-version
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..a057d1b
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,3 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+#maven.test.skip=true
diff --git a/debian/rules b/debian/rules
index 7b3399c..fa23c8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules file for libmetadata-extractor-java (uses cdbs)
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_ANT_BUILD_TARGET       := dist-binaries javadoc
-DEB_ANT_ARGS               := -Dlib-xmp=/usr/share/java/xmpcore.jar -Dlib-junit=/usr/share/java/junit4.jar
-DEB_JARS                   := ant-junit ant-junit4
-PACKAGE                    := libmetadata-extractor-java
-
-clean::
-	mh_clean
-	rm -rf Releases Build api TestReports
-
-install/libmetadata-extractor-java::
-	mh_installpom -p${PACKAGE} --no-parent pom.xml
-	mh_installjar -p${PACKAGE} --java-lib pom.xml Releases/metadata-extractor-${DEB_UPSTREAM_VERSION}.jar
-	jh_classpath -p${PACKAGE}
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source::
-	uscan --force-download --download-version ${DEB_UPSTREAM_VERSION}
+	uscan --force-download --download-current-version

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