[jmock] 12/48: * 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.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jmock.

commit 45d27d4ee6d36d07c312a2646258568ac5c1015b
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Tue Jul 14 00:53:29 2009 +0000

    * 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.
---
 debian/changelog           |  5 +++++
 debian/patches/build.patch | 22 ++++++++++++++++++++++
 debian/rules               |  2 +-
 debian/watch               |  1 -
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9001bef..ed0390d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ jmock (1.0.1-3) experimental; urgency=low
   * 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
 
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 096d256..155d564 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -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>
diff --git a/debian/rules b/debian/rules
index 4e7034d..cb11c93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ JAVA_HOME  		:= /usr/lib/jvm/default-java
 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)
diff --git a/debian/watch b/debian/watch
index 3261da1..2181e2e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
 http://dist.codehaus.org/jmock/distributions/jmock-([\d.]+)-src\.jar debian debian/orig-tar.sh
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jmock.git