Author: ebourg-guest
Date: 2013-03-27 15:28:01 +0000 (Wed, 27 Mar 2013)
New Revision: 16445
Added:
trunk/ant/debian/patches/0008-junit4-replace-assumeFalse.patch
Modified:
trunk/ant/debian/ant-doc.docs
trunk/ant/debian/changelog
trunk/ant/debian/patches/series
trunk/ant/debian/rules
Log:
Adapted the build to the new documentation path in the upstream source
Modified: trunk/ant/debian/ant-doc.docs
===================================================================
--- trunk/ant/debian/ant-doc.docs 2013-03-27 13:17:34 UTC (rev 16444)
+++ trunk/ant/debian/ant-doc.docs 2013-03-27 15:28:01 UTC (rev 16445)
@@ -1,7 +1,4 @@
-docs/manual
-docs/images
-docs/*.html
-docs/*.css
+manual
NOTICE
README
WHATSNEW
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2013-03-27 13:17:34 UTC (rev 16444)
+++ trunk/ant/debian/changelog 2013-03-27 15:28:01 UTC (rev 16445)
@@ -1,17 +1,20 @@
ant (1.9.0-1) UNRELEASED; urgency=low
+ * Team upload.
+
[ Ludovic Claude ]
* Add version constraint on libxml-commons-resolver1.1-java to
secure backport of Ant on Squeeze.
[ Tony Mancill ]
- * Team upload.
* Remove Michael Koch Uploaders (Closes: #653982)
[ Emmanuel Bourg ]
* New upstream release.
- Refreshed the patches
- Upgrade source and target version to 1.5
+ - Adapted the build to the new documentation path in the upstream source
+ - Added a patch to build the package with junit4 4.10
* Removed the dependency on java2-runtime-headless
* Added the dependency on java7-runtime-headless
Added: trunk/ant/debian/patches/0008-junit4-replace-assumeFalse.patch
===================================================================
--- trunk/ant/debian/patches/0008-junit4-replace-assumeFalse.patch
(rev 0)
+++ trunk/ant/debian/patches/0008-junit4-replace-assumeFalse.patch
2013-03-27 15:28:01 UTC (rev 16445)
@@ -0,0 +1,20 @@
+--- a/src/tests/junit/org/example/junit/JUnit4Skippable.java
++++ b/src/tests/junit/org/example/junit/JUnit4Skippable.java
+@@ -40,7 +40,7 @@
+
+ @Test
+ public void implicitlyIgnoreTest() {
+- Assume.assumeFalse("This test will be ignored", true);
++ Assume.assumeTrue(false); // This test will be ignored
+ fail("I told you, this test should have been ignored!");
+ }
+
+@@ -52,7 +52,7 @@
+
+ @Test
+ public void implicitlyIgnoreTestNoMessage() {
+- Assume.assumeFalse(true);
++ Assume.assumeTrue(false);
+ fail("I told you, this test should have been ignored!");
+ }
+
Modified: trunk/ant/debian/patches/series
===================================================================
--- trunk/ant/debian/patches/series 2013-03-27 13:17:34 UTC (rev 16444)
+++ trunk/ant/debian/patches/series 2013-03-27 15:28:01 UTC (rev 16445)
@@ -4,3 +4,4 @@
0005-add-gjdoc-task.patch
0006-fix-ANT_HOME-path.patch
0007-use-build.classpath.patch
+0008-junit4-replace-assumeFalse.patch
Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules 2013-03-27 13:17:34 UTC (rev 16444)
+++ trunk/ant/debian/rules 2013-03-27 15:28:01 UTC (rev 16445)
@@ -51,7 +51,7 @@
touch $@
install/ant-doc:: build-ant-doc
- -rm -f docs/manual/LICENSE
+ -rm -f manual/LICENSE
install/ant:: build-ant
dh_install -pant
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
