[proguard] 04/08: No longer use a patch to add the shell scripts

[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 a0d88080b381fbfeb7400ba93823707b9c19ec27
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 23 10:17:01 2016 +0200

    No longer use a patch to add the shell scripts
---
 debian/changelog             |  1 +
 debian/install               |  4 ++--
 debian/patches/add-bin.patch | 18 ------------------
 debian/patches/series        |  1 -
 debian/scripts/proguard      |  3 +++
 debian/scripts/proguardgui   |  3 +++
 6 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63faca2..ff62db7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ proguard (5.3-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
   * Build with Gradle instead of Ant
+  * No longer use a patch to add the shell scripts
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 23 Sep 2016 09:22:37 +0200
 
diff --git a/debian/install b/debian/install
index bd76304..5062b44 100644
--- a/debian/install
+++ b/debian/install
@@ -1,5 +1,5 @@
 lib/proguard.jar /usr/share/java
 lib/proguardgui.jar /usr/share/java
 lib/retrace.jar /usr/share/java
-proguard /usr/bin
-proguardgui /usr/bin
+debian/scripts/proguard /usr/bin
+debian/scripts/proguardgui /usr/bin
diff --git a/debian/patches/add-bin.patch b/debian/patches/add-bin.patch
deleted file mode 100644
index f5ac2aa..0000000
--- a/debian/patches/add-bin.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Creates proguard and proguardgui shell scripts
- This patch adds proguard and proguardgui shell scripts for starting up
- proguard.
-Forwarded: not-needed
-Last-Update: 2012-11-07
-
---- /dev/null
-+++ proguard-4.8/proguard
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+exec java -Xss300000 -jar /usr/share/java/proguard.jar "$@"
---- /dev/null
-+++ proguard-4.8/proguardgui
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+exec java -Xss300000 -cp /usr/share/java/proguard.jar:/usr/share/java/proguardgui.jar proguard.gui.ProGuardGUI "$@"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0dcb4ab..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-add-bin.patch
diff --git a/debian/scripts/proguard b/debian/scripts/proguard
new file mode 100644
index 0000000..ecf507e
--- /dev/null
+++ b/debian/scripts/proguard
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec java -Xss300000 -jar /usr/share/java/proguard.jar "$@"
diff --git a/debian/scripts/proguardgui b/debian/scripts/proguardgui
new file mode 100644
index 0000000..6b06551
--- /dev/null
+++ b/debian/scripts/proguardgui
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+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