[med-svn] [Git][med-team/edfbrowser][master] 2 commits: fix dh_auto_configure overriding

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / edfbrowser


Commits:
214f24b1 by Andreas Tille at 2018-12-01T06:17:09Z
fix dh_auto_configure overriding

- - - - -
cbc10d89 by Andreas Tille at 2018-12-01T06:24:55Z
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+edfbrowser (1.66+dfsg-2) unstable; urgency=medium
+
+  * fix dh_auto_configure overriding (thanks for the patch to Pino Toscano)
+    Closes: #914937
+
+ -- Andreas Tille <tille at debian.org>  Sat, 01 Dec 2018 07:17:28 +0100
+
 edfbrowser (1.66+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/rules
=====================================
@@ -5,37 +5,19 @@
 # export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE  )
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE )
-DEB_BUILD_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS  )
-ARCH                := $(shell dpkg-architecture -qDEB_BUILD_ARCH     )
-
-Q_LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-export Q_LDFLAGS
-
-# of course, qmake wants to do it its own way
-QMAKE_CXXFLAGS += $(CPPFLAGS) -Wall -Wshadow -Wextra -ggdb3
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  QMAKE_CXXFLAGS_RELEASE = -O0
-else
-  QMAKE_CXXFLAGS_RELEASE = -O2
-endif
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+export DEB_CXXFLAGS_MAINT_APPEND := -Wall -Wshadow -Wextra -ggdb3
 
 export QT_SELECT=qt5
 
 %:
 	dh $@
 
-override_dh_auto_build:
-	qmake -makefile -after \
-		QMAKE_CXXFLAGS="$(QMAKE_CXXFLAGS)" \
-		QMAKE_CXXFLAGS_RELEASE="$(QMAKE_CXXFLAGS_RELEASE)" \
-		QMAKE_LFLAGS="$(Q_LDFLAGS)"
+override_dh_auto_configure:
+	dh_auto_configure
 	# libpthread is only used indirectly; no need for linking against it
 	sed -i -e 's/-lpthread//' Makefile
 
-	$(MAKE)
-
 override_dh_clean:
 	test ! -f Makefile  ||  $(MAKE) distclean
 	dh_clean



View it on GitLab: https://salsa.debian.org/med-team/edfbrowser/compare/2d25bed21b97a2c9df41f09a6ba3746aade4c647...cbc10d89887b2413b238c35b31de348b8913d976

-- 
View it on GitLab: https://salsa.debian.org/med-team/edfbrowser/compare/2d25bed21b97a2c9df41f09a6ba3746aade4c647...cbc10d89887b2413b238c35b31de348b8913d976
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181201/c4d4690f/attachment-0001.html>