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 20ac50c0f4421da87689829d26e6aa4d92306809 Author: Miguel Landaeta <[email protected]> Date: Mon Jul 2 19:52:11 2012 -0430 Replace dependencies on jna-posix library with jnr-posix --- debian/changelog | 6 +++ debian/control | 4 +- debian/gradle.links | 3 +- .../23_replace_jna-posix_with_jnr-posix.diff | 56 ++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 67 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16b8f25..60f65a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gradle (1.0~m3-2) UNRELEASED; urgency=low + + * Replace dependencies on jna-posix library with jnr-posix. (Closes: #628662). + + -- Miguel Landaeta <[email protected]> Thu, 02 Jun 2011 19:42:57 -0430 + gradle (1.0~m3-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 15abf65..42e1e96 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper, gradle, 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, libtomcat6-java, + libmaven-ant-tasks-java, libjansi-java, libjnr-posix-java, libtomcat6-java, libplexus-containers-java, libmaven2-core-java, libplexus-component-api-java, libplexus-utils-java, libwagon-java, libcodenarc-groovy-java, checkstyle (>= 5.1), libcommons-beanutils-java, libsvnkit-java, bnd, @@ -32,7 +32,7 @@ Depends: default-jre-headless, groovy (>= 1.7.4), ant (>= 1.8), libslf4j-java, liblogback-java (>= 0.9.28), junit4, libtomcat6-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, + libjnr-posix-java, libplexus-containers-java, libmaven2-core-java, libplexus-component-api-java, libwagon-java, libcodenarc-groovy-java, checkstyle (>= 5.1), libcommons-beanutils-java, libsvnkit-java, bnd, bsh, libservlet2.5-java, libjetty-java, libjetty-extra-java, ${misc:Depends} diff --git a/debian/gradle.links b/debian/gradle.links index 1383683..b799f36 100644 --- a/debian/gradle.links +++ b/debian/gradle.links @@ -17,7 +17,8 @@ usr/share/java/jansi.jar usr/share/gradle/lib/jansi.jar usr/share/java/jaxen.jar usr/share/gradle/lib/jaxen.jar usr/share/java/jcl-over-slf4j.jar usr/share/gradle/lib/jcl-over-slf4j.jar usr/share/java/jna.jar usr/share/gradle/lib/jna.jar -usr/share/java/jna-posix.jar usr/share/gradle/lib/jna-posix.jar +usr/share/java/jnr-posix.jar usr/share/gradle/lib/jnr-posix.jar +usr/share/java/jnr-posix.jar usr/share/gradle/lib/jna-posix.jar usr/share/java/joptsimple.jar usr/share/gradle/lib/joptsimple.jar usr/share/java/jsch.jar usr/share/gradle/lib/jsch.jar usr/share/java/jul-to-slf4j.jar usr/share/gradle/lib/jul-to-slf4j.jar diff --git a/debian/patches/23_replace_jna-posix_with_jnr-posix.diff b/debian/patches/23_replace_jna-posix_with_jnr-posix.diff new file mode 100644 index 0000000..09bc7e1 --- /dev/null +++ b/debian/patches/23_replace_jna-posix_with_jnr-posix.diff @@ -0,0 +1,56 @@ +Description: Replace jna-posix library with jnr-posix + jna-posix is not longer supported and was replaced with jnr-posix. +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2011-06-02 + +diff --git a/subprojects/core/core.gradle b/subprojects/core/core.gradle +index 4260cbd..ba3c9e0 100644 +--- a/subprojects/core/core.gradle ++++ b/subprojects/core/core.gradle +@@ -54,7 +54,8 @@ dependencies { + //"slide:webdavlib:2.0@jar", + libraries.asm_all, + 'org.fusesource.jansi:jansi:1.4', +- 'org.jruby.ext.posix:jna-posix:1.0.1' ++ 'org.jruby.ext.posix:jnr-posix:1.1.4', ++ 'com.kenai.constantine:constantine:0.7' + + runtime 'net.java.dev.jna:jna:3.2.7' + +diff --git a/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java b/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java +index 720e287..2f5aa9a 100644 +--- a/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java ++++ b/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java +@@ -35,7 +35,8 @@ public class WorkerProcessClassPathProvider extends AbstractClassPathProvider { + + public WorkerProcessClassPathProvider(CacheRepository cacheRepository) { + this.cacheRepository = cacheRepository; +- add("WORKER_PROCESS", toPatterns("gradle-core", "slf4j-api", "logback-classic", "logback-core", "jul-to-slf4j", "jansi", "jna", "jna-posix")); ++ //add("WORKER_PROCESS", toPatterns("gradle-core", "slf4j-api", "logback-classic", "logback-core", "jul-to-slf4j", "jansi", "jna", "jna-posix")); ++ add("WORKER_PROCESS", toPatterns("gradle-core", "slf4j-api", "logback-classic", "logback-core", "jul-to-slf4j", "jansi", "jna", "jnr-posix")); + } + + public Set<File> findClassPath(String name) { +diff --git a/subprojects/core/src/main/groovy/org/gradle/util/PosixUtil.java b/subprojects/core/src/main/groovy/org/gradle/util/PosixUtil.java +index 96c90a8..62eb360 100644 +--- a/subprojects/core/src/main/groovy/org/gradle/util/PosixUtil.java ++++ b/subprojects/core/src/main/groovy/org/gradle/util/PosixUtil.java +@@ -24,6 +24,8 @@ import java.io.File; + import java.io.InputStream; + import java.io.PrintStream; + ++import com.kenai.constantine.platform.Errno; ++ + public class PosixUtil { + private static final POSIX POSIX = POSIXFactory.getPOSIX(new POSIXHandlerImpl(), true); + +@@ -32,7 +34,7 @@ public class PosixUtil { + } + + private static class POSIXHandlerImpl implements POSIXHandler { +- public void error(POSIX.ERRORS errors, String message) { ++ public void error(Errno error, String extraData) { + throw new UnsupportedOperationException(); + } + diff --git a/debian/patches/series b/debian/patches/series index 783f021..966d8a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ 13_fix_javadocs_links.diff 21_docs.diff 22_checkstyle.diff +23_replace_jna-posix_with_jnr-posix.diff -- 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
