[olap4j] 18/19: Install the Maven artifacts

[Emmanuel Bourg]

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

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

commit 00d46e6a6ab30716d4792e15d1a9ad7168a838cc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 20 19:16:26 2015 +0200

    Install the Maven artifacts
---
 debian/changelog           |  1 +
 debian/control             |  2 +-
 debian/pom-olap4j-tck.xml  |  9 +++++++++
 debian/pom-olap4j-xmla.xml | 18 ++++++++++++++++++
 debian/pom-olap4j.xml      |  9 +++++++++
 debian/rules               | 17 +++++++++++------
 6 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d4c9ff..e30bea7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ olap4j (1.2.0-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Replaced the build dependency on cup with javacc
     - Removed the dependency on liblog4j1.2-java
+  * Install the Maven artifacts
   * Improved the reproducibility:
     - Set the locale when generating the javadoc and remove the timestamps)
     - Removed VERSION.txt from the jar files (contains timestamps, usernames)
diff --git a/debian/control b/debian/control
index 8e4b820..46a6398 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: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk
+Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, maven-repo-helper
 Build-Depends-Indep: ant-contrib,
                      ant-optional,
                      default-jdk-doc,
diff --git a/debian/pom-olap4j-tck.xml b/debian/pom-olap4j-tck.xml
new file mode 100644
index 0000000..6390bbe
--- /dev/null
+++ b/debian/pom-olap4j-tck.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.olap4j</groupId>
+  <artifactId>olap4j-tck</artifactId>
+  <version>1.2.0</version>
+</project>
diff --git a/debian/pom-olap4j-xmla.xml b/debian/pom-olap4j-xmla.xml
new file mode 100644
index 0000000..403a73a
--- /dev/null
+++ b/debian/pom-olap4j-xmla.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.olap4j</groupId>
+  <artifactId>olap4j-xmla</artifactId>
+  <version>1.2.0</version>
+
+  <dependencies>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.11.0</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/debian/pom-olap4j.xml b/debian/pom-olap4j.xml
new file mode 100644
index 0000000..7478d22
--- /dev/null
+++ b/debian/pom-olap4j.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.olap4j</groupId>
+  <artifactId>olap4j</artifactId>
+  <version>1.2.0</version>
+</project>
diff --git a/debian/rules b/debian/rules
index 9d51fb0..fe19c88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,12 +14,17 @@ DEB_ANT_BUILD_TARGET := version-properties jar xmla-jar tck-jar javadoc
 DEB_ANT_CLEAN_TARGET := clean
 
 install/libolap4j-java::
-	dh_install dist/olap4j-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_install dist/olap4j-xmla-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_install dist/olap4j-tck-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/olap4j-$(DEB_UPSTREAM_VERSION).jar usr/share/java/olap4j.jar
-	dh_link usr/share/java/olap4j-xmla-$(DEB_UPSTREAM_VERSION).jar usr/share/java/olap4j-xmla.jar
-	dh_link usr/share/java/olap4j-tck-$(DEB_UPSTREAM_VERSION).jar usr/share/java/olap4j-tck.jar
+	mh_installpom -plibolap4j-java debian/pom-olap4j.xml
+	mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j.xml dist/olap4j-$(DEB_UPSTREAM_VERSION).jar
+
+	mh_installpom -plibolap4j-java debian/pom-olap4j-xmla.xml
+	mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j-xmla.xml dist/olap4j-xmla-$(DEB_UPSTREAM_VERSION).jar
+
+	mh_installpom -plibolap4j-java debian/pom-olap4j-tck.xml
+	mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j-tck.xml dist/olap4j-tck-$(DEB_UPSTREAM_VERSION).jar
+
+clean::
+	mh_clean
 
 get-orig-source:
 	uscan --force-download

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