[gle-graphics] 16/23: Import Debian changes 4.2.4c-6

[Christian T. Steigies]

This is an automated email from the git hooks/post-receive script.

cts pushed a commit to branch master
in repository gle-graphics.

commit 56ab8c575df29aa81f81b82da0b4a30d3eabfaf3
Author: Christian T. Steigies <cts at debian.org>
Date:   Tue Oct 21 21:59:16 2014 +0200

    Import Debian changes 4.2.4c-6
    
    gle-graphics (4.2.4c-6) unstable; urgency=low
    
      * update config.{sub,guess} with autools_dev (closes: #727871, #744438)
      * updated Standards-Version to 3.9.6 (no changes)
      * use debhelper 9 and dpkg-buildflags instead of hardening-wrapper,
        enable hardening on sparc
      * patch qgle.pro.in so that LDFLAGS are used (for hardening)
---
 debian/changelog      | 10 ++++++++++
 debian/compat         |  2 +-
 debian/control        |  7 ++++---
 debian/patches/qmake  | 14 ++++++++++++++
 debian/patches/series |  1 +
 debian/rules          | 26 ++++++--------------------
 6 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3afd41c..5e0a97d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gle-graphics (4.2.4c-6) unstable; urgency=low
+
+  * update config.{sub,guess} with autools_dev (closes: #727871, #744438)
+  * updated Standards-Version to 3.9.6 (no changes)
+  * use debhelper 9 and dpkg-buildflags instead of hardening-wrapper,
+    enable hardening on sparc
+  * patch qgle.pro.in so that LDFLAGS are used (for hardening)
+
+ -- Christian T. Steigies <cts at debian.org>  Tue, 21 Oct 2014 21:59:16 +0200
+
 gle-graphics (4.2.4c-5) unstable; urgency=low
 
   * fix building on hurd-i386 with workaround from #578320
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 0b9ddfd..eaaed0a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,10 @@ Section: graphics
 Priority: optional
 Maintainer: Christian T. Steigies <cts at debian.org>
 Build-Depends: automake,
-               debhelper (>= 8.0.0),
+               autotools-dev,
+               debhelper (>= 9),
+               dh-autoreconf,
                ghostscript,
-               hardening-wrapper,
                libboost-dev,
                libcairo-dev,
                libjpeg-dev,
@@ -19,7 +20,7 @@ Build-Depends: automake,
                pkg-config,
                texlive,
                texlive-latex-extra
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
 Homepage: http://glx.sf.net
 
 Package: gle-graphics
diff --git a/debian/patches/qmake b/debian/patches/qmake
new file mode 100644
index 0000000..0779e07
--- /dev/null
+++ b/debian/patches/qmake
@@ -0,0 +1,14 @@
+Description: qmake uses LFLAGS not LDFLAGS
+ Set QMAKE_LFLAGS so that hardening flags are correctly passed on
+Author: Christian T. Steigies <cts at debian.org>
+Last-Update: 2014-20-21
+--- a/src/gui/qgle.pro.in
++++ b/src/gui/qgle.pro.in
+@@ -182,6 +182,6 @@
+ 
+ QMAKE_CXXFLAGS += @QT_CPPFLAGS@
+ QMAKE_CFLAGS += @QT_CPPFLAGS@
+-QMAKE_LDFLAGS += @QT_LDFLAGS@
++QMAKE_LFLAGS += @QT_LDFLAGS@
+ 
+ # vim:et
diff --git a/debian/patches/series b/debian/patches/series
index 6c25137..bce6c62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 gle.cpp-typo
 kfreebsd-buildd-has-no-proc
+qmake
diff --git a/debian/rules b/debian/rules
index f1f31c8..1411ab2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,23 +2,17 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_BUILD_HARDENING=1
-
-# fix build problems on the sparc buildd
-ifeq ($(DEB_HOST_ARCH),sparc)
-export DEB_BUILD_HARDENING=0
-#export MALLOC_CHECK_=0
-endif
+export DH_VERBOSE=1
 
 # fix build problems on the hurd
 ifeq ($(DEB_HOST_ARCH),hurd-i386)
-CONFIGURE_LIBS = LIBS="-Wl,--no-as-needed -Wl,-lpthread -Wl,--as-needed"
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -Wl,-lpthread -Wl,--as-needed -fPIC
 endif
 
 %:
-	dh $@ 
+#	dh $@ --with autoreconf
+	dh $@ --with autotools_dev
+#	dh $@ --with autotools_dev,autoreconf
 
 override_dh_auto_build:
 	make	
@@ -31,10 +25,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	-autoreconf -vfi
-	./configure --build $(DEB_HOST_GNU_TYPE) \
-		--docdir=/usr/share/doc/gle-graphics/ \
-		--with-rpath=no --with-scripts=no \
-		$(CONFIGURE_LIBS)
+	./configure --build $(DEB_HOST_GNU_TYPE) --docdir=/usr/share/doc/gle-graphics/ --with-rpath=no --with-scripts=no
 
 override_dh_auto_install:
 	dh_auto_install
@@ -42,8 +33,3 @@ override_dh_auto_install:
 	cp debian/manip.1 debian/gle-graphics/usr/share/man/man1/
 # do not ship helper that is only used during build
 	[ ! -f debian/gle-graphics/usr/bin/glebtool ] || rm debian/gle-graphics/usr/bin/glebtool
-
-# do not compress LICENSE.txt as it needs to be read by qgle
-# qgle can now read compressed files
-#override_dh_compress:
-#	dh_compress -X usr/share/doc/gle-graphics/LICENSE.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gle-graphics.git