[ognl] 17/34: * Maven POMs: - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper - debian/rules: use mh_installpoms and mh_installjar to install the POM and the jar to the Maven repository release. * Bump debhelper version to >= 7

[Emmanuel Bourg]

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

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

commit 2f99a1612fbe34411effbf317707f66ea0c45b30
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Thu Nov 26 23:20:14 2009 +0000

    * Maven POMs:
      - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
      - debian/rules: use mh_installpoms and mh_installjar
        to install the POM and the jar to the Maven repository
        release.
    * Bump debhelper version to >= 7
---
 debian/changelog         | 11 +++++++++++
 debian/compat            |  2 +-
 debian/control           |  5 +++--
 debian/libognl-java.poms |  1 +
 debian/maven.rules       |  2 ++
 debian/rules             |  7 +++++--
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8f1172..4ebc931 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ognl (2.7.3-2) UNRELEASED; urgency=low
+
+  * Maven POMs:
+    - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
+    - debian/rules: use mh_installpoms and mh_installjar
+      to install the POM and the jar to the Maven repository
+      release.
+  * Bump debhelper version to >= 7
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 27 Nov 2009 00:19:33 +0100
+
 ognl (2.7.3-1) unstable; urgency=low
 
   [ Trygve Laugstøl ]
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 1c43647..febfef6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, quilt
-Build-Depends-Indep: libjavassist-java, junit4, docbook-xsl, docbook-xml, ant-optional, libxalan2-java, javacc, fop
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, quilt
+Build-Depends-Indep: libjavassist-java, junit4, docbook-xsl, docbook-xml, ant-optional,
+ libxalan2-java, javacc, fop, maven-repo-helper
 Standards-Version: 3.8.3
 Homepage: http://www.opensymphony.com/ognl/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ognl
diff --git a/debian/libognl-java.poms b/debian/libognl-java.poms
new file mode 100644
index 0000000..d4f7111
--- /dev/null
+++ b/debian/libognl-java.poms
@@ -0,0 +1 @@
+pom.xml
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..8691a06
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/ *
+org.apache.maven.plugins maven-surefire-plugin maven-plugin s/.*/2.4.3/
diff --git a/debian/rules b/debian/rules
index 0ae0512..f6ea945 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,11 @@ DEB_ANT_BUILD_TARGET    := javacc-generate jar docs.impl javadocs
 DEB_COMPRESS_EXCLUDE    := .pdf
 
 binary-post-install/libognl-java::
-	dh_install build/ognl-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/ognl-$(DEB_UPSTREAM_VERSION).jar usr/share/java/ognl.jar
+	mh_installpoms -plibognl-java
+	mh_installjar -plibognl-java -l pom.xml build/ognl-$(DEB_UPSTREAM_VERSION).jar
+
+clean::
+	-rm -rf debian/tmp
 
 get-orig-source:
 	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)

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