Author: ebourg-guest Date: 2013-12-23 23:42:56 +0000 (Mon, 23 Dec 2013) New Revision: 17606
Modified: trunk/libhamcrest-java/debian/changelog trunk/libhamcrest-java/debian/control trunk/libhamcrest-java/debian/patches/001-build.patch Log: Removed the unused build dependency on testng Modified: trunk/libhamcrest-java/debian/changelog =================================================================== --- trunk/libhamcrest-java/debian/changelog 2013-12-23 23:12:51 UTC (rev 17605) +++ trunk/libhamcrest-java/debian/changelog 2013-12-23 23:42:56 UTC (rev 17606) @@ -1,5 +1,6 @@ -libhamcrest-java (1.3-4) UNRELEASED; urgency=medium +libhamcrest-java (1.3-4) unstable; urgency=medium + * Removed the unused build dependency on testng * Standards-Version updated to 3.9.5 (no changes) * Switch to debhelper level 9 Modified: trunk/libhamcrest-java/debian/control =================================================================== --- trunk/libhamcrest-java/debian/control 2013-12-23 23:12:51 UTC (rev 17605) +++ trunk/libhamcrest-java/debian/control 2013-12-23 23:42:56 UTC (rev 17606) @@ -8,7 +8,7 @@ Emmanuel Bourg <[email protected]> Build-Depends: cdbs, debhelper (>= 9), 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 + default-jdk-doc, junit-doc, junit4-doc, junit, junit4 Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libhamcrest-java Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libhamcrest-java Modified: trunk/libhamcrest-java/debian/patches/001-build.patch =================================================================== --- trunk/libhamcrest-java/debian/patches/001-build.patch 2013-12-23 23:12:51 UTC (rev 17605) +++ trunk/libhamcrest-java/debian/patches/001-build.patch 2013-12-23 23:42:56 UTC (rev 17606) @@ -21,7 +21,7 @@ <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/> </jarjar> <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/> -@@ -93,14 +93,18 @@ +@@ -93,14 +93,17 @@ <junit printsummary="no" fork="no" haltonfailure="${haltonfailure}"> <formatter type="brief" usefile="no"/> <classpath> @@ -36,14 +36,13 @@ + <fileset dir="/usr/share/java"> + <include name="junit.jar"/> + <include name="junit4.jar"/> -+ <include name="testng.jar"/> + <include name="easymock.jar"/> + <include name="jmock.jar"/> + </fileset> </classpath> <batchtest> <fileset dir="hamcrest-unit-test/src/main/java"> -@@ -152,7 +156,7 @@ +@@ -152,7 +155,7 @@ <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes" destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true" @@ -52,7 +51,7 @@ <classpath> <fileset dir="lib/integration"> <include name="*.jar"/> -@@ -166,8 +170,8 @@ +@@ -166,8 +169,8 @@ <group title="Matcher Library" packages="org.hamcrest.*"/> <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/> @@ -63,7 +62,7 @@ </javadoc> <jar jarfile="build/hamcrest-all-${version}-javadoc.jar"> <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/> -@@ -286,10 +290,14 @@ +@@ -286,10 +289,13 @@ <mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/> <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false"> <classpath> @@ -74,14 +73,13 @@ + <fileset dir="/usr/share/java"> + <include name="junit.jar"/> + <include name="junit4.jar"/> -+ <include name="testng.jar"/> + <include name="easymock.jar"/> + <include name="jmock.jar"/> + </fileset> </classpath> </javac> <copy file="LICENSE.txt" todir="build/temp/@{modulename}-${version}.jar.contents"/> -@@ -317,7 +325,7 @@ +@@ -317,7 +323,7 @@ <fileset dir="lib/integration"> <include name="*.jar"/> </fileset> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
