Author: ebourg-guest
Date: 2013-06-26 10:40:44 +0000 (Wed, 26 Jun 2013)
New Revision: 16921
Modified:
trunk/libslf4j-java/debian/ant.properties
trunk/libslf4j-java/debian/build.xml
trunk/libslf4j-java/debian/changelog
trunk/libslf4j-java/debian/control
trunk/libslf4j-java/debian/rules
Log:
debian/rules: Added ant-junit4 to the classpath to fix test failures (Closes:
#713178)
debian/rules: Improved the clean target to allow rebuilds
Modified: trunk/libslf4j-java/debian/ant.properties
===================================================================
--- trunk/libslf4j-java/debian/ant.properties 2013-06-25 16:12:42 UTC (rev
16920)
+++ trunk/libslf4j-java/debian/ant.properties 2013-06-26 10:40:44 UTC (rev
16921)
@@ -23,6 +23,7 @@
jul-to-slf4j.jar=jul-to-slf4j.jar
log4j-over-slf4j.jar=log4j-over-slf4j.jar
slf4j-api.jar=slf4j-api.jar
+slf4j-api-test.jar=slf4j-api-test.jar
slf4j-jcl.jar=slf4j-jcl.jar
slf4j-jdk14.jar=slf4j-jdk14.jar
slf4j-log4j12.jar=slf4j-log4j12.jar
Modified: trunk/libslf4j-java/debian/build.xml
===================================================================
--- trunk/libslf4j-java/debian/build.xml 2013-06-25 16:12:42 UTC (rev
16920)
+++ trunk/libslf4j-java/debian/build.xml 2013-06-26 10:40:44 UTC (rev
16921)
@@ -30,6 +30,7 @@
<delete file="${jul-to-slf4j.jar}" quiet="true"/>
<delete file="${log4j-over-slf4j.jar}" quiet="true"/>
<delete file="${slf4j-api.jar}" quiet="true"/>
+ <delete file="${slf4j-api-test.jar}" quiet="true"/>
<delete file="${slf4j-jcl.jar}" quiet="true"/>
<delete file="${slf4j-jdk14.jar}" quiet="true"/>
<delete file="${slf4j-log4j12.jar}" quiet="true"/>
Modified: trunk/libslf4j-java/debian/changelog
===================================================================
--- trunk/libslf4j-java/debian/changelog 2013-06-25 16:12:42 UTC (rev
16920)
+++ trunk/libslf4j-java/debian/changelog 2013-06-26 10:40:44 UTC (rev
16921)
@@ -1,3 +1,11 @@
+libslf4j-java (1.7.5-2) unstable; urgency=low
+
+ * debian/rules: Added ant-junit4 to the classpath to fix test failures
+ (Closes: #713178)
+ * debian/rules: Improved the clean target to allow rebuilds
+
+ -- Emmanuel Bourg <[email protected]> Wed, 26 Jun 2013 12:35:49 +0200
+
libslf4j-java (1.7.5-1) unstable; urgency=low
* Upload to unstable.
Modified: trunk/libslf4j-java/debian/control
===================================================================
--- trunk/libslf4j-java/debian/control 2013-06-25 16:12:42 UTC (rev 16920)
+++ trunk/libslf4j-java/debian/control 2013-06-26 10:40:44 UTC (rev 16921)
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Varun Hiremath <[email protected]>,
- Damien Raude-Morvan <[email protected]>
+ Damien Raude-Morvan <[email protected]>,
+ Emmanuel Bourg <[email protected]>
Build-Depends: ant,
ant-optional,
cdbs,
@@ -14,7 +15,7 @@
liblog4j1.2-java,
maven-repo-helper
Standards-Version: 3.9.4
-Homepage: http://www.slf4j.org/
+Homepage: http://www.slf4j.org
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libslf4j-java
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libslf4j-java
Modified: trunk/libslf4j-java/debian/rules
===================================================================
--- trunk/libslf4j-java/debian/rules 2013-06-25 16:12:42 UTC (rev 16920)
+++ trunk/libslf4j-java/debian/rules 2013-06-26 10:40:44 UTC (rev 16921)
@@ -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 junit4
+DEB_JARS := commons-logging log4j-1.2 ant-junit ant-junit4 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
@@ -20,6 +20,7 @@
done
clean::
+ mh_clean
-rm -rf debian/tmp
get-orig-source:
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
