This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jmock.
commit ab8de43444ae0c1c5c9ab99aa8493520d6a5346c Author: Trygve Laugstøl <[email protected]> Date: Tue Sep 20 15:57:59 2005 +0000 o Correcting Depends. --- .cvsignore | 3 +- debian/.cvsignore | 5 ++- debian/ant.properties | 0 debian/control | 4 +- debian/patches/00list | 2 + .../{01build_files.patch => 01_build_files.dpatch} | 12 +++++- debian/patches/02_bad_test_case.dpatch | 46 ++++++++++++++++++++++ debian/patches/02_bad_test_case.patch | 37 ----------------- debian/rules | 3 +- 9 files changed, 66 insertions(+), 46 deletions(-) diff --git a/.cvsignore b/.cvsignore index 28410b2..4b3641a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1,8 @@ +*-stamp CHANGELOG LICENSE.txt VERSION +build build.properties build.xml core @@ -8,4 +10,3 @@ examples extensions lib overview.html -build diff --git a/debian/.cvsignore b/debian/.cvsignore index 29206fe..ddbb098 100644 --- a/debian/.cvsignore +++ b/debian/.cvsignore @@ -1,3 +1,4 @@ -stamp* -libjmock-java* files +libjmock-java* +patched +stamp* diff --git a/debian/ant.properties b/debian/ant.properties new file mode 100644 index 0000000..e69de29 diff --git a/debian/control b/debian/control index 45f3294..f6df417 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,12 @@ Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Trygve Laugstøl <[email protected]> -Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, jamvm (>= 1.3.3), ant (>= 1.6.5), junit (>= 3.8.1) +Build-Depends-Indep: ant (>= 1.6.5), classpath (>= 2:0.17), debhelper (>> 4.0.0), dpatch (>= 2.0.15), gjdoc (>= 0.7.5), junit (>= 3.8.1), kaffe (>= 2:1.1.5), libgcj6 (>= 4.0.1) Standards-Version: 3.6.2 Package: libjmock-java Architecture: all -Depends: jamvm | kaffe | java2-runtime +Depends: kaffe (>= 2:1.1.5) | java2-runtime Suggests: libjmock-java-doc Description: Java library for testing code with mock objects Mock objects help you design and test the interactions between the objects in diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..585ceed --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,2 @@ +01_build_files +02_bad_test_case diff --git a/debian/patches/01build_files.patch b/debian/patches/01_build_files.dpatch old mode 100644 new mode 100755 similarity index 77% rename from debian/patches/01build_files.patch rename to debian/patches/01_build_files.dpatch index d9e253a..fc7001c --- a/debian/patches/01build_files.patch +++ b/debian/patches/01_build_files.dpatch @@ -1,5 +1,13 @@ ---- ../jmock-1.0.1/build.xml 2005-08-15 02:39:24.452419528 +0200 -+++ build.xml 2005-08-15 03:06:01.868015080 +0200 +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_build_files.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./build.xml /tmp/dpep-work.WZPNHj/jmock/build.xml +--- ./build.xml 2005-09-18 16:08:38.000000000 +0200 ++++ /tmp/dpep-work.WZPNHj/jmock/build.xml 2005-09-18 16:31:15.390478208 +0200 @@ -1,4 +1,17 @@ <project default="jars"> + diff --git a/debian/patches/02_bad_test_case.dpatch b/debian/patches/02_bad_test_case.dpatch new file mode 100755 index 0000000..37972ba --- /dev/null +++ b/debian/patches/02_bad_test_case.dpatch @@ -0,0 +1,46 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_bad_test_case.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./core/src/test/jmock/builder/InvocationMockerBuilderTest.java /tmp/dpep-work.Oc8f9Z/jmock/core/src/test/jmock/builder/InvocationMockerBuilderTest.java +--- ./core/src/test/jmock/builder/InvocationMockerBuilderTest.java 2005-09-18 16:08:38.000000000 +0200 ++++ /tmp/dpep-work.Oc8f9Z/jmock/core/src/test/jmock/builder/InvocationMockerBuilderTest.java 2005-09-18 16:32:46.021700168 +0200 +@@ -62,7 +62,7 @@ + } + fail("should have thrown IllegalArgumentException"); + } +- ++/* + public void testMethodNameNotInMockedTypeCausesTestFailure() { + String methodNameNotInMockedInterface = "methodNameNotInMockedInterface"; + +@@ -78,7 +78,7 @@ + } + fail("should have thrown AssertionFailedError"); + } +- ++*/ + public void testSpecifyingMethodWithConstraintAddsMethodNameMatcherButDoesNotAddSelfToIdentityTable() { + Constraint nameConstraint = (Constraint)newDummy(Constraint.class, "nameConstraint"); + +diff -urNad --exclude=CVS --exclude=.svn ./core/src/test/jmock/core/stub/ThrowStubTest.java /tmp/dpep-work.Oc8f9Z/jmock/core/src/test/jmock/core/stub/ThrowStubTest.java +--- ./core/src/test/jmock/core/stub/ThrowStubTest.java 2005-09-18 16:08:39.000000000 +0200 ++++ /tmp/dpep-work.Oc8f9Z/jmock/core/src/test/jmock/core/stub/ThrowStubTest.java 2005-09-18 16:32:46.020700320 +0200 +@@ -131,7 +131,7 @@ + } + fail("should have thrown an Error"); + } +- ++/* + public void testSetsStackTraceWhenExceptionIsThrown() { + try { + throwStub.invoke(invocation); +@@ -143,4 +143,5 @@ + throwStub.getClass().getName(), stackTrace[0].getClassName()); + } + } ++*/ + } diff --git a/debian/patches/02_bad_test_case.patch b/debian/patches/02_bad_test_case.patch deleted file mode 100644 index 68d3c75..0000000 --- a/debian/patches/02_bad_test_case.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ../jmock-1.0.1/core/src/test/jmock/core/stub/ThrowStubTest.java 2005-08-15 02:39:24.527408128 +0200 -+++ core/src/test/jmock/core/stub/ThrowStubTest.java 2005-08-15 03:41:39.880841112 +0200 -@@ -131,7 +131,7 @@ - } - fail("should have thrown an Error"); - } -- -+/* - public void testSetsStackTraceWhenExceptionIsThrown() { - try { - throwStub.invoke(invocation); -@@ -143,4 +143,5 @@ - throwStub.getClass().getName(), stackTrace[0].getClassName()); - } - } -+*/ - } ---- ../jmock-1.0.1/core/src/test/jmock/builder/InvocationMockerBuilderTest.java 2005-08-15 02:39:24.506411320 +0200 -+++ core/src/test/jmock/builder/InvocationMockerBuilderTest.java 2005-08-15 02:24:35.511559080 +0200 -@@ -62,7 +62,7 @@ - } - fail("should have thrown IllegalArgumentException"); - } -- -+/* - public void testMethodNameNotInMockedTypeCausesTestFailure() { - String methodNameNotInMockedInterface = "methodNameNotInMockedInterface"; - -@@ -78,7 +78,7 @@ - } - fail("should have thrown AssertionFailedError"); - } -- -+*/ - public void testSpecifyingMethodWithConstraintAddsMethodNameMatcherButDoesNotAddSelfToIdentityTable() { - Constraint nameConstraint = (Constraint)newDummy(Constraint.class, "nameConstraint"); - diff --git a/debian/rules b/debian/rules index a55d642..5141c07 100755 --- a/debian/rules +++ b/debian/rules @@ -24,8 +24,7 @@ clean: unpatch dh_testdir dh_testroot rm -f build-stamp configure-stamp - $(ANT) debian-clean - rm -rf output + rm -rf build dh_clean install: build -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jmock.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
