r11840 - in packages/trunk/holotz-castle/debian: . patches

[Peter Pentchev]

Author: roam-guest
Date: 2011-02-28 09:10:00 +0000 (Mon, 28 Feb 2011)
New Revision: 11840

Modified:
   packages/trunk/holotz-castle/debian/changelog
   packages/trunk/holotz-castle/debian/patches/02_makefile.patch
Log:
Link with zlib to fix the FTBFS with recent linker versions.

Closes:		#615730
Reported by:	Matthias Klose <doko at debian.org>


Modified: packages/trunk/holotz-castle/debian/changelog
===================================================================
--- packages/trunk/holotz-castle/debian/changelog	2011-02-28 09:04:02 UTC (rev 11839)
+++ packages/trunk/holotz-castle/debian/changelog	2011-02-28 09:10:00 UTC (rev 11840)
@@ -1,3 +1,11 @@
+holotz-castle (1.3.14-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Link with zlib to fix the FTBFS with recent linker versions.
+    Closes: #615730
+
+ -- Peter Pentchev <roam at ringlet.net>  Mon, 28 Feb 2011 10:48:09 +0200
+
 holotz-castle (1.3.14-2) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/holotz-castle/debian/patches/02_makefile.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/02_makefile.patch	2011-02-28 09:04:02 UTC (rev 11839)
+++ packages/trunk/holotz-castle/debian/patches/02_makefile.patch	2011-02-28 09:10:00 UTC (rev 11840)
@@ -1,10 +1,8 @@
 # Copyright (C) 2006, by Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game. See debian/copyright.  
 
-Index: holotz-castle-1.3.11-src/src/Makefile
-===================================================================
---- holotz-castle-1.3.11-src.orig/src/Makefile	2008-08-23 20:36:07.000000000 +0200
-+++ holotz-castle-1.3.11-src/src/Makefile	2008-08-27 19:32:58.000000000 +0200
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -25,7 +25,7 @@
  HC_BASE = /usr/share/games/holotz-castle/
  HC_DATA = $(HC_BASE)game/
@@ -24,3 +22,18 @@
  LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
  
  
+@@ -53,12 +54,12 @@
+ 	g++ $(CFLAGS) $(DEFINES) $< -o $@
+ 
+ HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
+-	g++ $(LDFLAGS) $? -o $@;\
++	g++ $(LDFLAGS) $? -o $@ -lz;\
+ 	mv HC ../holotz-castle
+ 
+ # HCed (Holotz's Castle editor).
+ HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
+-	g++ $(LDFLAGS) $? -o $@;\
++	g++ $(LDFLAGS) $? -o $@ -lz;\
+ 	mv HCed ../holotz-castle-editor
+ 
+ install: