[redeclipse] 05/23: Add (upstream) patch to fix binary name in install

[Martin Werner]

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

arand-guest pushed a commit to branch next
in repository redeclipse.

commit c96907b734ee6384cc47d5c59b39093c6158d0e6
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Tue Mar 31 12:23:46 2015 +0200

    Add (upstream) patch to fix binary name in install
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 .../patches/system-install-Fix-binary-name.patch   | 29 ++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 827db18..dd4afee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ redeclipse (1.5.0-1) UNRELEASED; urgency=medium
   * Drop upstreamed patches
     - Delete don-t-check-for-keymap-when-using-standalone.patch
     - Delete gnu-link-rt.patch
+  * Add (upstream) patch to fix binary name in install
+    - Add system-install-Fix-binary-name.patch
 
  -- Martin Erik Werner <martinerikwerner at gmail.com>  Sun, 29 Mar 2015 16:02:22 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index f525da9..d0c4877 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 windowed-by-default.patch
 build-with-system-enet.patch
+system-install-Fix-binary-name.patch
diff --git a/debian/patches/system-install-Fix-binary-name.patch b/debian/patches/system-install-Fix-binary-name.patch
new file mode 100644
index 0000000..a763fee
--- /dev/null
+++ b/debian/patches/system-install-Fix-binary-name.patch
@@ -0,0 +1,29 @@
+From 91e32211548fbf11a118c8961c609486ca0e6f31 Mon Sep 17 00:00:00 2001
+From: Martin Erik Werner <martinerikwerner at gmail.com>
+Date: Tue, 31 Mar 2015 12:11:53 +0200
+Subject: [PATCH] system-install: Fix binary name
+
+Since the main makefile now produces binaries with suffixes in src/,
+make sure the system-install targets use these filenames.
+---
+ src/system-install.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/system-install.mk b/src/system-install.mk
+index 568df6a..e6eae10 100644
+--- a/src/system-install.mk
++++ b/src/system-install.mk
+@@ -2,8 +2,8 @@ appname=$(APPNAME)
+ appnamefull=$(shell sed -n 's/.define VERSION_NAME *"\([^"]*\)"/\1/p' version.h)
+ appsrcname=$(APPNAME)
+ cappname=$(shell echo $(appname) | tr '[:lower:]' '[:upper:]')# Captial appname
+-appclient=$(APPCLIENT)
+-appserver=$(APPSERVER)
++appclient=$(APPCLIENT)$(APPMODIFIER)$(BIN_SUFFIX)
++appserver=$(APPSERVER)$(APPMODIFIER)$(BIN_SUFFIX)
+ 
+ prefix=/usr/local
+ games=
+-- 
+2.1.4
+

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