[pkg-java] r19192 - in trunk/libhamcrest-java/debian: . patches
Markus Koschany
apo at moszumanska.debian.org
Sat Jan 7 01:46:13 UTC 2017
Author: apo
Date: 2017-01-07 01:46:13 +0000 (Sat, 07 Jan 2017)
New Revision: 19192
Added:
trunk/libhamcrest-java/debian/patches/002-random-build-failure.patch
Removed:
trunk/libhamcrest-java/debian/patches/002-fix-random-compilation-failure.patch
Modified:
trunk/libhamcrest-java/debian/changelog
trunk/libhamcrest-java/debian/control
trunk/libhamcrest-java/debian/copyright
trunk/libhamcrest-java/debian/patches/series
trunk/libhamcrest-java/debian/rules
Log:
Release 1.3-6
Modified: trunk/libhamcrest-java/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog 2017-01-06 15:57:12 UTC (rev 19191)
+++ trunk/libhamcrest-java/debian/changelog 2017-01-07 01:46:13 UTC (rev 19192)
@@ -1,4 +1,4 @@
-libhamcrest-java (1.3-6) UNRELEASED; urgency=medium
+libhamcrest-java (1.3-6) unstable; urgency=medium
* Team upload.
* wrap-and-sort -sa.
@@ -8,8 +8,12 @@
* Vcs-Browser: Use https.
* Switch to compat level 10.
* Fix debian/watch file and use the new github.com address from now on.
+ * Drop 002-fix-random-compilation-failure.patch.
+ * Add 002-random-build-failure.patch and ensure that the build uses the
+ preexisting jars in /usr/share/java. Add libhamcrest-java to Build-Depends.
+ (Closes: #846116)
- -- Markus Koschany <apo at debian.org> Thu, 29 Dec 2016 00:32:40 +0100
+ -- Markus Koschany <apo at debian.org> Sat, 07 Jan 2017 00:33:15 +0100
libhamcrest-java (1.3-5) unstable; urgency=medium
Modified: trunk/libhamcrest-java/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control 2017-01-06 15:57:12 UTC (rev 19191)
+++ trunk/libhamcrest-java/debian/control 2017-01-07 01:46:13 UTC (rev 19192)
@@ -12,6 +12,7 @@
ant-optional,
debhelper (>= 10),
default-jdk,
+ libhamcrest-java,
maven-repo-helper,
default-jdk-doc,
junit,
Modified: trunk/libhamcrest-java/debian/copyright
===================================================================
--- trunk/libhamcrest-java/debian/copyright 2017-01-06 15:57:12 UTC (rev 19191)
+++ trunk/libhamcrest-java/debian/copyright 2017-01-07 01:46:13 UTC (rev 19192)
@@ -3,7 +3,7 @@
Files: *
Copyright: 2000-2006, www.hamcrest.org
-License: BSD
+License: BSD-3-clause
Copyright (c) The Regents of the University of California.
All rights reserved.
.
Deleted: trunk/libhamcrest-java/debian/patches/002-fix-random-compilation-failure.patch
===================================================================
--- trunk/libhamcrest-java/debian/patches/002-fix-random-compilation-failure.patch 2017-01-06 15:57:12 UTC (rev 19191)
+++ trunk/libhamcrest-java/debian/patches/002-fix-random-compilation-failure.patch 2017-01-07 01:46:13 UTC (rev 19192)
@@ -1,15 +0,0 @@
-Description: Fixes a random compilation failure
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: yes
-Bug-Debian: https://bugs.debian.org/738789
---- a/build.xml
-+++ b/build.xml
-@@ -36,7 +36,7 @@
- fork="yes"
- failonerror="yes"
- classpath="
-- build/hamcrest-core-${version}.jar;
-+ build/temp/hamcrest-core-${version}.jar.contents;
- build/hamcrest-generator-${version}.jar;
- ">
- <arg value="core-matchers.xml"/>
Added: trunk/libhamcrest-java/debian/patches/002-random-build-failure.patch
===================================================================
--- trunk/libhamcrest-java/debian/patches/002-random-build-failure.patch (rev 0)
+++ trunk/libhamcrest-java/debian/patches/002-random-build-failure.patch 2017-01-07 01:46:13 UTC (rev 19192)
@@ -0,0 +1,115 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 7 Jan 2017 00:18:56 +0100
+Subject: 002 random build failure
+
+---
+ build.xml | 17 ++++++------
+ .../generator/ReflectiveFactoryReaderTest.java | 32 +---------------------
+ 2 files changed, 10 insertions(+), 39 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 4f9dc35..ce0c88b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -56,7 +56,7 @@
+ <mkdir dir="build/temp/hamcrest-library/generated-code"/>
+ <java-to-jar srcdir="hamcrest-library/src/main/java"
+ modulename="hamcrest-library"
+- classpath="build/hamcrest-core-${version}.jar"/>
++ classpath="/usr/share/java/hamcrest-core.jar"/>
+ <!-- Generate one class with all static imports -->
+ <java classname="org.hamcrest.generator.config.XmlConfigurator"
+ fork="yes"
+@@ -74,22 +74,22 @@
+ <!-- Append to library jar -->
+ <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
+ modulename="hamcrest-library"
+- classpath="build/hamcrest-core-${version}.jar"/>
++ classpath="/usr/share/java/hamcrest-core.jar"/>
+ </target>
+
+ <target name="integration" depends="core, library" description="Build integration with external tools">
+ <java-to-jar srcdir="hamcrest-integration/src/main/java"
+ modulename="hamcrest-integration"
+- classpath="build/hamcrest-core-${version}.jar;
+- build/hamcrest-library-${version}.jar"/>
++ classpath="/usr/share/java/hamcrest-core.jar;
++ /usr/share/java/hamcrest-library.jar"/>
+ </target>
+
+ <target name="unit-test" depends="core, library, integration, generator" description="Build and run unit tests.">
+ <java-to-jar srcdir="hamcrest-unit-test/src/main/java" modulename="hamcrest-unit-test"
+- classpath="build/hamcrest-core-${version}.jar;
+- build/hamcrest-library-${version}.jar;
+- build/hamcrest-integration-${version}.jar;
+- build/hamcrest-generator-${version}.jar"/>
++ classpath="/usr/share/java/hamcrest-core.jar;
++ build/hamcrest-library-${version}.jar;
++ build/hamcrest-integration-${version}.jar;
++ build/hamcrest-generator-${version}.jar"/>
+ <junit printsummary="no" fork="no" haltonfailure="${haltonfailure}">
+ <formatter type="brief" usefile="no"/>
+ <classpath>
+@@ -295,6 +295,7 @@
+ <include name="junit4.jar"/>
+ <include name="easymock.jar"/>
+ <include name="jmock.jar"/>
++ <include name="hamcrest-core.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java
+index 5bf6038..d8d195e 100644
+--- a/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java
++++ b/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java
+@@ -30,23 +30,6 @@ public class ReflectiveFactoryReaderTest extends TestCase {
+
+ }
+
+- public void testIteratesOverFactoryMethods() {
+- Iterable<FactoryMethod> reader = new ReflectiveFactoryReader(SimpleSetOfMatchers.class);
+- Iterator<FactoryMethod> methods = reader.iterator();
+-
+- assertTrue("Expected first method", methods.hasNext());
+- FactoryMethod firstMethod = methods.next();
+- assertEquals("firstMethod", firstMethod.getName());
+- assertEquals(SimpleSetOfMatchers.class.getName().replace('$', '.'), firstMethod.getMatcherClass());
+-
+- assertTrue("Expected second method", methods.hasNext());
+- FactoryMethod secondMethod = methods.next();
+- assertEquals("secondMethod", secondMethod.getName());
+- assertEquals(SimpleSetOfMatchers.class.getName().replace('$', '.'), secondMethod.getMatcherClass());
+-
+- assertFalse("Expected no more methods", methods.hasNext());
+- }
+-
+ public static class MatchersWithDodgySignatures {
+
+ @Factory
+@@ -79,19 +62,6 @@ public class ReflectiveFactoryReaderTest extends TestCase {
+
+ }
+
+- public void testOnlyReadsPublicStaticAnnotatedMethodsThatReturnNonVoid() {
+- Iterable<FactoryMethod> reader = new ReflectiveFactoryReader(MatchersWithDodgySignatures.class);
+- Iterator<FactoryMethod> methods = reader.iterator();
+-
+- assertTrue("Expected first method", methods.hasNext());
+- assertEquals("goodMethod", methods.next().getName());
+-
+- assertTrue("Expected second method", methods.hasNext());
+- assertEquals("anotherGoodMethod", methods.next().getName());
+-
+- assertFalse("Expected no more methods", methods.hasNext());
+- }
+-
+ public static class GenerifiedMatchers {
+
+ @Factory
+@@ -266,4 +236,4 @@ public class ReflectiveFactoryReaderTest extends TestCase {
+ return null;
+ }
+
+-}
+\ No newline at end of file
++}
Modified: trunk/libhamcrest-java/debian/patches/series
===================================================================
--- trunk/libhamcrest-java/debian/patches/series 2017-01-06 15:57:12 UTC (rev 19191)
+++ trunk/libhamcrest-java/debian/patches/series 2017-01-07 01:46:13 UTC (rev 19192)
@@ -1,2 +1,2 @@
001-build.patch
-002-fix-random-compilation-failure.patch
+002-random-build-failure.patch
Modified: trunk/libhamcrest-java/debian/rules
===================================================================
--- trunk/libhamcrest-java/debian/rules 2017-01-06 15:57:12 UTC (rev 19191)
+++ trunk/libhamcrest-java/debian/rules 2017-01-07 01:46:13 UTC (rev 19192)
@@ -44,8 +44,9 @@
ant clean
override_dh_clean:
+ dh_clean
rm -fr debian/.mh/
- $(RM) *.jar
+ find . -name "*.jar" -delete
mkdir -p lib/integration
get-orig-source:
More information about the pkg-java-commits
mailing list