Bug#680057: unblock: fracplanet/0.4.0-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider unblocking package fracplanet/0.4.0-3
The version fixes FTBFS 653584 caused by the
configuration target being phony by mistake.
It also makes sure the proper flags are passed,
and calls dpkg-buildflags so the default hardening
flags are used.
unblock fracplanet/0.4.0-3
diff -r -u -N fracplanet_0.4.0-2/debian/changelog fracplanet_0.4.0-3/debian/changelog
--- fracplanet_0.4.0-2/debian/changelog 2012-05-09 04:44:47.000000000 +0200
+++ fracplanet_0.4.0-3/debian/changelog 2012-07-01 16:39:17.000000000 +0200
@@ -1,3 +1,13 @@
+fracplanet (0.4.0-3) unstable; urgency=low
+
+ * QA upload.
+ * fix configure calling
+ - use proper stamp file, avoiding recompilation (Closes: 653584)
+ - use dpkg-buildflags
+ - use correct variables to pass flags (thus respecting DEB_BUILD_OPTIONS)
+
+ -- Bernhard R. Link <brlink@debian.org> Sun, 01 Jul 2012 16:36:55 +0200
+
fracplanet (0.4.0-2) unstable; urgency=low
* QA upload.
diff -r -u -N fracplanet_0.4.0-2/debian/rules fracplanet_0.4.0-3/debian/rules
--- fracplanet_0.4.0-2/debian/rules 2010-04-09 16:16:23.000000000 +0200
+++ fracplanet_0.4.0-3/debian/rules 2012-07-01 17:01:00.000000000 +0200
@@ -2,21 +2,34 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+# options needed for qmake (called by ./configure)
+# (set _RELEASE and _DEBUG empty to avoid those overriding what we give,
+# pass CPPFLAGS and CFLAGS and CXXFLAGS,
+# pass CXXFLAGS and LDFLAGS in LFLAGS (it's LFLAGS, not LDFLAGS!)):
+QMAKEOPTIONS := QMAKE_CXXFLAGS_RELEASE='' QMAKE_CXXFLAGS_DEBUG='' \
+ QMAKE_CFLAGS_RELEASE='' QMAKE_CFLAGS_DEBUG='' \
+ QMAKE_CFLAGS='-Wall $(CFLAGS) $(CPPFLAGS)' \
+ QMAKE_CXXFLAGS='-Wall $(CFLAGS) $(CPPFLAGS)' \
+ QMAKE_LFLAGS='$(CXXFLAGS) $(LDFLAGS)'
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
-config.status: configure
+
+configure-stamp: configure
dh_testdir
- QTDIR=/usr/lib/qt4 ./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+ QTDIR=/usr/lib/qt4 ./configure $(QMAKEOPTIONS)
+ touch $@
-build: build-stamp
+build build-arch: build-stamp
+build-indep:
-build-stamp: config.status
+build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch $@
@@ -24,12 +37,12 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
rm -f Makefile usage_text.h
dh_clean
-install: build
+install: build-stamp
dh_testdir
dh_testroot
dh_prep
@@ -39,11 +52,11 @@
cp debian/fracplanet.desktop debian/fracplanet/usr/share/applications/
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs
@@ -60,4 +73,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install
Reply to: