[proguard] 01/05: Packaged the library, the CLI and the GUI separately (Closes: #840317, #846463)

[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 fdc67b4347d1e814e2aff6d3b312c59bafc483d8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 12 02:03:21 2016 +0100

    Packaged the library, the CLI and the GUI separately (Closes: #840317, #846463)
---
 debian/changelog                         |  8 +++++
 debian/control                           | 52 +++++++++++++++++++++++++++++---
 debian/libproguard-java.links            |  1 +
 debian/proguard-cli.install              |  1 +
 debian/{install => proguard-gui.install} |  2 --
 debian/proguard.poms                     |  3 +-
 6 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63a5939..6d8c136 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+proguard (5.3.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Packaged the library, the CLI and the GUI separately
+    (Closes: #840317, #846463)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 12 Dec 2016 01:47:06 +0100
+
 proguard (5.3.1-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 605d0ad..6b46107 100644
--- a/debian/control
+++ b/debian/control
@@ -18,13 +18,57 @@ Homepage: http://proguard.sourceforge.net
 
 Package: proguard
 Architecture: all
-Depends:
- default-jre | java5-runtime,
- ${misc:Depends}
-Description: java class file shrinker, optimizer, and obfuscator
+Depends: ${misc:Depends}, proguard-cli, proguard-gui
+Description: Java class file shrinker, optimizer, and obfuscator
  ProGuard is a free Java class file shrinker, optimizer, and
  obfuscator.  It can detect and remove unused classes, fields,
  methods, and attributes. It can then optimize bytecode and remove
  unused instructions. Finally, it can rename the remaining classes,
  fields, and methods using short meaningless names. The resulting jars
  are smaller and harder to reverse-engineer.
+
+Package: proguard-cli
+Architecture: all
+Depends: default-jre-headless | java5-runtime-headless, libproguard-java, ${misc:Depends}
+Breaks: proguard (<< 5.3.2-1~)
+Replaces: proguard (<< 5.3.2-1~)
+Description: Java class file shrinker, optimizer, and obfuscator (CLI)
+ ProGuard is a free Java class file shrinker, optimizer, and
+ obfuscator.  It can detect and remove unused classes, fields,
+ methods, and attributes. It can then optimize bytecode and remove
+ unused instructions. Finally, it can rename the remaining classes,
+ fields, and methods using short meaningless names. The resulting jars
+ are smaller and harder to reverse-engineer.
+ .
+ This package contains the Proguard command line tool.
+
+Package: proguard-gui
+Architecture: all
+Depends: default-jre | java5-runtime, libproguard-java, ${misc:Depends}
+Breaks: proguard (<< 5.3.2-1~)
+Replaces: proguard (<< 5.3.2-1~)
+Description: Java class file shrinker, optimizer, and obfuscator (GUI)
+ ProGuard is a free Java class file shrinker, optimizer, and
+ obfuscator.  It can detect and remove unused classes, fields,
+ methods, and attributes. It can then optimize bytecode and remove
+ unused instructions. Finally, it can rename the remaining classes,
+ fields, and methods using short meaningless names. The resulting jars
+ are smaller and harder to reverse-engineer.
+ .
+ This package contains the Proguard desktop application.
+
+Package: libproguard-java
+Architecture: all
+Section: java
+Depends: ${misc:Depends}
+Breaks: proguard (<< 5.3.2-1~)
+Replaces: proguard (<< 5.3.2-1~)
+Description: Java class file shrinker, optimizer, and obfuscator (Library)
+ ProGuard is a free Java class file shrinker, optimizer, and
+ obfuscator.  It can detect and remove unused classes, fields,
+ methods, and attributes. It can then optimize bytecode and remove
+ unused instructions. Finally, it can rename the remaining classes,
+ fields, and methods using short meaningless names. The resulting jars
+ are smaller and harder to reverse-engineer.
+ .
+ This package contains the Proguard Java library
diff --git a/debian/libproguard-java.links b/debian/libproguard-java.links
new file mode 100644
index 0000000..78ee5db
--- /dev/null
+++ b/debian/libproguard-java.links
@@ -0,0 +1 @@
+usr/share/java/proguard-retrace.jar /usr/share/java/retrace.jar
diff --git a/debian/proguard-cli.install b/debian/proguard-cli.install
new file mode 100644
index 0000000..b933b68
--- /dev/null
+++ b/debian/proguard-cli.install
@@ -0,0 +1 @@
+debian/scripts/proguard    /usr/bin
diff --git a/debian/install b/debian/proguard-gui.install
similarity index 50%
rename from debian/install
rename to debian/proguard-gui.install
index 2413dae..9130dae 100644
--- a/debian/install
+++ b/debian/proguard-gui.install
@@ -1,4 +1,2 @@
 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 cebfe1c..6af3934 100644
--- a/debian/proguard.poms
+++ b/debian/proguard.poms
@@ -1 +1,2 @@
-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
+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 --package=libproguard-java
+buildscripts/maven/retrace/pom.xml --no-parent --has-package-version --java-lib --artifact=lib/retrace.jar --package=libproguard-java

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