diff -u libslf4j-java-1.5.8/debian/build.xml libslf4j-java-1.5.8/debian/build.xml
--- libslf4j-java-1.5.8/debian/build.xml
+++ libslf4j-java-1.5.8/debian/build.xml
@@ -4,27 +4,16 @@
 
   <target name="clean">
     <delete dir="${jcl-over-slf4j.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${jcl-over-slf4j.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${jul-to-slf4j.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${jul-to-slf4j.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${log4j-over-slf4j.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${log4j-over-slf4j.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${slf4j-api.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${slf4j-api.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${slf4j-jcl.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${slf4j-jcl.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${slf4j-jdk14.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${slf4j-jdk14.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${slf4j-log4j12.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${slf4j-log4j12.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${slf4j-nop.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${slf4j-nop.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${slf4j-simple.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${slf4j-simple.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${slf4j-migrator.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${slf4j-migrator.dir}/${testclass.dir}" quiet="true"/>
     <delete dir="${slf4j-ext.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${slf4j-ext.dir}/${testclass.dir}" quiet="true"/>
 
     <delete file="${jcl-over-slf4j.jar}" quiet="true"/>
     <delete file="${jul-to-slf4j.jar}" quiet="true"/>
@@ -42,7 +31,7 @@
   <target name="jar">
     <mkdir dir="${slf4j-api.dir}/${class.dir}"/>
     <javac srcdir="${slf4j-api.dir}/${source.dir}" destdir="${slf4j-api.dir}/${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" source="1.5" target="1.5" />
 
     <jar jarfile="${slf4j-api.jar}">
       <fileset dir="${slf4j-api.dir}/${class.dir}">
@@ -50,33 +39,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${slf4j-api.dir}/${testclass.dir}"/>
-    <javac srcdir="${slf4j-api.dir}/${test.dir}" destdir="${slf4j-api.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-api.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-api.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${slf4j-api.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <mkdir dir="${slf4j-jcl.dir}/${class.dir}"/>
     <javac srcdir="${slf4j-jcl.dir}/${source.dir}" destdir="${slf4j-jcl.dir}/${class.dir}"
-      debug="true" source="1.5" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${slf4j-jcl.jar}">
       <fileset dir="${slf4j-jcl.dir}/${class.dir}">
@@ -84,35 +49,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${slf4j-jcl.dir}/${testclass.dir}"/>
-    <javac srcdir="${slf4j-jcl.dir}/${test.dir}" destdir="${slf4j-jcl.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-jcl.jar}"/>
-            <pathelement location="${slf4j-jcl.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-jcl.jar}"/>
-            <pathelement location="${slf4j-jcl.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${slf4j-jcl.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <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" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.4" target="1.4" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${slf4j-jdk14.jar}">
       <fileset dir="${slf4j-jdk14.dir}/${class.dir}">
@@ -120,36 +59,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${slf4j-jdk14.dir}/${testclass.dir}"/>
-    <javac srcdir="${slf4j-jdk14.dir}/${test.dir}" destdir="${slf4j-jdk14.dir}/${testclass.dir}"
-      debug="true" source="1.4">
-        <exclude name="**/*PerfTest.java"/>
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-jdk14.jar}"/>
-            <pathelement location="${slf4j-jdk14.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-jdk14.jar}"/>
-            <pathelement location="${slf4j-jdk14.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${slf4j-jdk14.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <mkdir dir="${slf4j-log4j12.dir}/${class.dir}"/>
     <javac srcdir="${slf4j-log4j12.dir}/${source.dir}" destdir="${slf4j-log4j12.dir}/${class.dir}"
-      debug="true" source="1.5" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${slf4j-log4j12.jar}">
       <fileset dir="${slf4j-log4j12.dir}/${class.dir}">
@@ -157,36 +69,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${slf4j-log4j12.dir}/${testclass.dir}"/>
-    <javac srcdir="${slf4j-log4j12.dir}/${test.dir}" destdir="${slf4j-log4j12.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <exclude name="**/*PerfTest.java"/>
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-log4j12.jar}"/>
-            <pathelement location="${slf4j-log4j12.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-log4j12.jar}"/>
-            <pathelement location="${slf4j-log4j12.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${slf4j-log4j12.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <mkdir dir="${slf4j-nop.dir}/${class.dir}"/>
     <javac srcdir="${slf4j-nop.dir}/${source.dir}" destdir="${slf4j-nop.dir}/${class.dir}"
-      debug="true" source="1.5" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${slf4j-nop.jar}">
       <fileset dir="${slf4j-nop.dir}/${class.dir}">
@@ -194,36 +79,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${slf4j-nop.dir}/${testclass.dir}"/>
-    <javac srcdir="${slf4j-nop.dir}/${test.dir}" destdir="${slf4j-nop.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <exclude name="**/*PerfTest.java"/>
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-nop.jar}"/>
-            <pathelement location="${slf4j-nop.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-nop.jar}"/>
-            <pathelement location="${slf4j-nop.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${slf4j-nop.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <mkdir dir="${slf4j-simple.dir}/${class.dir}"/>
     <javac srcdir="${slf4j-simple.dir}/${source.dir}" destdir="${slf4j-simple.dir}/${class.dir}"
-      debug="true" source="1.5" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${slf4j-simple.jar}">
       <fileset dir="${slf4j-simple.dir}/${class.dir}">
@@ -231,36 +89,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${slf4j-simple.dir}/${testclass.dir}"/>
-    <javac srcdir="${slf4j-simple.dir}/${test.dir}" destdir="${slf4j-simple.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <exclude name="**/*PerfTest.java"/>
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-simple.jar}"/>
-            <pathelement location="${slf4j-simple.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-simple.jar}"/>
-            <pathelement location="${slf4j-simple.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${slf4j-simple.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <mkdir dir="${slf4j-migrator.dir}/${class.dir}"/>
     <javac srcdir="${slf4j-migrator.dir}/${source.dir}" destdir="${slf4j-migrator.dir}/${class.dir}"
-      debug="true" source="1.5" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${slf4j-migrator.jar}">
       <fileset dir="${slf4j-migrator.dir}/${class.dir}">
@@ -268,36 +99,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${slf4j-migrator.dir}/${testclass.dir}"/>
-    <javac srcdir="${slf4j-migrator.dir}/${test.dir}" destdir="${slf4j-migrator.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <exclude name="**/*PerfTest.java"/>
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-migrator.jar}"/>
-            <pathelement location="${slf4j-migrator.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-migrator.jar}"/>
-            <pathelement location="${slf4j-migrator.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${slf4j-migrator.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <mkdir dir="${jcl-over-slf4j.dir}/${class.dir}"/>
     <javac srcdir="${jcl-over-slf4j.dir}/${source.dir}" destdir="${jcl-over-slf4j.dir}/${class.dir}"
-      debug="true" source="1.5" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${jcl-over-slf4j.jar}">
       <fileset dir="${jcl-over-slf4j.dir}/${class.dir}">
@@ -305,38 +109,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${jcl-over-slf4j.dir}/${testclass.dir}"/>
-    <javac srcdir="${jcl-over-slf4j.dir}/${test.dir}" destdir="${jcl-over-slf4j.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <exclude name="**/*PerfTest.java"/>
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-jdk14.jar}"/>
-            <pathelement location="${jcl-over-slf4j.jar}"/>
-            <pathelement location="${jcl-over-slf4j.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-jdk14.jar}"/>
-            <pathelement location="${jcl-over-slf4j.jar}"/>
-            <pathelement location="${jcl-over-slf4j.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${jcl-over-slf4j.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <mkdir dir="${jul-to-slf4j.dir}/${class.dir}"/>
     <javac srcdir="${jul-to-slf4j.dir}/${source.dir}" destdir="${jul-to-slf4j.dir}/${class.dir}"
-      debug="true" source="1.5" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${jul-to-slf4j.jar}">
       <fileset dir="${jul-to-slf4j.dir}/${class.dir}">
@@ -344,38 +119,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${jul-to-slf4j.dir}/${testclass.dir}"/>
-    <javac srcdir="${jul-to-slf4j.dir}/${test.dir}" destdir="${jul-to-slf4j.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <exclude name="**/*PerfTest.java"/>
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${jul-to-slf4j.jar}"/>
-            <pathelement location="${jul-to-slf4j.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-log4j12.jar}"/>
-            <pathelement location="${jul-to-slf4j.jar}"/>
-            <pathelement location="${jul-to-slf4j.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${jul-to-slf4j.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-                <exclude name="**/SLF4JBridgeHandlerTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <mkdir dir="${log4j-over-slf4j.dir}/${class.dir}"/>
     <javac srcdir="${log4j-over-slf4j.dir}/${source.dir}" destdir="${log4j-over-slf4j.dir}/${class.dir}"
-      debug="true" source="1.5" classpath="${slf4j-api.jar}"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
 
     <jar jarfile="${log4j-over-slf4j.jar}">
       <fileset dir="${log4j-over-slf4j.dir}/${class.dir}">
@@ -383,36 +129,9 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${log4j-over-slf4j.dir}/${testclass.dir}"/>
-    <javac srcdir="${log4j-over-slf4j.dir}/${test.dir}" destdir="${log4j-over-slf4j.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <exclude name="**/*PerfTest.java"/>
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${log4j-over-slf4j.jar}"/>
-            <pathelement location="${log4j-over-slf4j.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${log4j-over-slf4j.jar}"/>
-            <pathelement location="${log4j-over-slf4j.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${log4j-over-slf4j.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
     <mkdir dir="${slf4j-ext.dir}/${class.dir}"/>
     <javac srcdir="${slf4j-ext.dir}/${source.dir}" destdir="${slf4j-ext.dir}/${class.dir}"
-      debug="true" source="1.5" classpath="${slf4j-api.jar}:/usr/share/java/javassist.jar:/usr/share/java/commons-lang.jar"/>
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:/usr/share/java/javassist.jar:/usr/share/java/commons-lang.jar"/>
 
     <jar jarfile="${slf4j-ext.jar}">
       <fileset dir="${slf4j-ext.dir}/${class.dir}">
@@ -420,37 +139,6 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${slf4j-ext.dir}/${testclass.dir}"/>
-    <javac srcdir="${slf4j-ext.dir}/${test.dir}" destdir="${slf4j-ext.dir}/${testclass.dir}"
-      debug="true" source="1.5">
-        <exclude name="**/*PerfTest.java"/>
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-ext.jar}"/>
-            <pathelement location="${slf4j-log4j12.jar}"/>
-            <pathelement location="/usr/share/java/commons-lang.jar"/>
-            <pathelement location="${slf4j-ext.dir}/${testclass.dir}"/>
-        </classpath>
-    </javac>
-    <junit haltonfailure="yes">
-        <classpath>
-            <pathelement location="${slf4j-api.jar}"/>
-            <pathelement location="${slf4j-ext.jar}"/>
-            <pathelement location="${slf4j-log4j12.jar}"/>
-            <pathelement location="/usr/share/java/commons-lang.jar"/>
-            <pathelement location="${slf4j-ext.dir}/${testclass.dir}"/>
-        </classpath>
-        <formatter type="plain" usefile="false"/>
-        <batchtest>
-            <fileset dir="${slf4j-ext.dir}/${testclass.dir}">
-                <include name="**/*Test.class"/>
-                <exclude name="**/AllTest.class"/>
-                <exclude name="**/PackageTest.class"/>
-                <exclude name="**/*PerfTest.class"/>
-            </fileset>
-        </batchtest>
-    </junit>
-
   </target>
 
 </project>
diff -u libslf4j-java-1.5.8/debian/copyright libslf4j-java-1.5.8/debian/copyright
--- libslf4j-java-1.5.8/debian/copyright
+++ libslf4j-java-1.5.8/debian/copyright
@@ -55 +55 @@
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+and is licensed under the GPL 2, see `/usr/share/common-licenses/GPL-2'.
diff -u libslf4j-java-1.5.8/debian/ant.properties libslf4j-java-1.5.8/debian/ant.properties
--- libslf4j-java-1.5.8/debian/ant.properties
+++ libslf4j-java-1.5.8/debian/ant.properties
@@ -1,8 +1,6 @@
 project.name=libslf4j-java
 class.dir=classes
-test.dir=src/test/java
 source.dir=src/main/java
-testclass.dir=testclasses
 
 jcl-over-slf4j.dir=jcl-over-slf4j
 jul-to-slf4j.dir=jul-to-slf4j
diff -u libslf4j-java-1.5.8/debian/changelog libslf4j-java-1.5.8/debian/changelog
--- libslf4j-java-1.5.8/debian/changelog
+++ libslf4j-java-1.5.8/debian/changelog
@@ -1,11 +1,45 @@
-libslf4j-java (1.5.8-1ubuntu3) karmic; urgency=low
+libslf4j-java (1.5.8-3ubuntu1) karmic; urgency=low
 
-  * debian/build.xml, debian/ant.properties: Enable testsuites (LP: #429340).
-    Some tests were disabled to be build-daemon compatible.
-  * debian/control, debian/rules: Add junit and ant-optional to Build-Depends
-    as they are needed for the test runs.
+  * Merge with Debian; remaining changes:
+    - debian/ant.properties: Explicitly build java5-compatible code.
+    - debian/control:
+      - Bump minimal JRE dependency to java5-runtime-headless.
+      - Build with default-jdk rather than default-jdk-builddep.
 
- -- Thierry Carrez <thierry.carrez@ubuntu.com>  Mon, 14 Sep 2009 14:30:38 +0200
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 18 Oct 2009 16:59:17 +0200
+
+libslf4j-java (1.5.8-3) unstable; urgency=low
+
+  * Update Standards-Version to 3.8.3
+  * Compile classes for Java 1.4 / 1.5, don't allow classes
+    to be compiled in Java 1.6 format
+
+ -- Ludovic Claude <ludovic.claude@laposte.net>  Fri, 04 Sep 2009 17:26:32 +0100
+
+libslf4j-java (1.5.8-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner@debian.org>  Sun, 09 Aug 2009 12:42:35 +0200
+
+libslf4j-java (1.5.8-1.1) experimental; urgency=low
+
+  [Ludovic Claude]
+  * Non-maintainer upload.
+  * Add the Maven POMs to the package
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+  * Fix Lintian warning: license for the Debian packaging is GPL version 2, 
+    according to Varun Hiremath.
+  * Use default-jdk instead of default-jdk-builddep for Build-Depends as no
+    components are built with gcj.
+
+  [ Emmanuel Bourg and Sylvestre Ledru]
+  * Update of the URLs
+  * Rename Jakarta Commons to Apache Commons
+
+ -- Ludovic Claude <ludovic.claude@laposte.net>  Thu, 02 Jul 2009 23:16:26 +0100
 
 libslf4j-java (1.5.8-1ubuntu2) karmic; urgency=low
 
diff -u libslf4j-java-1.5.8/debian/rules libslf4j-java-1.5.8/debian/rules
--- libslf4j-java-1.5.8/debian/rules
+++ libslf4j-java-1.5.8/debian/rules
@@ -2,23 +2,25 @@
 
-include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET	:= jar
-DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_JARS		:= commons-logging log4j-1.2 junit ant-junit
-
-ALL_JARS = $(wildcard *.jar)
-DEST_DIR = $(DEB_DESTDIR)/usr/share/java
-
-common-install-prehook-indep::
-	for jar in $(ALL_JARS); do                         \
-	  BASENAME=`basename $$jar .jar`;        	   \
-	  FULLNAME=$$BASENAME-$(DEB_UPSTREAM_VERSION).jar; \
-	  install -m 644 -D $$jar $(DEST_DIR)/$$FULLNAME;  \
-	  ln -s $$FULLNAME $(DEST_DIR)/$$BASENAME.jar;     \
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_BUILDFILE    := debian/build.xml
+DEB_JARS             := commons-logging log4j-1.2
+MODULES              := jcl-over-slf4j jul-to-slf4j log4j-over-slf4j slf4j-api \
+  slf4j-jcl slf4j-jdk14 slf4j-log4j12 slf4j-migrator slf4j-nop slf4j-simple
+
+binary-post-install/$(PACKAGE)::
+	mh_installpoms -p$(PACKAGE)
+	set -e; for MODULE in $(MODULES); do \
+	  mh_installjar -p$(PACKAGE) -l $$MODULE/pom.xml $$MODULE.jar; \
 	done
 
+clean::
+	-rm -rf debian/tmp
+
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
diff -u libslf4j-java-1.5.8/debian/control libslf4j-java-1.5.8/debian/control
--- libslf4j-java-1.5.8/debian/control
+++ libslf4j-java-1.5.8/debian/control
@@ -4,10 +4,10 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun@debian.org>, Damien Raude-Morvan <drazzib@drazzib.com>
-Build-Depends: cdbs, debhelper (>= 6), ant-optional, default-jdk
-Build-Depends-Indep: liblog4j1.2-java, libcommons-logging-java,
-  libcommons-lang-java, libjavassist-java, junit
-Standards-Version: 3.8.1
+Build-Depends: cdbs, debhelper (>= 6), ant, default-jdk
+Build-Depends-Indep: maven-repo-helper, liblog4j1.2-java,
+ libcommons-logging-java, libcommons-lang-java, libjavassist-java
+Standards-Version: 3.8.3
 Homepage: http://www.slf4j.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libslf4j-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libslf4j-java
@@ -20,8 +20,8 @@
  The Simple Logging Facade for Java (or SLF4J) is intended to serve as
  a simple facade for various logging APIs allowing to the end-user to
  plug in the desired implementation at deployment time. SLF4J also
- allows for a gradual migration path away from Jakarta Commons
- Logging (JCL)
+ allows for a gradual migration path away from Apache Commons
+ Logging (CL)
  .
  Logging API implementations can either choose to implement the SLF4J
  interfaces directly, e.g. logback or SimpleLogger. Alternatively, it
diff -u libslf4j-java-1.5.8/debian/orig-tar.sh libslf4j-java-1.5.8/debian/orig-tar.sh
--- libslf4j-java-1.5.8/debian/orig-tar.sh
+++ libslf4j-java-1.5.8/debian/orig-tar.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-# $1 = version
+# $2 = version
 DIR=libslf4j-java-$2.orig
 
 # clean up the upstream tarball
only in patch2:
unchanged:
--- libslf4j-java-1.5.8.orig/debian/maven.rules
+++ libslf4j-java-1.5.8/debian/maven.rules
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+log4j log4j jar s/1\.2\..*/1.2.x/
only in patch2:
unchanged:
--- libslf4j-java-1.5.8.orig/debian/libslf4j-java.poms
+++ libslf4j-java-1.5.8/debian/libslf4j-java.poms
@@ -0,0 +1,12 @@
+pom.xml --no-parent
+jcl-over-slf4j/pom.xml
+jul-to-slf4j/pom.xml
+log4j-over-slf4j/pom.xml
+slf4j-api/pom.xml
+slf4j-nop/pom.xml
+slf4j-jdk14/pom.xml
+slf4j-jcl/pom.xml
+slf4j-log4j12/pom.xml
+slf4j-migrator/pom.xml
+slf4j-simple/pom.xml
+