This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit 7b9f1ce08b023ea3c10e4231e93ab231c28b62bd Author: Miguel Landaeta <[email protected]> Date: Thu Mar 24 19:58:03 2011 -0430 Drop unneeded patch for liblogback-java --- debian/changelog | 4 +++- debian/control | 17 +++++++++-------- debian/patches/02_logback.diff | 16 ---------------- debian/patches/series | 1 - .../gradle/logging/internal/Slf4jLoggingConfigurer.java | 2 +- 5 files changed, 13 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a946e3..1673e2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ gradle (0.9.2-1) UNRELEASED; urgency=low * Add Build-Depends on libgradle-maven-java. * Update watch file. * Update copyright dates. + * Drop unneeded patch for liblogback-java and set (>= 0.9.28) as + minimal version to depend on. - -- Miguel Landaeta <[email protected]> Tue, 22 Mar 2011 23:10:13 -0430 + -- Miguel Landaeta <[email protected]> Thu, 24 Mar 2011 19:45:58 -0430 gradle (0.9.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 04f8a23..85c4c04 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper, gradle, quilt, libgradle-wrapper-java, libgradle-scala-java, unzip, ant, ant-optional, libantlr-java, libasm3-java, libcommons-cli-java, libcommons-io-java, libdom4j-java, libgoogle-collections-java (>= 1.0), groovy (>= 1.7.4), ivy, - libjaxen-java, libjoptsimple-java, libslf4j-java, liblogback-java, junit4, - libxmlunit-java, libcommons-httpclient-java, libcommons-codec-java, + libjaxen-java, libjoptsimple-java, libslf4j-java, liblogback-java (>= 0.9.28), + junit4, libxmlunit-java, libcommons-httpclient-java, libcommons-codec-java, libjsch-java, libjzlib-java, testng, libcommons-collections3-java, libmaven-ant-tasks-java, libjansi-java, libjna-posix-java, libplexus-containers-java, libmaven2-core-java, libplexus-component-api-java, @@ -29,7 +29,7 @@ Depends: default-jre-headless, groovy (>= 1.7.4), ant, ant-optional, libgradle-plugins-java (= ${binary:Version}), libantlr-java, libasm3-java, libcommons-cli-java, libcommons-io-java, libdom4j-java, libgoogle-collections-java (>= 1.0), ivy, libjaxen-java, libjoptsimple-java, - libslf4j-java, liblogback-java, junit4, libxmlunit-java, + libslf4j-java, liblogback-java (>= 0.9.28), junit4, libxmlunit-java, libcommons-httpclient-java, libcommons-codec-java, libjsch-java, libjzlib-java, testng, libcommons-collections3-java, libmaven-ant-tasks-java, libjansi-java, libjna-posix-java, libplexus-containers-java, libmaven2-core-java, @@ -56,11 +56,12 @@ Description: Groovy based build system Package: libgradle-core-java Architecture: all -Depends: liblogback-java, libgoogle-collections-java (>= 1.0), groovy, - libjoptsimple-java, libcommons-collections3-java, libcommons-httpclient-java, - libcommons-io-java, libcommons-lang-java, ivy, ant, libjansi-java, - libasm3-java, libslf4j-java, libmaven-ant-tasks-java, libmaven2-core-java, - libplexus-component-api-java, libplexus-utils-java, ${misc:Depends} +Depends: liblogback-java (>= 0.9.28), libgoogle-collections-java (>= 1.0), + groovy, libjoptsimple-java, libcommons-collections3-java, + libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, ivy, + ant, libjansi-java, libasm3-java, libslf4j-java, libmaven-ant-tasks-java, + libmaven2-core-java, libplexus-component-api-java, libplexus-utils-java, + ${misc:Depends} Recommends: gradle (= ${binary:Version}) Suggests: gradle-doc (= ${binary:Version}) Description: Groovy based build system - Core library diff --git a/debian/patches/02_logback.diff b/debian/patches/02_logback.diff deleted file mode 100644 index 37dbf8b..0000000 --- a/debian/patches/02_logback.diff +++ /dev/null @@ -1,16 +0,0 @@ -Description: Logback compatibility -Author: Miguel Landaeta <[email protected]> -Forwarded: no -Last-Update: 2010-11-23 - ---- gradle-0.9.2.orig/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java -+++ gradle-0.9.2/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java -@@ -135,7 +135,7 @@ public class Slf4jLoggingConfigurer impl - levelFilter.setContext(lc); - levelFilter.setOnMatch(onMatch); - levelFilter.setOnMismatch(onMismatch); -- levelFilter.setLevel(level); -+ levelFilter.setLevel(level.toString()); - levelFilter.start(); - return levelFilter; - } diff --git a/debian/patches/series b/debian/patches/series index 9338e48..8fbb391 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 01_use_debian_jars.diff -02_logback.diff 03_plexus.diff 04_webdavlib.diff 05_polyglot_maven.diff diff --git a/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java b/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java index 130ef61..97bc3dc 100644 --- a/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java +++ b/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java @@ -135,7 +135,7 @@ public class Slf4jLoggingConfigurer implements LoggingConfigurer { levelFilter.setContext(lc); levelFilter.setOnMatch(onMatch); levelFilter.setOnMismatch(onMismatch); - levelFilter.setLevel(level.toString()); + levelFilter.setLevel(level); levelFilter.start(); return levelFilter; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
