[pkg-java] r17334 - trunk/libhamcrest-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-10-16 13:50:03 +0000 (Wed, 16 Oct 2013)
New Revision: 17334

Modified:
   trunk/libhamcrest-java/debian/ant.properties
   trunk/libhamcrest-java/debian/changelog
   trunk/libhamcrest-java/debian/control
   trunk/libhamcrest-java/debian/rules
Log:
Install hamcrest-unit-test.jar in /usr/share/java (Closes: #724950)



Modified: trunk/libhamcrest-java/debian/ant.properties
===================================================================
--- trunk/libhamcrest-java/debian/ant.properties	2013-10-16 08:30:47 UTC (rev 17333)
+++ trunk/libhamcrest-java/debian/ant.properties	2013-10-16 13:50:03 UTC (rev 17334)
@@ -2,6 +2,8 @@
 class.dir=classes
 source.dir=src/main/java
 
+haltonfailure=false
+
 hamcrest-core.dir=hamcrest-core
 hamcrest-integration.dir=hamcrest-integration
 hamcrest-generator.dir=hamcrest-generator

Modified: trunk/libhamcrest-java/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog	2013-10-16 08:30:47 UTC (rev 17333)
+++ trunk/libhamcrest-java/debian/changelog	2013-10-16 13:50:03 UTC (rev 17334)
@@ -1,8 +1,9 @@
-libhamcrest-java (1.3-3) UNRELEASED; urgency=low
+libhamcrest-java (1.3-3) unstable; urgency=low
 
+  * Install hamcrest-unit-test.jar in /usr/share/java (Closes: #724950)
   * Use canonical URLs for the Vcs-* fields
 
- -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Oct 2013 10:30:12 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Oct 2013 13:05:07 +0200
 
 libhamcrest-java (1.3-2) unstable; urgency=low
 

Modified: trunk/libhamcrest-java/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control	2013-10-16 08:30:47 UTC (rev 17333)
+++ trunk/libhamcrest-java/debian/control	2013-10-16 13:50:03 UTC (rev 17334)
@@ -6,7 +6,7 @@
  Damien Raude-Morvan <drazzib at debian.org>,
  Brian Thomason <brian.thomason at gmail.com>,
  Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk, maven-repo-helper
+Build-Depends: cdbs, debhelper (>= 7), ant, ant-optional, default-jdk, maven-repo-helper
 Build-Depends-Indep: libqdox-java, libeasymock-java, libjmock-java, libjarjar-java,
  default-jdk-doc, junit-doc, junit4-doc, junit, junit4, testng
 Standards-Version: 3.9.4

Modified: trunk/libhamcrest-java/debian/rules
===================================================================
--- trunk/libhamcrest-java/debian/rules	2013-10-16 08:30:47 UTC (rev 17333)
+++ trunk/libhamcrest-java/debian/rules	2013-10-16 13:50:03 UTC (rev 17334)
@@ -5,8 +5,8 @@
 
 JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE	:= build.xml
-DEB_ANT_BUILD_TARGET	:= bigjar javadoc
-DEB_JARS		:= easymock jmock qdox
+DEB_ANT_BUILD_TARGET	:= bigjar unit-test javadoc
+DEB_JARS		:= easymock jmock qdox ant-junit
 ANT_OPTS		:= -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dversion=$(DEB_UPSTREAM_VERSION)
 POMS                    := core generator integration library all
 
@@ -32,6 +32,9 @@
 		mh_installjar -l -e$(DEB_UPSTREAM_VERSION) -j$(DEB_UPSTREAM_VERSION) \
 		-plibhamcrest-java $$pomfile build/hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).jar; \
 	done
+	
+	dh_install -plibhamcrest-java build/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_link -plibhamcrest-java usr/share/java/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java/hamcrest-unit-test.jar
 
 clean::
 	rm -fr debian/.mh/