Bug#870761: micropolis-activity FTCBFS: uses the build architecture strip

[Helmut Grohne]

Source: micropolis-activity
Version: 0.0.20071228-8
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

micropolis-activity's build systems strips both at build time (via an
explicit strip invocation) and at installation time (via install -s).
Since both use the build architecture strip, micropolis-activity fails
to cross build from source. Stripping also breaks generation of -dbgsym
packages. The attached patch removes such stripping and makes a cross
build succeed. Please consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru micropolis-activity-0.0.20071228/debian/changelog micropolis-activity-0.0.20071228/debian/changelog
--- micropolis-activity-0.0.20071228/debian/changelog	2015-10-31 23:23:42.000000000 +0100
+++ micropolis-activity-0.0.20071228/debian/changelog	2017-08-04 21:54:04.000000000 +0200
@@ -1,3 +1,10 @@
+micropolis-activity (0.0.20071228-8.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Do not strip during build or install. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Fri, 04 Aug 2017 21:54:04 +0200
+
 micropolis-activity (0.0.20071228-8) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru micropolis-activity-0.0.20071228/debian/patches/makefile.patch micropolis-activity-0.0.20071228/debian/patches/makefile.patch
--- micropolis-activity-0.0.20071228/debian/patches/makefile.patch	2015-10-31 23:23:42.000000000 +0100
+++ micropolis-activity-0.0.20071228/debian/patches/makefile.patch	2017-08-04 21:53:59.000000000 +0200
@@ -48,7 +48,7 @@
 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,14 +58,16 @@
  #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
 +++ b/src/tcl/makefile
 @@ -24,10 +24,11 @@
  
  TCL_LIBRARY =	/usr/local/lib/tcl
@@ -248,3 +250,15 @@
  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
+ 	@#