[proguard] 07/08: Install only the proguard-base artifacts

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository proguard.

commit 387f3b94479ad186140e88e871c3b24a6c92016b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 23 11:04:50 2016 +0200

    Install only the proguard-base artifacts
---
 debian/changelog           | 1 -
 debian/install             | 2 ++
 debian/proguard.poms       | 5 +----
 debian/scripts/proguardgui | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c198d25..0b11ae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ proguard (5.3-1) UNRELEASED; urgency=medium
     - Refreshed the patches
   * Build with Gradle instead of Ant
   * No longer use a patch to add the shell scripts
-  * Install the /usr/share/java jars with maven-repo-helper
   * Relocate the proguard-gradle jar to the all in one jar
     to avoid duplicating the files
 
diff --git a/debian/install b/debian/install
index af84afa..2413dae 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,4 @@
+lib/proguardgui.jar        /usr/share/java
+lib/retrace.jar            /usr/share/java
 debian/scripts/proguard    /usr/bin
 debian/scripts/proguardgui /usr/bin
diff --git a/debian/proguard.poms b/debian/proguard.poms
index 3e8952f..cebfe1c 100644
--- a/debian/proguard.poms
+++ b/debian/proguard.poms
@@ -1,4 +1 @@
-buildscripts/maven/pom.xml
-buildscripts/maven/base/pom.xml    --has-package-version --java-lib --artifact=lib/proguard.jar --usj-name=proguard --relocate=net.sf.proguard:proguard-gradle
-buildscripts/maven/gui/pom.xml     --has-package-version --java-lib --artifact=lib/proguardgui.jar
-buildscripts/maven/retrace/pom.xml --has-package-version --java-lib --artifact=lib/retrace.jar
+buildscripts/maven/base/pom.xml --no-parent --has-package-version --java-lib --artifact=lib/proguard.jar --usj-name=proguard --relocate=net.sf.proguard:proguard-gradle
diff --git a/debian/scripts/proguardgui b/debian/scripts/proguardgui
index 5dd7476..6b06551 100644
--- a/debian/scripts/proguardgui
+++ b/debian/scripts/proguardgui
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec java -Xss300000 -cp /usr/share/java/proguard.jar:/usr/share/java/proguard-gui.jar proguard.gui.ProGuardGUI "$@"
+exec java -Xss300000 -cp /usr/share/java/proguard.jar:/usr/share/java/proguardgui.jar proguard.gui.ProGuardGUI "$@"

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