Bug#678804: NMU diff

Attached

Steve McIntyre, Cambridge, UK. steve@einval.com
"Because heaters aren't purple!" -- Catherine Pitt


diff -u maelstrom-1.4.3-L3.0.6+main/debian/changelog maelstrom-1.4.3-L3.0.6+main/debian/changelog
maelstrom-1.4.3-L3.0.6+main/debian/changelog
+++ maelstrom-1.4.3-L3.0.6+main/debian/changelog
@@ -1,3 +1,10 @@
+maelstrom (1.4.3-L3.0.6+main-1+nmu1) unstable; urgency=low
+
+ * Fix FTBFS on armhf: build all sources with consistent build flags.
+ Closes: #678804
+
+ -- Steve McIntyre <93sam@debian.org> Mon, 02 Jul 2012 17:10:41 +0100
+
maelstrom (1.4.3-L3.0.6+main-1) unstable; urgency=low

* fix several lintian bugs
only in patch2:
unchanged:
maelstrom-1.4.3-L3.0.6+main.orig/netlogic/Makefile.in
+++ maelstrom-1.4.3-L3.0.6+main/netlogic/Makefile.in
@@ -90,11 +90,11 @@
liblogic_a_OBJECTS = about.o blit.o game.o logic.o make.o netplay.o \
object.o objects.o player.o
AR = ar
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS) @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
only in patch2:
unchanged:
maelstrom-1.4.3-L3.0.6+main.orig/maclib/Makefile.in
+++ maelstrom-1.4.3-L3.0.6+main/maclib/Makefile.in
@@ -112,11 +112,11 @@
snd2wav_OBJECTS = snd2wav.o
snd2wav_DEPENDENCIES = libSDLmac.a
snd2wav_LDFLAGS =
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS) @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
only in patch2:
unchanged:
maelstrom-1.4.3-L3.0.6+main.orig/screenlib/Makefile.in
+++ maelstrom-1.4.3-L3.0.6+main/screenlib/Makefile.in
@@ -89,11 +89,11 @@
libSDLscreen_a_LIBADD =
libSDLscreen_a_OBJECTS = SDL_FrameBuf.o pixel.o
AR = ar
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS) @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@





To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org