[pkg-java] r15830 - in trunk/junit4/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Mar 7 22:34:53 UTC 2012
Author: drazzib
Date: 2012-03-07 22:34:52 +0000 (Wed, 07 Mar 2012)
New Revision: 15830
Added:
trunk/junit4/debian/ant.properties
trunk/junit4/debian/patches/
trunk/junit4/debian/patches/manifest_jar.diff
trunk/junit4/debian/patches/series
trunk/junit4/debian/patches/workaround_typing_bug.diff
Removed:
trunk/junit4/debian/build.properties
trunk/junit4/debian/build.xml
trunk/junit4/debian/junit4-doc.install
Modified:
trunk/junit4/debian/changelog
trunk/junit4/debian/control
trunk/junit4/debian/copyright
trunk/junit4/debian/junit4.poms
trunk/junit4/debian/rules
trunk/junit4/debian/watch
Log:
* New upstream release (Closes: #650662).
* Fix FTBFS with workaround_typing_bug.diff (Closes: #662807).
* d/control: Bump to 3.9.3.1 Standards-Version: no changes needed.
* d/control: Remove Michael Koch from Uploaders list (Closes: #654042).
* d/watch: Get new github tags, thanks to David Paleino
(Closes: #653597).
* d/control: Wrap-and-sort.
* d/control: Don't use maven-ant-helper anymore for build.
Copied: trunk/junit4/debian/ant.properties (from rev 15806, trunk/junit4/debian/build.properties)
===================================================================
--- trunk/junit4/debian/ant.properties (rev 0)
+++ trunk/junit4/debian/ant.properties 2012-03-07 22:34:52 UTC (rev 15830)
@@ -0,0 +1,2 @@
+hamcrestlib=/usr/share/java/hamcrest-core.jar
+manifest=debian/MANIFEST.MF
Deleted: trunk/junit4/debian/build.properties
===================================================================
--- trunk/junit4/debian/build.properties 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/build.properties 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1,4 +0,0 @@
-artifactId=junit
-dependency=hamcrest
-build.javaVersion=1.5
-manifest=debian/MANIFEST.MF
Deleted: trunk/junit4/debian/build.xml
===================================================================
--- trunk/junit4/debian/build.xml 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/build.xml 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1,25 +0,0 @@
-<project name="junit" default="javadoc" basedir="..">
-
- <property name="src" value="src/main/java" />
- <property name="javadocdir" location="build/docs/api" />
-
- <target name="javadoc">
- <javadoc destdir="${javadocdir}"
- author="false"
- version="false"
- use="false"
- windowtitle="JUnit API"
- stylesheetfile="stylesheet.css"
- >
- <excludepackage name="junit.*" />
- <excludepackage name="org.junit.internal.*" />
- <excludepackage name="org.junit.experimental.theories.internal.*" />
-
- <sourcepath location="${src}" />
- <classpath location="/usr/share/java/hamcrest-core.jar" />
- <link href="file:///usr/share/doc/libhamcrest-java/api" />
- <link href="file:///usr/share/doc/default-jdk/api" />
- </javadoc>
- </target>
-
-</project>
Modified: trunk/junit4/debian/changelog
===================================================================
--- trunk/junit4/debian/changelog 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/changelog 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1,3 +1,16 @@
+junit4 (4.10-1) unstable; urgency=low
+
+ * New upstream release (Closes: #650662).
+ * Fix FTBFS with workaround_typing_bug.diff (Closes: #662807).
+ * d/control: Bump to 3.9.3.1 Standards-Version: no changes needed.
+ * d/control: Remove Michael Koch from Uploaders list (Closes: #654042).
+ * d/watch: Get new github tags, thanks to David Paleino
+ (Closes: #653597).
+ * d/control: Wrap-and-sort.
+ * d/control: Don't use maven-ant-helper anymore for build.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 07 Mar 2012 22:56:14 +0100
+
junit4 (4.8.2-2) unstable; urgency=low
* Team upload.
Modified: trunk/junit4/debian/control
===================================================================
--- trunk/junit4/debian/control 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/control 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1,20 +1,26 @@
Source: junit4
Section: java
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Florian Weimer <fw at deneb.enyo.de>, Michael Koch <konqueror at gmx.de>,
- Varun Hiremath <varun at debian.org>, Damien Raude-Morvan <drazzib at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
+Uploaders: Florian Weimer <fw at deneb.enyo.de>,
+ Varun Hiremath <varun at debian.org>,
+ Damien Raude-Morvan <drazzib at debian.org>,
+ Ludovic Claude <ludovic.claude at laposte.net>
Priority: optional
-Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
-Build-Depends-Indep: libhamcrest-java (>> 1.1-6), maven-repo-helper, maven-ant-helper,
- libhamcrest-java-doc, default-jdk-doc, ant-optional, junit
-Standards-Version: 3.8.4
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk
+Build-Depends-Indep: default-jdk-doc,
+ libhamcrest-java (>> 1.1-6),
+ libhamcrest-java-doc,
+ maven-repo-helper
+Standards-Version: 3.9.3.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit4/
Homepage: http://www.junit.org/
Package: junit4
Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, libhamcrest-java
+Depends: default-jre-headless | java5-runtime-headless,
+ libhamcrest-java,
+ ${misc:Depends}
Description: JUnit regression test framework for Java
JUnit is a simple framework to write repeatable tests. It is an
instance of the xUnit architecture for unit testing frameworks.
@@ -27,7 +33,7 @@
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Recommends: libhamcrest-java-doc, default-jdk-doc
+Recommends: default-jdk-doc, libhamcrest-java-doc
Suggests: junit4
Description: JUnit regression test framework for Java - documentation
JUnit is a simple framework to write repeatable tests. It is an
Modified: trunk/junit4/debian/copyright
===================================================================
--- trunk/junit4/debian/copyright 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/copyright 2012-03-07 22:34:52 UTC (rev 15830)
@@ -228,4 +228,3 @@
Agreement will bring a legal action under this Agreement more than one year
after the cause of action arose. Each party waives its rights to a jury trial
in any resulting litigation.
-
Deleted: trunk/junit4/debian/junit4-doc.install
===================================================================
--- trunk/junit4/debian/junit4-doc.install 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/junit4-doc.install 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1 +0,0 @@
-build/docs/api /usr/share/doc/junit4/
Modified: trunk/junit4/debian/junit4.poms
===================================================================
--- trunk/junit4/debian/junit4.poms 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/junit4.poms 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1 +1 @@
-pom.xml --no-parent
+debian/pom.xml --no-parent
Added: trunk/junit4/debian/patches/manifest_jar.diff
===================================================================
--- trunk/junit4/debian/patches/manifest_jar.diff (rev 0)
+++ trunk/junit4/debian/patches/manifest_jar.diff 2012-03-07 22:34:52 UTC (rev 15830)
@@ -0,0 +1,22 @@
+Description: Update manifest (set in debian/ant.properties) to allow
+ override for OSGI metadata.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: no
+Last-Update: 2012-03-07
+
+--- a/build.xml
++++ b/build.xml
+@@ -92,11 +92,13 @@
+ jarfile="${dist}/${binjar}"
+ basedir="${bin}"
+ excludes="${unjarred}, **/*.java, build.xml"
++ manifest="${manifest}"
+ />
+ <jar
+ jarfile="${dist}/${depjar}"
+ basedir="${bin}"
+ excludes="${unjarred}, org/hamcrest/**, **/*.java, build.xml"
++ manifest="${manifest}"
+ />
+ </target>
+
Added: trunk/junit4/debian/patches/series
===================================================================
--- trunk/junit4/debian/patches/series (rev 0)
+++ trunk/junit4/debian/patches/series 2012-03-07 22:34:52 UTC (rev 15830)
@@ -0,0 +1,2 @@
+workaround_typing_bug.diff
+manifest_jar.diff
Added: trunk/junit4/debian/patches/workaround_typing_bug.diff
===================================================================
--- trunk/junit4/debian/patches/workaround_typing_bug.diff (rev 0)
+++ trunk/junit4/debian/patches/workaround_typing_bug.diff 2012-03-07 22:34:52 UTC (rev 15830)
@@ -0,0 +1,114 @@
+Description: Fix "invalid inferred types for T; actual arguments do not
+ conforms to inferred formal arguments" when building junit4 with openjdk
+ under recent hotspot.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/662807
+Last-Update: 2012-03-07
+
+--- a/src/main/java/org/junit/internal/matchers/CombinableMatcher.java
++++ b/src/main/java/org/junit/internal/matchers/CombinableMatcher.java
+@@ -24,11 +24,11 @@
+
+ @SuppressWarnings("unchecked")
+ public CombinableMatcher<T> and(Matcher<? extends T> matcher) {
+- return new CombinableMatcher<T>(allOf(matcher, fMatcher));
++ return new CombinableMatcher<T>(allOf((Matcher)matcher, fMatcher));
+ }
+
+ @SuppressWarnings("unchecked")
+ public CombinableMatcher<T> or(Matcher<? extends T> matcher) {
+- return new CombinableMatcher<T>(anyOf(matcher, fMatcher));
++ return new CombinableMatcher<T>(anyOf((Matcher)matcher, fMatcher));
+ }
+-}
+\ No newline at end of file
++}
+--- a/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java
++++ b/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java
+@@ -41,7 +41,7 @@
+
+ @Factory
+ public static <T> Matcher<Iterable<T>> hasItem(T element) {
+- return hasItem(equalTo(element));
++ return hasItem((Matcher)equalTo(element));
+ }
+
+ @Factory
+@@ -51,7 +51,7 @@
+ for (Matcher<? extends T> elementMatcher : elementMatchers) {
+ all.add(hasItem(elementMatcher));
+ }
+- return allOf(all);
++ return allOf((Collection)all);
+ }
+
+ @Factory
+@@ -61,7 +61,7 @@
+ for (T element : elements) {
+ all.add(hasItem(element));
+ }
+- return allOf(all);
++ return allOf((Collection)all);
+ }
+
+ }
+--- a/src/test/java/org/junit/tests/assertion/AssertionTest.java
++++ b/src/test/java/org/junit/tests/assertion/AssertionTest.java
+@@ -12,6 +12,7 @@
+
+ import java.math.BigDecimal;
+
++import org.hamcrest.Matcher;
+ import org.junit.Assert;
+ import org.junit.ComparisonFailure;
+ import org.junit.Test;
+@@ -446,7 +447,7 @@
+ String expectedMessage = "identifier\nExpected: is an instance of java.lang.Integer\n got: \"actual\"\n";
+
+ try {
+- assertThat("identifier", "actual", is(Integer.class));
++ assertThat("identifier", "actual", (Matcher) is(Integer.class));
+ } catch (AssertionError e) {
+ assertEquals(expectedMessage, e.getMessage());
+ }
+--- a/src/test/java/org/junit/tests/assertion/BothTest.java
++++ b/src/test/java/org/junit/tests/assertion/BothTest.java
+@@ -17,17 +17,17 @@
+ @RunWith(Theories.class)
+ public class BothTest {
+ @DataPoint
+- public static Matcher<Integer> IS_3= is(3);
++ public static Matcher<Integer> IS_3= (Matcher) is(3);
+
+ @DataPoint
+- public static Matcher<Integer> IS_4= is(4);
++ public static Matcher<Integer> IS_4= (Matcher) is(4);
+
+ @DataPoint
+ public static int THREE= 3;
+
+ @Test
+ public void bothPasses() {
+- assertThat(3, both(is(Integer.class)).and(is(3)));
++ assertThat(3, both(is(Integer.class)).and((Matcher)is(3)));
+ }
+
+ @Theory
+@@ -46,7 +46,7 @@
+
+ @Test
+ public void eitherPasses() {
+- assertThat(3, either(is(3)).or(is(4)));
++ assertThat(3, either(is(3)).or((Matcher)is(4)));
+ }
+
+ @Theory
+@@ -66,6 +66,6 @@
+ }
+
+ @Test public void subclassesAreOkInSecondPositionOnly() {
+- assertThat(3, both(is(Integer.class)).and(is(3)));
++ assertThat(3, both(is(Integer.class)).and((Matcher)is(3)));
+ }
+ }
Modified: trunk/junit4/debian/rules
===================================================================
--- trunk/junit4/debian/rules 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/rules 2012-03-07 22:34:52 UTC (rev 15830)
@@ -6,24 +6,20 @@
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_BUILD_TARGET := package
-DEB_JARS := ant-nodeps hamcrest-core ant-junit junit
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) \
- -Dversion=$(VERSION) -DbuildVersion=$(BUILD_VERSION) -Dbin.package=$(PACKAGE)
-API_DOCS := build/docs/api
+DEB_ANT_BUILD_TARGET := dist
+DEB_JARS := ant-nodeps hamcrest-core
-common-build-arch common-build-indep:: build-javadoc
-build-javadoc: DEB_ANT_BUILDFILE := debian/build.xml
-build-javadoc:
- $(DEB_ANT_INVOKE) javadoc
-
binary-post-install/junit4::
+ sed "s/@artifactId@/junit/;s/@version@/$(VERSION)/" build/maven/pom-template.xml > debian/pom.xml
mh_installpoms -pjunit4
- mh_installjar -pjunit4 -njunit4 -l pom.xml build/junit-$(VERSION).jar
+ mh_installjar -pjunit4 -njunit4 -l debian/pom.xml junit$(VERSION)/junit-dep-$(VERSION).jar
+binary-post-install/junit4-doc::
+ dh_install -pjunit4-doc junit$(VERSION)/javadoc/* /usr/share/doc/junit4/api/
+
clean::
- -rm -rf debian/tmp
+ -rm debian/pom.xml
+ mh_clean
upstream-from-git:
git-archive --format=tar --prefix=junit4-$(DEB_UPSTREAM_VERSION)/ \
Modified: trunk/junit4/debian/watch
===================================================================
--- trunk/junit4/debian/watch 2012-03-04 20:25:33 UTC (rev 15829)
+++ trunk/junit4/debian/watch 2012-03-07 22:34:52 UTC (rev 15830)
@@ -1,3 +1,3 @@
version=3
-http://github.com/KentBeck/junit/downloads/ /KentBeck/junit/tarball/r([\d\.]*) debian debian/orig-tar.sh
+http://github.com/KentBeck/junit/tags/ /KentBeck/junit/tarball/r([\d\.]*) debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list