[pkg-java] r18811 - trunk/xml-maven-plugin/debian

[Eugene Zhukov]

Author: eugene-guest
Date: 2015-08-11 19:46:56 +0000 (Tue, 11 Aug 2015)
New Revision: 18811

Modified:
   trunk/xml-maven-plugin/debian/changelog
   trunk/xml-maven-plugin/debian/compat
   trunk/xml-maven-plugin/debian/control
   trunk/xml-maven-plugin/debian/libxml-maven-plugin-java.poms
   trunk/xml-maven-plugin/debian/rules
Log:
Switch buildsystem to debhelper

Modified: trunk/xml-maven-plugin/debian/changelog
===================================================================
--- trunk/xml-maven-plugin/debian/changelog	2015-08-11 13:52:57 UTC (rev 18810)
+++ trunk/xml-maven-plugin/debian/changelog	2015-08-11 19:46:56 UTC (rev 18811)
@@ -4,6 +4,9 @@
   * 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
 

Modified: trunk/xml-maven-plugin/debian/compat
===================================================================
--- trunk/xml-maven-plugin/debian/compat	2015-08-11 13:52:57 UTC (rev 18810)
+++ trunk/xml-maven-plugin/debian/compat	2015-08-11 19:46:56 UTC (rev 18811)
@@ -1 +1 @@
-8
+9

Modified: trunk/xml-maven-plugin/debian/control
===================================================================
--- trunk/xml-maven-plugin/debian/control	2015-08-11 13:52:57 UTC (rev 18810)
+++ trunk/xml-maven-plugin/debian/control	2015-08-11 19:46:56 UTC (rev 18811)
@@ -3,7 +3,7 @@
 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

Modified: trunk/xml-maven-plugin/debian/libxml-maven-plugin-java.poms
===================================================================
--- trunk/xml-maven-plugin/debian/libxml-maven-plugin-java.poms	2015-08-11 13:52:57 UTC (rev 18810)
+++ trunk/xml-maven-plugin/debian/libxml-maven-plugin-java.poms	2015-08-11 19:46:56 UTC (rev 18811)
@@ -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

Modified: trunk/xml-maven-plugin/debian/rules
===================================================================
--- trunk/xml-maven-plugin/debian/rules	2015-08-11 13:52:57 UTC (rev 18810)
+++ trunk/xml-maven-plugin/debian/rules	2015-08-11 19:46:56 UTC (rev 18811)
@@ -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: