diff -Nru sdl-ball-1.01/debian/changelog sdl-ball-1.01/debian/changelog --- sdl-ball-1.01/debian/changelog 2012-05-27 10:55:18.000000000 +0000 +++ sdl-ball-1.01/debian/changelog 2013-06-23 12:09:04.000000000 +0000 @@ -1,3 +1,16 @@ +sdl-ball (1.01-4) unstable; urgency=low + + * Fix FTBFS with gcc 4.8 due to stray ‘,’. + Thanks: Juhani Numminen + Closes: #701355 + * Use canonical URLs in Vcs-* entries. + * Use debhelper 9 compat. + * Honour CPPFLAGS from dpkg-buildflags to properly harden the build. + * Standards-Version: 3.9.4 + * Improve the desktop file. + + -- Evgeni Golov Sun, 23 Jun 2013 14:09:01 +0200 + sdl-ball (1.01-3) unstable; urgency=low * Fix FTBFS due to wrong use of the override targets of dh. diff -Nru sdl-ball-1.01/debian/compat sdl-ball-1.01/debian/compat --- sdl-ball-1.01/debian/compat 2008-11-12 13:42:40.000000000 +0000 +++ sdl-ball-1.01/debian/compat 2013-06-23 11:57:25.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru sdl-ball-1.01/debian/control sdl-ball-1.01/debian/control --- sdl-ball-1.01/debian/control 2012-05-14 20:11:09.000000000 +0000 +++ sdl-ball-1.01/debian/control 2013-06-23 11:58:35.000000000 +0000 @@ -3,13 +3,13 @@ Priority: optional Maintainer: Debian Games Team Uploaders: Evgeni Golov -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 +Standards-Version: 3.9.4 Homepage: http://sdl-ball.sourceforge.net/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/sdl-ball/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/sdl-ball/ +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/sdl-ball/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/sdl-ball/ Package: sdl-ball Architecture: any diff -Nru sdl-ball-1.01/debian/patches/gcc-4.8-ftbfs.patch sdl-ball-1.01/debian/patches/gcc-4.8-ftbfs.patch --- sdl-ball-1.01/debian/patches/gcc-4.8-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ sdl-ball-1.01/debian/patches/gcc-4.8-ftbfs.patch 2013-06-23 11:29:02.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix FTBFS with gcc-4.8 by removing stray ‘,’ +Author: Juhani Numminen +Bug-Debian: http://bugs.debian.org/701355 +Last-Update: 2013-06-06 + +--- sdl-ball-1.01.orig/main.cpp ++++ sdl-ball-1.01/main.cpp +@@ -1420,7 +1420,7 @@ int LinesCross(float x0,float y0,float x + //Leaves an trail of the ball + class tracer { + private: +- GLfloat x[100], y[100], r[100], g[100], b[100], a[100],s[100], cr,cg,cb,; ++ GLfloat x[100], y[100], r[100], g[100], b[100], a[100],s[100], cr,cg,cb; + bool active[100]; + int color; + GLfloat lastX, lastY; //Last position where we spawned one diff -Nru sdl-ball-1.01/debian/patches/honour-cppflags.patch sdl-ball-1.01/debian/patches/honour-cppflags.patch --- sdl-ball-1.01/debian/patches/honour-cppflags.patch 1970-01-01 00:00:00.000000000 +0000 +++ sdl-ball-1.01/debian/patches/honour-cppflags.patch 2013-06-23 11:57:25.000000000 +0000 @@ -0,0 +1,15 @@ +Subject: Honour CPPFLAGS +From: Evgeni Golov +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 diff -Nru sdl-ball-1.01/debian/patches/series sdl-ball-1.01/debian/patches/series --- sdl-ball-1.01/debian/patches/series 2012-05-15 05:09:49.000000000 +0000 +++ sdl-ball-1.01/debian/patches/series 2013-06-23 11:57:25.000000000 +0000 @@ -1,2 +1,4 @@ gcc-4.7-ftbfs.patch +gcc-4.8-ftbfs.patch typo.patch +honour-cppflags.patch diff -Nru sdl-ball-1.01/debian/rules sdl-ball-1.01/debian/rules --- sdl-ball-1.01/debian/rules 2012-05-27 10:56:08.000000000 +0000 +++ sdl-ball-1.01/debian/rules 2013-06-23 11:57:25.000000000 +0000 @@ -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/ %: diff -Nru sdl-ball-1.01/debian/sdl-ball.desktop sdl-ball-1.01/debian/sdl-ball.desktop --- sdl-ball-1.01/debian/sdl-ball.desktop 2008-11-12 13:42:40.000000000 +0000 +++ sdl-ball-1.01/debian/sdl-ball.desktop 2013-06-23 12:04:17.000000000 +0000 @@ -6,3 +6,4 @@ Terminal=false Type=Application Categories=Game;ArcadeGame; +Keywords=DX-Ball;MegaBall;Breakout;Arkanoid;Arcade;Puzzle;