r13886 - packages/trunk/pianobooster/debian

[Miriam Ruiz]

Author: miriam
Date: 2012-12-03 23:57:05 +0000 (Mon, 03 Dec 2012)
New Revision: 13886

Modified:
   packages/trunk/pianobooster/debian/changelog
   packages/trunk/pianobooster/debian/compat
   packages/trunk/pianobooster/debian/control
   packages/trunk/pianobooster/debian/rules
Log:
New upstream release (fixing minor bugs), and some bug corrections



Modified: packages/trunk/pianobooster/debian/changelog
===================================================================
--- packages/trunk/pianobooster/debian/changelog	2012-11-26 00:27:03 UTC (rev 13885)
+++ packages/trunk/pianobooster/debian/changelog	2012-12-03 23:57:05 UTC (rev 13886)
@@ -1,3 +1,21 @@
+pianobooster (0.6.4b-1) UNRELEASED; urgency=low
+
+  [ Miriam Ruiz ]
+  * New upstream release
+  * Upgraded Standards-Version from 3.9.2 to 3.9.3
+  * Upgraded debian/compat to 9.
+  * Modified debian/rules to use fortified libc functions.
+    See: http://wiki.debian.org/Hardening
+  * Changed my email address in debian/control to miriam at debian.org
+
+  [ Martin Erik Werner ]
+  * Use -DCMAKE_BUILD_TYPE=Debug to get a better debug package. Closes: #664473
+
+  [ Paul Wise ]
+  * Install a MIDI synthesizer and sounds by default. Closes: #650700
+
+ -- Miriam Ruiz <miriam at debian.org>  Tue, 04 Dec 2012 00:44:18 +0100
+
 pianobooster (0.6.4-3) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/pianobooster/debian/compat
===================================================================
--- packages/trunk/pianobooster/debian/compat	2012-11-26 00:27:03 UTC (rev 13885)
+++ packages/trunk/pianobooster/debian/compat	2012-12-03 23:57:05 UTC (rev 13886)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/pianobooster/debian/control
===================================================================
--- packages/trunk/pianobooster/debian/control	2012-11-26 00:27:03 UTC (rev 13885)
+++ packages/trunk/pianobooster/debian/control	2012-12-03 23:57:05 UTC (rev 13886)
@@ -2,11 +2,11 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 7), cmake, dh-buildinfo, quilt,
+Uploaders: Miriam Ruiz <miriam at debian.org>
+Build-Depends: debhelper (>= 9), cmake, dh-buildinfo, quilt,
  qt4-qmake, libqt4-dev, libqt4-opengl-dev,
  mesa-common-dev, libglu1-mesa-dev, libasound2-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://pianobooster.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pianobooster/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pianobooster/?op=log
@@ -14,6 +14,7 @@
 Package: pianobooster
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: fluidsynth | timidity
 Suggests: pianobooster-dbg (= ${binary:Version})
 Description: learn the piano just by playing a game
  Piano Booster is a new way to learn the piano just by playing a game. 

Modified: packages/trunk/pianobooster/debian/rules
===================================================================
--- packages/trunk/pianobooster/debian/rules	2012-11-26 00:27:03 UTC (rev 13885)
+++ packages/trunk/pianobooster/debian/rules	2012-12-03 23:57:05 UTC (rev 13886)
@@ -3,6 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS2:=-Wl,-z,defs  -Wl,-as-needed -Wl,--no-undefined
+
 BUILD_TREE=$(CURDIR)/build-tree
 
 config: config-stamp
@@ -14,16 +20,17 @@
 	mkdir $(BUILD_TREE)
 	cd $(BUILD_TREE); cmake $(CURDIR)/src/ \
 		--debug-output \
+		-DCMAKE_BUILD_TYPE=Debug \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
-		-DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \
+		-DCMAKE_C_FLAGS:STRING="$(CFLAGS) $(CPPFLAGS)" \
+		-DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS) $(CPPFLAGS)" \
 		-DBUILD_STATIC:BOOL=ON \
-		-DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined" \
-		-DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined" \
+		-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" \
+		-DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" \
 		-DCMAKE_INSTALL_RPATH:STRING="/usr/lib/games/pianobooster"
 	touch $@
 
-build: build-stamp
 build-stamp: config
 	dh_testdir
 	cd $(BUILD_TREE); $(MAKE)
@@ -32,8 +39,10 @@
 
 build-indep:
 
-build-arch: build
+build-arch: build-stamp
 
+build: build-arch build-indep
+
 clean: 
 	dh_testdir
 	dh_testroot