[pkg-java] r9266 - in trunk/jmock/debian: . patches

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-14 00:53:29 +0000 (Tue, 14 Jul 2009)
New Revision: 9266

Modified:
   trunk/jmock/debian/changelog
   trunk/jmock/debian/patches/build.patch
   trunk/jmock/debian/rules
   trunk/jmock/debian/watch
Log:
* Update debian/watch and add debian/orig-tar.sh to download a source
  tarball without any pre-compiled jars. 
* Skip running the unit tests are they were using library jars included in
  the source distribution. I cannot run them anymore as the version of
  cglib used was very old.

Modified: trunk/jmock/debian/changelog
===================================================================
--- trunk/jmock/debian/changelog	2009-07-14 00:34:35 UTC (rev 9265)
+++ trunk/jmock/debian/changelog	2009-07-14 00:53:29 UTC (rev 9266)
@@ -11,6 +11,11 @@
   * Add ${misc:Depends} to Depends to clear Lintian warnings
   * Use quilt instead of dpatch and update the patches (I have trouble
     with dpatch)
+  * Update debian/watch and add debian/orig-tar.sh to download a source
+    tarball without any pre-compiled jars. 
+  * Skip running the unit tests are they were using library jars included in
+    the source distribution. I cannot run them anymore as the version of
+    cglib used was very old.
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 27 May 2009 20:11:43 +0100
 

Modified: trunk/jmock/debian/patches/build.patch
===================================================================
--- trunk/jmock/debian/patches/build.patch	2009-07-14 00:34:35 UTC (rev 9265)
+++ trunk/jmock/debian/patches/build.patch	2009-07-14 00:53:29 UTC (rev 9266)
@@ -35,3 +35,25 @@
              </batchtest>
          </junit>
      </target>
+@@ -107,7 +118,8 @@
+         </junit>
+     </target>
+ 
+-    <target name="core.jar" depends="core.test.unit">
++    <!-- skip the unit tests -->
++    <target name="core.jar" depends="core.compile">
+         <mkdir dir="${build.dist.bin.dir}"/>
+         <jar basedir="${core.build.dir}" destfile="${core.jar}" excludes="test/**" index="true"/>
+     </target>
+@@ -167,8 +179,9 @@
+             </batchtest>
+         </junit>
+     </target>
+-
+-    <target name="cglib.jar" depends="cglib.test.unit">
++
++    <!-- skip the unit tests -->
++    <target name="cglib.jar" depends="cglib.compile">
+         <mkdir dir="${build.dist.bin.dir}"/>
+         <jar basedir="${cglib.build.dir}" destfile="${cglib.jar}" excludes="test/**" index="true"/>
+     </target>

Modified: trunk/jmock/debian/rules
===================================================================
--- trunk/jmock/debian/rules	2009-07-14 00:34:35 UTC (rev 9265)
+++ trunk/jmock/debian/rules	2009-07-14 00:53:29 UTC (rev 9266)
@@ -11,7 +11,7 @@
 JAVACMD         := $(JAVA_HOME)/bin/java
 ANT_PROPS       := debian/ant.properties
 ANT_HOME        := /usr/share/ant
-ANT_CLASSPATH   := $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:/usr/share/java/junit.jar:/usr/share/java/asm2.jar:$(JAVA_HOME)/lib/tools.jar
+ANT_CLASSPATH   := $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:/usr/share/java/junit.jar:$(JAVA_HOME)/lib/tools.jar
 VERBOSE			:= #-verbose
 
 ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) org.apache.tools.ant.Main $(VERBOSE) -propertyfile $(ANT_PROPS)

Modified: trunk/jmock/debian/watch
===================================================================
--- trunk/jmock/debian/watch	2009-07-14 00:34:35 UTC (rev 9265)
+++ trunk/jmock/debian/watch	2009-07-14 00:53:29 UTC (rev 9266)
@@ -1,3 +1,2 @@
 version=3
 http://dist.codehaus.org/jmock/distributions/jmock-([\d.]+)-src\.jar debian debian/orig-tar.sh
-