[pkg-java] r16412 - trunk/libslf4j-java/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2013-02-10 13:36:57 +0000 (Sun, 10 Feb 2013)
New Revision: 16412

Modified:
   trunk/libslf4j-java/debian/build.xml
   trunk/libslf4j-java/debian/changelog
   trunk/libslf4j-java/debian/control
   trunk/libslf4j-java/debian/rules
Log:
* New upstream release.
* SLF4J now requires JDK 1.5.
* d/control: Replace junit by junit4.

Modified: trunk/libslf4j-java/debian/build.xml
===================================================================
--- trunk/libslf4j-java/debian/build.xml	2013-02-05 14:07:03 UTC (rev 16411)
+++ trunk/libslf4j-java/debian/build.xml	2013-02-10 13:36:57 UTC (rev 16412)
@@ -62,7 +62,7 @@
 
     <mkdir dir="${slf4j-jdk14.dir}/${class.dir}"/>
     <javac srcdir="${slf4j-jdk14.dir}/${source.dir}" destdir="${slf4j-jdk14.dir}/${class.dir}"
-      debug="true" source="1.4" target="1.4" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${slf4j-jdk14.jar}">
       <fileset dir="${slf4j-jdk14.dir}/${class.dir}">
@@ -175,7 +175,7 @@
       debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}"/>
     <mkdir dir="${slf4j-simple.dir}/${test.class.dir}"/>
     <javac srcdir="${slf4j-simple.dir}/${test.source.dir}" destdir="${slf4j-simple.dir}/${test.class.dir}"
-      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-simple.jar}:${slf4j-api-test.jar}"/>
     <mkdir dir="${slf4j-migrator.dir}/${test.class.dir}"/>
     <javac srcdir="${slf4j-migrator.dir}/${test.source.dir}" destdir="${slf4j-migrator.dir}/${test.class.dir}"
       debug="true" source="1.5" target="1.5" classpath="${slf4j-migrator.jar}"/>

Modified: trunk/libslf4j-java/debian/changelog
===================================================================
--- trunk/libslf4j-java/debian/changelog	2013-02-05 14:07:03 UTC (rev 16411)
+++ trunk/libslf4j-java/debian/changelog	2013-02-10 13:36:57 UTC (rev 16412)
@@ -1,3 +1,11 @@
+libslf4j-java (1.7.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * SLF4J now requires JDK 1.5.
+  * d/control: Replace junit by junit4.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 10 Feb 2013 13:02:46 +0100
+
 libslf4j-java (1.6.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libslf4j-java/debian/control
===================================================================
--- trunk/libslf4j-java/debian/control	2013-02-05 14:07:03 UTC (rev 16411)
+++ trunk/libslf4j-java/debian/control	2013-02-10 13:36:57 UTC (rev 16412)
@@ -9,7 +9,7 @@
                cdbs,
                debhelper (>= 7),
                default-jdk,
-               junit,
+               junit4,
                libcommons-logging-java,
                liblog4j1.2-java,
                maven-repo-helper

Modified: trunk/libslf4j-java/debian/rules
===================================================================
--- trunk/libslf4j-java/debian/rules	2013-02-05 14:07:03 UTC (rev 16411)
+++ trunk/libslf4j-java/debian/rules	2013-02-10 13:36:57 UTC (rev 16412)
@@ -9,7 +9,7 @@
 DEB_ANT_BUILD_TARGET := jar
 DEB_ANT_CHECK_TARGET := test
 DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_JARS             := commons-logging log4j-1.2 ant-junit junit
+DEB_JARS             := commons-logging log4j-1.2 ant-junit junit4
 MODULES              := jcl-over-slf4j jul-to-slf4j log4j-over-slf4j slf4j-api \
   slf4j-jcl slf4j-jdk14 slf4j-log4j12 slf4j-migrator slf4j-nop slf4j-simple