[pkg-java] r13805 - trunk/httpunit/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-06-15 22:32:56 +0000 (Wed, 15 Jun 2011)
New Revision: 13805

Modified:
   trunk/httpunit/debian/changelog
   trunk/httpunit/debian/control
   trunk/httpunit/debian/libhttpunit-java.poms
   trunk/httpunit/debian/rules
Log:
* debian/control: add version contraint on maven-repo-helper
* debian/rules: simplify installation by using mh_install
* debian/libhttpunit.poms: add parameters for mh_install

Modified: trunk/httpunit/debian/changelog
===================================================================
--- trunk/httpunit/debian/changelog	2011-06-14 20:36:17 UTC (rev 13804)
+++ trunk/httpunit/debian/changelog	2011-06-15 22:32:56 UTC (rev 13805)
@@ -1,3 +1,11 @@
+httpunit (1.7+dfsg-5) UNRELEASED; urgency=low
+
+  * debian/control: add version contraint on maven-repo-helper
+  * debian/rules: simplify installation by using mh_install
+  * debian/libhttpunit.poms: add parameters for mh_install
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Jun 2011 00:28:21 +0200
+
 httpunit (1.7+dfsg-4) unstable; urgency=low
 
   * Added libservlet2.4-java runtime dependency

Modified: trunk/httpunit/debian/control
===================================================================
--- trunk/httpunit/debian/control	2011-06-14 20:36:17 UTC (rev 13804)
+++ trunk/httpunit/debian/control	2011-06-15 22:32:56 UTC (rev 13805)
@@ -7,7 +7,7 @@
  debhelper (>= 7.0.50~), rhino (>= 1.7R1-2), libjtidy-java (>= 7+svn20070309-2),
  libgnujaf-java (>= 1.1.1-4), junit (>= 3.8.2), libgnumail-java (>= 1.1.2-2),
  libservlet2.4-java (>= 5.0.30-8), libxerces2-java (>= 2.9.1-2),
- libnekohtml-java (>= 0.9.5+dfsg-1.1), maven-repo-helper
+ libnekohtml-java (>= 0.9.5+dfsg-1.1), maven-repo-helper (>= 1.5)
 Standards-Version: 3.8.4
 Homepage: http://httpunit.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/httpunit/

Modified: trunk/httpunit/debian/libhttpunit-java.poms
===================================================================
--- trunk/httpunit/debian/libhttpunit-java.poms	2011-06-14 20:36:17 UTC (rev 13804)
+++ trunk/httpunit/debian/libhttpunit-java.poms	2011-06-15 22:32:56 UTC (rev 13805)
@@ -1 +1 @@
-debian/pom.xml
+debian/pom.xml --java-lib --artifact=lib/httpunit.jar

Modified: trunk/httpunit/debian/rules
===================================================================
--- trunk/httpunit/debian/rules	2011-06-14 20:36:17 UTC (rev 13804)
+++ trunk/httpunit/debian/rules	2011-06-15 22:32:56 UTC (rev 13805)
@@ -9,9 +9,7 @@
 
 override_dh_auto_install:
 	ant dist
-	mh_installpom -plibhttpunit-java $(CURDIR)/debian/pom.xml
-	mh_installjar -plibhttpunit-java -l $(CURDIR)/debian/pom.xml \
-		$(CURDIR)/lib/httpunit.jar
+	mh_install
 	
 get-orig-source:
 	sh -e debian/orig-tar.sh