[pkg-java] r17877 - in trunk/libfreemarker-java/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-12 22:23:42 +0000 (Wed, 12 Mar 2014)
New Revision: 17877

Added:
   trunk/libfreemarker-java/debian/patches/fix-tests-classpath.patch
Modified:
   trunk/libfreemarker-java/debian/changelog
   trunk/libfreemarker-java/debian/control
   trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
   trunk/libfreemarker-java/debian/patches/series
Log:
Declare the missing transitive dependencies required to run the tests



Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog	2014-03-12 22:20:13 UTC (rev 17876)
+++ trunk/libfreemarker-java/debian/changelog	2014-03-12 22:23:42 UTC (rev 17877)
@@ -7,6 +7,7 @@
     - Added a patch changing the ivy settings to use the Debian jars
     - Added a patch to ignore the code related to avalon-logger
     - Added a patch disabling the code coverage report
+    - Added a patch declaring the missing transitive test dependencies
   * Fixed an unmappable character in LocalizedString.java preventing
     the generation of the Javadoc.
   * Switch to debhelper level 9

Modified: trunk/libfreemarker-java/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control	2014-03-12 22:20:13 UTC (rev 17876)
+++ trunk/libfreemarker-java/debian/control	2014-03-12 22:23:42 UTC (rev 17877)
@@ -15,6 +15,7 @@
                default-jdk-doc,
                ivy,
                javacc,
+               jruby,
                junit,
                jython,
                jython-doc,

Modified: trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch	2014-03-12 22:20:13 UTC (rev 17876)
+++ trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch	2014-03-12 22:23:42 UTC (rev 17877)
@@ -3,7 +3,7 @@
 
 --- a/build.xml
 +++ b/build.xml
-@@ -533,8 +533,19 @@
+@@ -534,8 +534,19 @@
        author="true"
        windowtitle="FreeMarker ${version} API"
        classpath="build/classes"

Added: trunk/libfreemarker-java/debian/patches/fix-tests-classpath.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/fix-tests-classpath.patch	                        (rev 0)
+++ trunk/libfreemarker-java/debian/patches/fix-tests-classpath.patch	2014-03-12 22:23:42 UTC (rev 17877)
@@ -0,0 +1,18 @@
+Description: Declares the missing transitive dependencies required to run the tests
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -119,6 +119,12 @@
+     
+     <!-- Note: Ant doesn't contain junit.jar anymore, so we add it to conf "test" too. -->
+     <dependency org="junit" name="junit" rev="3.7" conf="build.test->default; test->default" />
++    <dependency org="com.google.guava" name="guava" rev="15.0" conf="build.test->default; test->default" />
++    <dependency org="org.jruby.extras" name="constantine" rev="0.7" conf="build.test->default; test->default" />
++    <dependency org="org.jruby" name="jruby" rev="1.7.11" conf="build.test->default; test->default" />
++    <dependency org="org.antlr" name="antlr3" rev="3.2" conf="build.test->default; test->default" />
++    <dependency org="org.antlr" name="antlr3-runtime" rev="3.2" conf="build.test->default; test->default" />
++    <dependency org="asm" name="asm3-all" rev="3.3" conf="build.test->default; test->default" />
+     
+     <!-- parser -->
+     

Modified: trunk/libfreemarker-java/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series	2014-03-12 22:20:13 UTC (rev 17876)
+++ trunk/libfreemarker-java/debian/patches/series	2014-03-12 22:23:42 UTC (rev 17877)
@@ -9,3 +9,4 @@
 exclude-avalon-logger.patch
 jython-compatibility.patch
 disable-test-coverage.patch
+fix-tests-classpath.patch