[jakarta-ecs] 10/14: Install the Maven artifacts in /usr/share/maven-repo

[Emmanuel Bourg]

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

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

commit 0305eeeec81453943e4abc9c24cecf9bc644e313
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 6 22:08:58 2014 +0100

    Install the Maven artifacts in /usr/share/maven-repo
---
 debian/changelog                | 1 +
 debian/control                  | 2 +-
 debian/dirs                     | 1 -
 debian/libjakarta-ecs-java.poms | 1 +
 debian/pom.xml                  | 6 ++++++
 debian/rules                    | 7 ++++---
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbbd5b2..adf33e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jakarta-ecs (1.4.2-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Package adopted by the Java Team (Closes: #640778)
+  * Install the Maven artifacts in /usr/share/maven-repo
   * Removed the files related to log4j in the debian directory
   * Changed the watch file to check ecs instead of log4j
   * Switch to source format 3.0 (quilt)
diff --git a/debian/control b/debian/control
index 19566fb..89e3b32 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: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, libregexp-java
+Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, maven-repo-helper, libregexp-java
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/jakarta-ecs.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jakarta-ecs.git
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libjakarta-ecs-java.poms b/debian/libjakarta-ecs-java.poms
new file mode 100644
index 0000000..b609efd
--- /dev/null
+++ b/debian/libjakarta-ecs-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --java-lib --has-package-version
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..b95f41b
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,6 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>ecs</groupId>
+  <artifactId>ecs</artifactId>
+  <version>1.4.2</version>
+</project>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 1746807..5e1ac5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
 
+PACKAGE      := $(DEB_SOURCE_PACKAGE)
 DEB_ANT_ARGS := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
 DEB_JARS := regexp
 DEB_ANT_BUILDFILE := build/build-ecs.xml
@@ -13,10 +13,11 @@ DEB_ANT_BUILD_TARGET := jar
 
 clean::
 	-$(RM) -r docs
+	mh_clean
 
 install/libjakarta-ecs-java::
-	dh_install bin/ecs-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/ecs-$(DEB_UPSTREAM_VERSION).jar usr/share/java/ecs.jar
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml bin/ecs-$(DEB_UPSTREAM_VERSION).jar
 
 get-orig-source:
 	-uscan --upstream-version 0

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