diff -Nru bugsquish-0.0.6/debian/changelog bugsquish-0.0.6/debian/changelog --- bugsquish-0.0.6/debian/changelog 2011-09-04 14:59:16.000000000 +0000 +++ bugsquish-0.0.6/debian/changelog 2014-10-23 19:48:44.000000000 +0000 @@ -1,6 +1,14 @@ +bugsquish (0.0.6-8) unstable; urgency=low + + * do not install upstream changeglog twice + * updated Standards-Version to 3.9.6 (no changes) + * enable hardening with dpkg buildflags and debhelper 9 + + -- Christian T. Steigies Thu, 23 Oct 2014 21:48:44 +0200 + bugsquish (0.0.6-7) unstable; urgency=low - * add ${misc-Depends} to dependencies of luola-levels + * add ${misc:Depends} to dependencies * add build-arch and build-indep targets * remove call to deprecated dh_desktop * remove duplicate "with" from description diff -Nru bugsquish-0.0.6/debian/compat bugsquish-0.0.6/debian/compat --- bugsquish-0.0.6/debian/compat 2011-09-04 14:52:34.000000000 +0000 +++ bugsquish-0.0.6/debian/compat 2014-10-23 19:23:19.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru bugsquish-0.0.6/debian/control bugsquish-0.0.6/debian/control --- bugsquish-0.0.6/debian/control 2011-09-04 14:58:50.000000000 +0000 +++ bugsquish-0.0.6/debian/control 2014-10-23 19:23:12.000000000 +0000 @@ -2,8 +2,11 @@ Section: games Priority: optional Maintainer: Christian T. Steigies -Standards-Version: 3.9.2 -Build-Depends: debhelper (>> 5), libsdl1.2-dev (>=1.2.2-3.1), libsdl-mixer1.2-dev (>=1.2.0-1.1), libsdl-image1.2-dev (>=1.2.0-1.1) +Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9), + libsdl-image1.2-dev (>=1.2.0-1.1), + libsdl-mixer1.2-dev (>=1.2.0-1.1), + libsdl1.2-dev (>=1.2.2-3.1) Package: bugsquish Architecture: any @@ -14,4 +17,4 @@ can't recall. . Bugs are trying to suck blood out of your arm! Squish them with - your fly swatter before you run out of blood. \ No newline at end of file + your fly swatter before you run out of blood. diff -Nru bugsquish-0.0.6/debian/copyright bugsquish-0.0.6/debian/copyright --- bugsquish-0.0.6/debian/copyright 2011-09-04 14:52:34.000000000 +0000 +++ bugsquish-0.0.6/debian/copyright 2014-10-23 19:12:08.000000000 +0000 @@ -9,5 +9,5 @@ Bug Squish is distributed under the GNU GENERAL PUBLIC LICENSE. -On Debian GNU/Linux systems, the complete text of the GNU General Public -License is found in `/usr/share/common-licenses/GPL'. +On Debian GNU/Linux systems, the complete text of the GNU General Public +License is found in `/usr/share/common-licenses/GPL-2'. diff -Nru bugsquish-0.0.6/debian/makefile bugsquish-0.0.6/debian/makefile --- bugsquish-0.0.6/debian/makefile 1970-01-01 00:00:00.000000000 +0000 +++ bugsquish-0.0.6/debian/makefile 2011-09-04 15:03:23.000000000 +0000 @@ -0,0 +1,22 @@ +Description: patch upstream Makefile + Add DEB_CFLAGS to CFLAGS. + . + The person named in the Author field signed this changelog entry. +Author: Christian T. Steigies +Last-Update: 2011-09-04 + +--- bugsquish-0.0.6.orig/Makefile ++++ bugsquish-0.0.6/Makefile +@@ -18,11 +18,9 @@ DATA_PREFIX=/usr/share/bugsquish/ + TARGET=bugsquish + TARGET_DEF=LINUX + +- +-CFLAGS=-Wall -O2 $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \ ++CFLAGS= $(DEB_CFLAGS) $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \ + -D$(NOSOUNDFLAG) -D$(TARGET_DEF) + +- + # Other definitions: + + MIXER=-lSDL_mixer diff -Nru bugsquish-0.0.6/debian/patches/makefile bugsquish-0.0.6/debian/patches/makefile --- bugsquish-0.0.6/debian/patches/makefile 2011-09-04 15:03:23.000000000 +0000 +++ bugsquish-0.0.6/debian/patches/makefile 2014-10-23 20:04:52.000000000 +0000 @@ -1,13 +1,11 @@ Description: patch upstream Makefile - Add DEB_CFLAGS to CFLAGS. - . - The person named in the Author field signed this changelog entry. + Add DEB_CFLAGS to CFLAGS, add DEB_LDFLAGS to SDL_LIB so that hardening + flags are used. Author: Christian T. Steigies -Last-Update: 2011-09-04 - ---- bugsquish-0.0.6.orig/Makefile -+++ bugsquish-0.0.6/Makefile -@@ -18,11 +18,9 @@ DATA_PREFIX=/usr/share/bugsquish/ +Last-Update: 2014-10-23 +--- a/Makefile ++++ b/Makefile +@@ -18,17 +18,15 @@ TARGET=bugsquish TARGET_DEF=LINUX @@ -20,3 +18,10 @@ # Other definitions: MIXER=-lSDL_mixer + IMAGE=-lSDL_image + NOSOUNDFLAG=__SOUND +-SDL_LIB=$(SDL_LDFLAGS) $(MIXER) $(IMAGE) ++SDL_LIB=$(SDL_LDFLAGS) $(MIXER) $(IMAGE) $(DEB_LDFLAGS) + SDL_CFLAGS := $(shell sdl-config --cflags) + SDL_LDFLAGS := $(shell sdl-config --libs) + diff -Nru bugsquish-0.0.6/debian/patches/series bugsquish-0.0.6/debian/patches/series --- bugsquish-0.0.6/debian/patches/series 2011-09-04 15:00:12.000000000 +0000 +++ bugsquish-0.0.6/debian/patches/series 2014-10-22 21:53:51.000000000 +0000 @@ -1 +1 @@ -makefile \ No newline at end of file +makefile diff -Nru bugsquish-0.0.6/debian/rules bugsquish-0.0.6/debian/rules --- bugsquish-0.0.6/debian/rules 2011-09-04 14:58:02.000000000 +0000 +++ bugsquish-0.0.6/debian/rules 2014-10-23 19:57:11.000000000 +0000 @@ -9,11 +9,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - DEB_CFLAGS += -O0 + DEB_CFLAGS = -Wall -g -O0 else - DEB_CFLAGS += -O2 + DEB_CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) + DEB_LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) endif # this is handled automatically by dh_strip #ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) @@ -30,7 +30,9 @@ dh_testdir # Add here commands to compile the package. - $(MAKE) DEB_CFLAGS="$(DEB_CFLAGS)" DATA_PREFIX=$(DESTDIR)/usr/share/games/$(TARGET)/ + $(MAKE) DEB_CFLAGS="$(DEB_CFLAGS)" \ + DEB_LDFLAGS="$(DEB_LDFLAGS)" \ + DATA_PREFIX=$(DESTDIR)/usr/share/games/$(TARGET)/ touch build-stamp @@ -81,7 +83,7 @@ dh_installcron dh_installman debian/bugsquish.6 dh_installinfo - dh_installchangelogs CHANGES.txt + dh_installchangelogs dh_link dh_strip dh_compress diff -Nru bugsquish-0.0.6/debian/rules_cdbs bugsquish-0.0.6/debian/rules_cdbs --- bugsquish-0.0.6/debian/rules_cdbs 2011-09-04 14:52:34.000000000 +0000 +++ bugsquish-0.0.6/debian/rules_cdbs 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#!/usr/bin/make -f - -# do not run checks after build -DEB_BUILD_OPTIONS=nocheck - -# select an install target -DEB_MAKE_INSTALL_TARGET=install \ - DESTDIR=`pwd`/debian/bugsquish \ - BIN_PREFIX=`pwd`/debian/bugsquish/usr/games/ \ - DATA_PREFIX=`pwd`/debian/bugsquish/usr/share/games/bugsquish/data/ - -binary-post-install/bugsquish:: - install -o root -g root -m 644 data/images/bugsquish-icon.xpm \ - debian/bugsquish/usr/X11R6/include/X11/pixmaps/ - -# use the make install target -include /usr/share/cdbs/1/class/makefile.mk - -# This implements the .deb package creation using debhelper. -include /usr/share/cdbs/1/rules/debhelper.mk -