r14308 - in packages/trunk/sdl-ball/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2013-06-23 11:57:25 +0000 (Sun, 23 Jun 2013)
New Revision: 14308

Added:
   packages/trunk/sdl-ball/debian/patches/honour-cppflags.patch
Modified:
   packages/trunk/sdl-ball/debian/changelog
   packages/trunk/sdl-ball/debian/compat
   packages/trunk/sdl-ball/debian/control
   packages/trunk/sdl-ball/debian/patches/series
   packages/trunk/sdl-ball/debian/rules
Log:
dh9 + hardening


Modified: packages/trunk/sdl-ball/debian/changelog
===================================================================
--- packages/trunk/sdl-ball/debian/changelog	2013-06-23 11:52:46 UTC (rev 14307)
+++ packages/trunk/sdl-ball/debian/changelog	2013-06-23 11:57:25 UTC (rev 14308)
@@ -4,6 +4,8 @@
     Thanks: Juhani Numminen <juhaninumminen0 at gmail.com>
     Closes: #701355
   * Use canonical URLs in Vcs-* entries.
+  * Use debhelper 9 compat.
+  * Honour CPPFLAGS from dpkg-buildflags to properly harden the build.
 
  -- Evgeni Golov <evgeni at debian.org>  Sun, 23 Jun 2013 12:59:25 +0200
 

Modified: packages/trunk/sdl-ball/debian/compat
===================================================================
--- packages/trunk/sdl-ball/debian/compat	2013-06-23 11:52:46 UTC (rev 14307)
+++ packages/trunk/sdl-ball/debian/compat	2013-06-23 11:57:25 UTC (rev 14308)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/sdl-ball/debian/control
===================================================================
--- packages/trunk/sdl-ball/debian/control	2013-06-23 11:52:46 UTC (rev 14307)
+++ packages/trunk/sdl-ball/debian/control	2013-06-23 11:57:25 UTC (rev 14308)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), imagemagick,
+Build-Depends: debhelper (>= 9), imagemagick,
  libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev
 Standards-Version: 3.9.3

Added: packages/trunk/sdl-ball/debian/patches/honour-cppflags.patch
===================================================================
--- packages/trunk/sdl-ball/debian/patches/honour-cppflags.patch	                        (rev 0)
+++ packages/trunk/sdl-ball/debian/patches/honour-cppflags.patch	2013-06-23 11:57:25 UTC (rev 14308)
@@ -0,0 +1,15 @@
+Subject: Honour CPPFLAGS
+From: Evgeni Golov <evgeni at debian.org>
+Last-Update: 2013-06-23
+
+--- sdl-ball-1.01.orig/Makefile
++++ sdl-ball-1.01/Makefile
+@@ -21,7 +21,7 @@ $(EXECUTABLE): $(OBJECTS)
+ 	$(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ 
+ .cpp.o:
+-	$(CC) $(CFLAGS) $< -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@
+ 
+ clean:
+ 	rm -f *.o sdl-ball

Modified: packages/trunk/sdl-ball/debian/patches/series
===================================================================
--- packages/trunk/sdl-ball/debian/patches/series	2013-06-23 11:52:46 UTC (rev 14307)
+++ packages/trunk/sdl-ball/debian/patches/series	2013-06-23 11:57:25 UTC (rev 14308)
@@ -1,3 +1,4 @@
 gcc-4.7-ftbfs.patch
 gcc-4.8-ftbfs.patch
 typo.patch
+honour-cppflags.patch

Modified: packages/trunk/sdl-ball/debian/rules
===================================================================
--- packages/trunk/sdl-ball/debian/rules	2013-06-23 11:52:46 UTC (rev 14307)
+++ packages/trunk/sdl-ball/debian/rules	2013-06-23 11:57:25 UTC (rev 14308)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export LDFLAGS=-Wl,-z,defs -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed
 export DATADIR=/usr/share/games/sdl-ball/
 
 %: