[med-svn] r15504 - trunk/packages/edfbrowser/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-12-11 21:14:49 +0000 (Wed, 11 Dec 2013)
New Revision: 15504

Modified:
   trunk/packages/edfbrowser/trunk/debian/changelog
   trunk/packages/edfbrowser/trunk/debian/control
   trunk/packages/edfbrowser/trunk/debian/rules
Log:
canonical Vcs fields; propagate hardening options; upload to unstable


Modified: trunk/packages/edfbrowser/trunk/debian/changelog
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/changelog	2013-12-11 15:40:57 UTC (rev 15503)
+++ trunk/packages/edfbrowser/trunk/debian/changelog	2013-12-11 21:14:49 UTC (rev 15504)
@@ -1,9 +1,12 @@
-edfbrowser (1.53-1) UNRELEASED; urgency=medium
+edfbrowser (1.53-1) unstable; urgency=medium
 
   * New upstream release
+    Closes: #705912
   * debian/control
      - cme fix dpkg-control
      - Priority: optional
+     - canonical Vcs fields
+  * debian/rules: propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Wed, 11 Dec 2013 16:44:12 +0100
 

Modified: trunk/packages/edfbrowser/trunk/debian/control
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/control	2013-12-11 15:40:57 UTC (rev 15503)
+++ trunk/packages/edfbrowser/trunk/debian/control	2013-12-11 21:14:49 UTC (rev 15504)
@@ -8,8 +8,8 @@
                libqt4-dev,
                qt4-qmake
 Standards-Version: 3.9.5
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/edfbrowser/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/edfbrowser/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/edfbrowser/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/edfbrowser/trunk/
 Homepage: http://www.teuniz.net/edfbrowser/
 
 Package: edfbrowser

Modified: trunk/packages/edfbrowser/trunk/debian/rules
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/rules	2013-12-11 15:40:57 UTC (rev 15503)
+++ trunk/packages/edfbrowser/trunk/debian/rules	2013-12-11 21:14:49 UTC (rev 15504)
@@ -7,8 +7,11 @@
 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 $(LDFLAGS)
+QMAKE_CXXFLAGS += $(CPPFLAGS) -Wall -Wshadow -Wextra -ggdb3
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   QMAKE_CXXFLAGS_RELEASE = -O0
 else
@@ -27,8 +30,8 @@
 override_dh_auto_build:
 	qmake-qt4 -makefile -after \
 		QMAKE_CXXFLAGS="$(QMAKE_CXXFLAGS)" \
-		QMAKE_CXXFLAGS_RELEASE="$(QMAKE_CXXFLAGS_RELEASE)"
-
+		QMAKE_CXXFLAGS_RELEASE="$(QMAKE_CXXFLAGS_RELEASE)" \
+		QMAKE_LFLAGS="$(Q_LDFLAGS)"
 	# libpthread is only used indirectly; no need for linking against it
 	sed -i -e 's/-lpthread//' Makefile