[gradle-1.12] 156/211: Fine tune install file list

[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-1.12.

commit 63a2b7e802c8a7bd43c716e4cd4920a4c74a24ee
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue Jun 9 22:51:19 2015 +0800

    Fine tune install file list
---
 debian/changelog                 |  1 +
 debian/control                   |  4 +++-
 debian/gradle-doc.docs           |  0
 debian/gradle-doc.install        |  2 ++
 debian/gradle.install            |  2 +-
 debian/gradle.jlibs              |  1 -
 debian/gradle.links              | 19 -------------------
 debian/libgradle-core-java.jlibs |  4 +++-
 8 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18f55da..ea7ce3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low
     - gradle-open-api.jar from gradle to libgradle-core-java
     - gradle-messaging.jar from gradle to libgradle-core-java
     - 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/
   * Abandon 23_replace_jna-posix_with_jnr-posix.diff: Future Gradle do not use
diff --git a/debian/control b/debian/control
index 592a282..a7b82f4 100644
--- a/debian/control
+++ b/debian/control
@@ -101,6 +101,7 @@ Depends: ant (>= 1.8),
          libnative-platform-java,
          libwagon-java,
          ${misc:Depends}
+Replaces: libgradle-core-java (<< 1.12)
 Description: Groovy based build system
  Gradle is a build system written in Groovy. It uses Groovy
  also as the language for its build scripts. It has a powerful
@@ -142,7 +143,8 @@ Depends: ant,
          maven (>= 3.0.4-4),
          ${misc:Depends}
 Breaks: libgradle-wrapper-java (<< 1.3~)
-Replaces: libgradle-wrapper-java (<< 1.3~)
+Replaces: libgradle-wrapper-java (<< 1.3~),
+          libgradle-plugins-java (<< 1.12)
 Recommends: gradle (= ${binary:Version})
 Suggests: gradle-doc (= ${binary:Version})
 Description: Groovy based build system - Core library
diff --git a/debian/gradle-doc.docs b/debian/gradle-doc.docs
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/gradle-doc.install b/debian/gradle-doc.install
new file mode 100644
index 0000000..eb19470
--- /dev/null
+++ b/debian/gradle-doc.install
@@ -0,0 +1,2 @@
+subprojects/launcher/build/docs/javadoc/*     /usr/share/doc/gradle/api/launcher/
+subprojects/ui/build/docs/javadoc/*     /usr/share/doc/gradle/api/ui/
\ No newline at end of file
diff --git a/debian/gradle.install b/debian/gradle.install
index afbdd06..5bddc26 100644
--- a/debian/gradle.install
+++ b/debian/gradle.install
@@ -1 +1 @@
-subprojects/launcher/build/startScripts/gradle     usr/share/gradle/bin
\ No newline at end of file
+subprojects/launcher/build/startScripts/gradle     usr/share/bin
\ No newline at end of file
diff --git a/debian/gradle.jlibs b/debian/gradle.jlibs
index 6a3b704..eb46391 100644
--- a/debian/gradle.jlibs
+++ b/debian/gradle.jlibs
@@ -1,3 +1,2 @@
 subprojects/launcher/build/libs/*.jar
-subprojects/tooling-api/build/libs/*.jar
 subprojects/ui/build/libs/*.jar
\ No newline at end of file
diff --git a/debian/gradle.links b/debian/gradle.links
deleted file mode 100644
index d251773..0000000
--- a/debian/gradle.links
+++ /dev/null
@@ -1,19 +0,0 @@
-usr/share/gradle/bin/gradle                      usr/bin/gradle
-
-# gradle-native
-usr/share/java/jna.jar                           usr/share/gradle/lib/jna.jar
-usr/share/java/jnr-posix.jar                     usr/share/gradle/lib/jnr-posix.jar
-usr/share/java/constantine.jar                   usr/share/gradle/lib/constantine.jar
-usr/share/java/jaffl.jar                         usr/share/gradle/lib/jaffl.jar
-usr/share/java/jffi.jar                          usr/share/gradle/lib/jffi.jar
-usr/share/java/jansi.jar                         usr/share/gradle/lib/jansi.jar
-usr/share/java/native-platform.jar               usr/share/gradle/lib/native-platform.jar
-
-# gradle-ui
-usr/share/java/dom4j.jar                         usr/share/gradle/lib/dom4j.jar
-usr/share/java/jaxen.jar                         usr/share/gradle/lib/jaxen.jar
-
-# gradle-messaging
-usr/share/java/kryo.jar                          usr/share/gradle/lib/kryo.jar
-usr/share/java/reflectasm.jar                    usr/share/gradle/lib/reflectasm.jar
-usr/share/java/minlog.jar                        usr/share/gradle/lib/minlog.jar
diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs
index 7d2d2c7..c73405a 100644
--- a/debian/libgradle-core-java.jlibs
+++ b/debian/libgradle-core-java.jlibs
@@ -1,7 +1,9 @@
 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
-subprojects/native/build/libs/*.jar
\ No newline at end of file
+subprojects/native/build/libs/*.jar
+subprojects/tooling-api/build/libs/*.jar
\ No newline at end of file

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