[gradle] 60/81: Install jarjar files to app home

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository gradle.

commit 28f4c0c6910f357659bf5d18ab1ac1157f73f6ca
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sat Jun 13 00:15:09 2015 +0800

    Install jarjar files to app home
---
 debian/changelog                   | 1 -
 debian/control                     | 3 ++-
 debian/gradle.install              | 2 +-
 debian/gradle.links                | 1 +
 debian/gradle.manpages             | 2 +-
 debian/libgradle-core-java.install | 2 ++
 debian/libgradle-core-java.jlibs   | 1 -
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f476598..1bcacc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,6 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low
     - gradle-native.jar from gradle to libgradle-core-java
     - gradle-tooling-api.jar from gradle to libgradle-core-java
     - gradle-wrapper.jar from libgradle-core-java to libgradle-plugins-java
-  * Remove all symlinks, placing all jars in /usr/share/java/
   * Drop multiple patches under debian/patches/:
     - 13_fix_javadocs_links.diff: Already merged into docs.diff
     - 23_replace_jna-posix_with_jnr-posix.diff: Future Gradle no longer use jnr
diff --git a/debian/control b/debian/control
index f7f1aef..5afda65 100644
--- a/debian/control
+++ b/debian/control
@@ -67,6 +67,7 @@ Build-Depends: ant,
                libxbean-java,
                libxerces2-java,
                maven (>= 3),
+               perl,
                quilt,
                testng
 Build-Conflicts: groovy (>= 2.0.0~)
@@ -199,7 +200,7 @@ Replaces: libgradle-announce-java (<< 1.3~),
           libgradle-maven-java (<< 1.3~),
           libgradle-osgi-java (<< 1.3~),
           libgradle-scala-java (<< 1.3~),
-          libgradle-signing-java (<< 1.3~)
+          libgradle-signing-java (<< 1.3~),
           libgradle-core-java (<< 1.12)
 Description: Groovy based build system - All plugins
  Gradle is a build system written in Groovy. It uses Groovy
diff --git a/debian/gradle.install b/debian/gradle.install
index 5bddc26..afbdd06 100644
--- a/debian/gradle.install
+++ b/debian/gradle.install
@@ -1 +1 @@
-subprojects/launcher/build/startScripts/gradle     usr/share/bin
\ No newline at end of file
+subprojects/launcher/build/startScripts/gradle     usr/share/gradle/bin
\ No newline at end of file
diff --git a/debian/gradle.links b/debian/gradle.links
new file mode 100644
index 0000000..1652d0f
--- /dev/null
+++ b/debian/gradle.links
@@ -0,0 +1 @@
+/usr/share/gradle/bin/gradle     /usr/share/bin/gradle
\ No newline at end of file
diff --git a/debian/gradle.manpages b/debian/gradle.manpages
index e5c4155..80d5c0a 100644
--- a/debian/gradle.manpages
+++ b/debian/gradle.manpages
@@ -1 +1 @@
-build/gradle.1
+debian/gradle.1
\ No newline at end of file
diff --git a/debian/libgradle-core-java.install b/debian/libgradle-core-java.install
new file mode 100644
index 0000000..5a3a4e8
--- /dev/null
+++ b/debian/libgradle-core-java.install
@@ -0,0 +1,2 @@
+subprojects/core-impl/build/libs/jarjar/*.jar     /usr/share/gradle/lib/plugins/
+subprojects/distributions/src/toplevel/media/     /usr/share/gradle/
\ No newline at end of file
diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs
index a969b50..9d30ac8 100644
--- a/debian/libgradle-core-java.jlibs
+++ b/debian/libgradle-core-java.jlibs
@@ -1,7 +1,6 @@
 subprojects/cli/build/libs/*.jar
 subprojects/core/build/libs/*.jar
 subprojects/core-impl/build/libs/*.jar
-subprojects/core-impl/build/libs/jarjar/*.jar
 subprojects/base-services/build/libs/*.jar
 subprojects/base-services-groovy/build/libs/*.jar
 subprojects/messaging/build/libs/*.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git