[proguard] 05/08: Install the /usr/share/java jars with maven-repo-helper

[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 93dae5ab74871131c255cede63a7c70c79dbc5d9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 23 10:34:19 2016 +0200

    Install the /usr/share/java jars with maven-repo-helper
---
 debian/changelog           | 1 +
 debian/install             | 5 +----
 debian/proguard.poms       | 7 +++++--
 debian/scripts/proguardgui | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff62db7..7a6b2fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ 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
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 23 Sep 2016 09:22:37 +0200
 
diff --git a/debian/install b/debian/install
index 5062b44..af84afa 100644
--- a/debian/install
+++ b/debian/install
@@ -1,5 +1,2 @@
-lib/proguard.jar /usr/share/java
-lib/proguardgui.jar /usr/share/java
-lib/retrace.jar /usr/share/java
-debian/scripts/proguard /usr/bin
+debian/scripts/proguard    /usr/bin
 debian/scripts/proguardgui /usr/bin
diff --git a/debian/proguard.poms b/debian/proguard.poms
index af5d061..af392db 100644
--- a/debian/proguard.poms
+++ b/debian/proguard.poms
@@ -1,2 +1,5 @@
-buildscripts/maven/gradle/pom.xml --has-package-version --no-parent --artifact=lib/proguard.jar
-buildscripts/maven/base/pom.xml --has-package-version --no-parent --artifact=lib/proguard.jar
+buildscripts/maven/pom.xml
+buildscripts/maven/base/pom.xml    --has-package-version --java-lib --artifact=lib/proguard.jar --usj-name=proguard
+buildscripts/maven/gradle/pom.xml  --has-package-version --artifact=lib/proguard.jar
+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
diff --git a/debian/scripts/proguardgui b/debian/scripts/proguardgui
index 6b06551..5dd7476 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/proguardgui.jar proguard.gui.ProGuardGUI "$@"
+exec java -Xss300000 -cp /usr/share/java/proguard.jar:/usr/share/java/proguard-gui.jar proguard.gui.ProGuardGUI "$@"

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