[micropolis-activity] 09/09: Fix FTCBFS: uses the build architecture strip

[Markus Koschany]

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

apo pushed a commit to branch master
in repository micropolis-activity.

commit 63f8c9ebc65d594041d33c9309e0b9e0abbeb744
Author: Markus Koschany <apo at debian.org>
Date:   Tue Mar 13 21:52:19 2018 +0100

    Fix FTCBFS: uses the build architecture strip
---
 debian/changelog              |  3 +++
 debian/patches/makefile.patch | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bcb510b..f6adb28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ micropolis-activity (0.0.20071228-9) unstable; urgency=medium
   [ Christoph Egger ]
   * Remove myself from uploaders
 
+  [Helmut Grohne ]
+  * Fix FTCBFS: Do not strip during build or install. (Closes: #870761)
+
   [ Markus Koschany ]
   * Add glibc-2.27.patch and fix FTBFS with glibc 2.27. (Closes: #891338)
   * Use compat level 11.
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 5fdb17f..cd90b07 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -48,7 +48,7 @@ diff --git a/src/sim/makefile b/src/sim/makefile
 index bdf5847..a09c6f5 100644
 --- a/src/sim/makefile
 +++ b/src/sim/makefile
-@@ -23,10 +23,12 @@ OPTFLAGS = -O3
+@@ -23,11 +23,13 @@
  DEFINES = -DIS_LINUX -DORIGINAL_MONSTER_BEHAVIOUR #-DNO_AIRCRASH
  
  CFLAGS += $(OPTFLAGS) $(DEFINES) -Wall
@@ -58,10 +58,12 @@ index bdf5847..a09c6f5 100644
  #LDFLAGS = -Bstatic
  LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib
 -
+-INSTALL = install -s
 +LDFLAGS += `dpkg-buildflags --get LDFLAGS`
- INSTALL = install -s
++INSTALL = install
  
  INCLUDES = \
+ 	-Iheaders \
 diff --git a/src/tcl/makefile b/src/tcl/makefile
 index 006b435..d38642e 100644
 --- a/src/tcl/makefile
@@ -248,3 +250,15 @@ index 344c37c..1f606d5 100644
  WIDGOBJS = \
  	tkbutton.o \
  	tkentry.o \
+Index: micropolis-activity-0.0.20071228/Makefile
+===================================================================
+--- micropolis-activity-0.0.20071228.orig/Makefile
++++ micropolis-activity-0.0.20071228/Makefile
+@@ -31,7 +31,6 @@
+ 
+ res/sim: src/sim/sim
+ 	cp src/sim/sim $@
+-	strip $@
+ 
+ src/sim/sim: tcl tk tclx sim
+ 	@#

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