[pkg-java] r11142 - trunk/ognl/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2009-11-26 23:20:14 +0000 (Thu, 26 Nov 2009)
New Revision: 11142

Added:
   trunk/ognl/debian/libognl-java.poms
   trunk/ognl/debian/maven.rules
Modified:
   trunk/ognl/debian/changelog
   trunk/ognl/debian/compat
   trunk/ognl/debian/control
   trunk/ognl/debian/rules
Log:
* 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

Modified: trunk/ognl/debian/changelog
===================================================================
--- trunk/ognl/debian/changelog	2009-11-26 23:18:33 UTC (rev 11141)
+++ trunk/ognl/debian/changelog	2009-11-26 23:20:14 UTC (rev 11142)
@@ -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 ]

Modified: trunk/ognl/debian/compat
===================================================================
--- trunk/ognl/debian/compat	2009-11-26 23:18:33 UTC (rev 11141)
+++ trunk/ognl/debian/compat	2009-11-26 23:20:14 UTC (rev 11142)
@@ -1 +1 @@
-5
+7

Modified: trunk/ognl/debian/control
===================================================================
--- trunk/ognl/debian/control	2009-11-26 23:18:33 UTC (rev 11141)
+++ trunk/ognl/debian/control	2009-11-26 23:20:14 UTC (rev 11142)
@@ -3,8 +3,9 @@
 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

Added: trunk/ognl/debian/libognl-java.poms
===================================================================
--- trunk/ognl/debian/libognl-java.poms	                        (rev 0)
+++ trunk/ognl/debian/libognl-java.poms	2009-11-26 23:20:14 UTC (rev 11142)
@@ -0,0 +1 @@
+pom.xml

Added: trunk/ognl/debian/maven.rules
===================================================================
--- trunk/ognl/debian/maven.rules	                        (rev 0)
+++ trunk/ognl/debian/maven.rules	2009-11-26 23:20:14 UTC (rev 11142)
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/ *
+org.apache.maven.plugins maven-surefire-plugin maven-plugin s/.*/2.4.3/

Modified: trunk/ognl/debian/rules
===================================================================
--- trunk/ognl/debian/rules	2009-11-26 23:18:33 UTC (rev 11141)
+++ trunk/ognl/debian/rules	2009-11-26 23:20:14 UTC (rev 11142)
@@ -15,8 +15,11 @@
 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)