[plexus-bsh-factory] 11/14: Build with maven-debian-helper

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository plexus-bsh-factory.

commit d7468a80a1f399becc22eb6d1f04d53071e1a354
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Feb 19 15:36:22 2016 +0100

    Build with maven-debian-helper
---
 debian/changelog                                 |  1 +
 debian/control                                   |  4 ++--
 debian/{build.properties => maven.properties}    |  0
 debian/maven.rules                               |  1 +
 debian/patches/01-add-missing-dependencies.patch | 16 ++++++++++++++++
 debian/patches/series                            |  1 +
 debian/rules                                     | 22 +++-------------------
 7 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 53ea088..60bd69c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 plexus-bsh-factory (1.0~alpha7-3.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
+  * Build with maven-debian-helper
   * Moved the package to Git
   * Standards-Version updated to 3.9.7 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index b8a8edc..3da8d8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk
-Build-Depends-Indep: maven-ant-helper (>> 4), maven-repo-helper, ant, ant-optional, libplexus-container-default-java, bsh
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper
+Build-Depends-Indep: libplexus-container-default-java, bsh
 Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-bsh-factory.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-bsh-factory.git
diff --git a/debian/build.properties b/debian/maven.properties
similarity index 100%
rename from debian/build.properties
rename to debian/maven.properties
diff --git a/debian/maven.rules b/debian/maven.rules
index 8fcb5e5..780a3e0 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1 +1,2 @@
 s/bsh/org.beanshell/ bsh jar s/.*/debian/
+org.codehaus.plexus plexus-container-default * s/.*/1.0-alpha/
diff --git a/debian/patches/01-add-missing-dependencies.patch b/debian/patches/01-add-missing-dependencies.patch
new file mode 100644
index 0000000..2571c0f
--- /dev/null
+++ b/debian/patches/01-add-missing-dependencies.patch
@@ -0,0 +1,16 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -14,5 +14,11 @@
+       <artifactId>bsh</artifactId>
+       <version>1.3.0</version>
+     </dependency>
++    <dependency>
++      <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-container-default</artifactId>
++      <version>1.0-alpha-9-stable-1</version>
++      <scope>provided</scope>
++    </dependency>
+   </dependencies>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e9c66b4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-add-missing-dependencies.patch
diff --git a/debian/rules b/debian/rules
index 5907d42..d755df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~alpha/-alpha-/")
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps plexus-container-default-alpha classworlds plexus-utils bsh
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml build/plexus-bsh-factory-$(VERSION).jar
-
-clean::
-	mh_clean
-
+	uscan --download-current-version --force-download --rename

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