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 b4d1deac5f4fa059dbf8a3f55a96b4d5ebb72b54 Author: Kai-Chung Yan <[email protected]> Date: Mon Jun 15 00:59:19 2015 +0800 New patch: search_system_jar.diff, package now functional --- debian/changelog | 2 ++ debian/control | 5 +++-- debian/libgradle-core-java.jlibs | 1 + debian/libgradle-core-java.links | 2 +- debian/patches/search_system_jar.diff | 35 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 43 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7df6a51..080d641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low - fix_DocGenerationException.diff: - jetty.diff: Replace some Jetty libraries with existing ones - remove_test_depedencies.diff: Remove dependencies for building tests + - search_system_jar.diff: Let Gradle search Java libraries in + /usr/share/java/ - use_local_artifacts.diff: Updated version of 01_use_debian_jars.diff -- Kai-Chung Yan <[email protected]> Thu, 21 May 2015 16:02:50 +0800 diff --git a/debian/control b/debian/control index efd8e12..6ba65df 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: gradle Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Miguel Landaeta <[email protected]>, - Damien Raude-Morvan <[email protected]> + Damien Raude-Morvan <[email protected]>, + Kai-Chung Yan <[email protected]> Section: java Priority: optional Build-Depends: ant, @@ -106,7 +107,6 @@ Depends: ant, libasm4-java (>= 5), libatinject-jsr330-api-java, libbintray-client-java (>= 0.8.1), - libcommons-cli-java, libcommons-collections3-java, libcommons-io-java, libcommons-lang-java (>= 2.6), @@ -155,6 +155,7 @@ Depends: ant-optional, libantlr-java, libatinject-jsr330-api-java, libbcpg-java, + libcommons-cli-java, libdom4j-java, libgoogle-gson-java, libgradle-core-java (>= ${binary:Version}), diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs index 4910f51..c523bec 100644 --- a/debian/libgradle-core-java.jlibs +++ b/debian/libgradle-core-java.jlibs @@ -2,6 +2,7 @@ subprojects/base-services-groovy/build/libs/*.jar subprojects/base-services/build/libs/*.jar subprojects/cli/build/libs/*.jar subprojects/core/build/libs/*.jar +subprojects/docs/build/libs/*.jar subprojects/messaging/build/libs/*.jar subprojects/native/build/libs/*.jar subprojects/open-api/build/libs/*.jar diff --git a/debian/libgradle-core-java.links b/debian/libgradle-core-java.links index 6c5cb65..ec67b22 100644 --- a/debian/libgradle-core-java.links +++ b/debian/libgradle-core-java.links @@ -5,7 +5,6 @@ usr/share/java/asm4-all.jar usr/share/gradle/lib/asm usr/share/java/atinject-jsr330-api.jar usr/share/gradle/lib/atinject-jsr330-api.jar usr/share/java/bintray-client-java-api.jar usr/share/gradle/lib/bintray-client-java-api.jar usr/share/java/bintray-client-java-service.jar usr/share/gradle/lib/bintray-client-java-service.jar -usr/share/java/commons-cli.jar usr/share/gradle/lib/plugins/commons-cli.jar usr/share/java/commons-collections3.jar usr/share/gradle/lib/commons-collections3.jar usr/share/java/commons-io.jar usr/share/gradle/lib/commons-io.jar usr/share/java/commons-lang.jar usr/share/gradle/lib/commons-lang.jar @@ -13,6 +12,7 @@ usr/share/java/gradle-base-services-1.12.jar usr/share/gradle/lib/gra usr/share/java/gradle-base-services-groovy-1.12.jar usr/share/gradle/lib/gradle-base-services-groovy-1.12.jar usr/share/java/gradle-cli-1.12.jar usr/share/gradle/lib/gradle-cli-1.12.jar usr/share/java/gradle-core-1.12.jar usr/share/gradle/lib/gradle-core-1.12.jar +usr/share/java/gradle-docs-1.12.jar usr/share/gradle/lib/gradle-docs-1.12.jar usr/share/java/gradle-messaging-1.12.jar usr/share/gradle/lib/gradle-messaging-1.12.jar usr/share/java/gradle-native-1.12.jar usr/share/gradle/lib/gradle-native-1.12.jar usr/share/java/gradle-open-api-1.12.jar usr/share/gradle/lib/gradle-open-api-1.12.jar diff --git a/debian/patches/search_system_jar.diff b/debian/patches/search_system_jar.diff new file mode 100644 index 0000000..25de6f8 --- /dev/null +++ b/debian/patches/search_system_jar.diff @@ -0,0 +1,35 @@ +Description: Gradle searches its own directory for Java libraries ignoring + /usr/share/java/. Somehow Gradle even fails to locate its home + directory which is /usr/share/gradle/. This patch fixes these + issues, and the large amount of symlinks in the binary packages + may be possible to remove. Maintaining so many symlinks is too + error prone. +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2015-06-14 +--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java ++++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java +@@ -68,22 +68,12 @@ + if (distDir != null) { + libDirs.add(new File(distDir, "lib")); + libDirs.add(new File(distDir, "lib/plugins")); ++ libDirs.add(new File("/usr/share/java")); + } + } + + private static File findDistDir() { +- File codeSource = ClasspathUtil.getClasspathForClass(DefaultModuleRegistry.class); +- if (codeSource.isFile()) { +- // Loaded from a JAR - let's see if its in the lib directory, and there's a lib/plugins directory +- File libDir = codeSource.getParentFile(); +- if (!libDir.getName().equals("lib") || !new File(libDir, "plugins").isDirectory()) { +- return null; +- } +- return libDir.getParentFile(); +- } else { +- // Loaded from a classes dir - assume we're running from the ide or tests +- return null; +- } ++ return new File("/usr/share/gradle"); + } + + /** diff --git a/debian/patches/series b/debian/patches/series index 74f7861..08d911d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ bintray_api.diff docs.diff disable_sonar.diff disable_release_notes.diff +search_system_jar.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
