[xml-maven-plugin] 13/23: Switch buildsystem to debhelper

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository xml-maven-plugin.

commit d0e46b087af56129a555007939603f7078cca4fd
Author: Eugene Zhukov <eugene at debian.org>
Date:   Tue Aug 11 19:46:56 2015 +0000

    Switch buildsystem to debhelper
---
 debian/changelog                     | 3 +++
 debian/compat                        | 2 +-
 debian/control                       | 2 +-
 debian/libxml-maven-plugin-java.poms | 2 +-
 debian/rules                         | 9 ++++-----
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a5ad7f..c6122f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xml-maven-plugin (1.0-3) unstable; urgency=medium
   * Dropped d/orig-tar.sh
   * Fixed d/watch to point to github
   * d/control: fix homepage, vcs-url's
+  * debhelper updated to version 9
+  * Switched from cdbs build system to debhelper
+  * Fixed lintian warning maven-plugin-in-usr-share-java
 
  -- Eugene Zhukov <jevgeni.zh at gmail.com>  Tue, 11 Aug 2015 13:32:57 +0000
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 9019274..4aee64e 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: Eugene Zhukov <jevgeni.zh at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep: libmaven-invoker-plugin-java, libjaxp1.3-java, libmaven2-core-java, libplexus-io-java,
  libplexus-resources-java, libplexus-utils-java, libxerces2-java, libxml-commons-resolver1.1-java (>= 1.2),
  libmaven-plugin-testing-java, libsaxonb-java (>= 9.1.0.8), libxalan2-java, libmaven-plugin-tools-java
diff --git a/debian/libxml-maven-plugin-java.poms b/debian/libxml-maven-plugin-java.poms
index 64b1188..5ad70f2 100644
--- a/debian/libxml-maven-plugin-java.poms
+++ b/debian/libxml-maven-plugin-java.poms
@@ -25,4 +25,4 @@
 #   --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 --java-lib
+pom.xml --no-parent --has-package-version
diff --git a/debian/rules b/debian/rules
index 0da1137..932dbf6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@ --parallel --buildsystem=maven
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-clean::
+override_dh_clean:
+	dh_clean
 	rm -rf src/test/it*/target
 
 get-orig-source:

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