[SCM] Packaging for libqglviewer. OpenGL 3D viewer library branch, master, updated. 934a9b8b6360d70add79aa53e1c613c08e13260b

[Anton Gladky]

The following commit has been merged in the master branch:
commit 2a3db7628a32a9a703cda2ff45d3e76bd64b65b0
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Sep 24 19:34:31 2012 +0200

    Clean in rules-file.

diff --git a/debian/control b/debian/control
index 1fbb5a0..2daa0d0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,15 @@ Maintainer: Artur R. Czechowski <arturcz at hell.pl>
 DM-Upload-Allowed: yes
 Homepage: http://www.libqglviewer.com/
 Standards-Version: 3.9.3
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), libqt4-dev (>= 4:4.8.0~), libqt4-opengl-dev (>= 4:4.8.0~)
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), libqt4-dev (>= 4:4.8.0~),
+ libqt4-opengl-dev (>= 4:4.8.0~)
 
 Package: libqglviewer-dev
 Section: libdevel
 Architecture: any
-Depends: libqglviewer2 (= ${binary:Version}), libqt4-dev, libx11-dev, libxext-dev, libxmu-dev, libgl1-mesa-dev | libgl-dev, libqt4-opengl-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libqglviewer2 (= ${binary:Version}), libqt4-dev, libx11-dev, libxext-dev,
+ libxmu-dev, libgl1-mesa-dev | libgl-dev, libqt4-opengl-dev, ${shlibs:Depends}, 
+ ${misc:Depends}
 Conflicts: libqglviewer-dev-common
 Recommends: libqglviewer-doc
 Description: OpenGL 3D viewer library based on Qt4 - development files
diff --git a/debian/libqglviewer-dev.lintian-overrides b/debian/libqglviewer-dev.lintian-overrides
deleted file mode 100644
index aee5e35..0000000
--- a/debian/libqglviewer-dev.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libqglviewer-dev: hardening-no-stackprotector usr/lib/*/qt4/plugins/designer/libqglviewerplugin.so
diff --git a/debian/libqglviewer2.lintian-overrides b/debian/libqglviewer2.lintian-overrides
deleted file mode 100644
index b7dae97..0000000
--- a/debian/libqglviewer2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libqglviewer2: hardening-no-stackprotector usr/lib/*/libQGLViewer.so.*
diff --git a/debian/rules b/debian/rules
index 9a5baf0..884c734 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,10 @@
 #!/usr/bin/make -f
 
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-CFLAGS += -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+CFLAGS+=-Wall -pedantic -g
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 

-- 
Packaging for libqglviewer. OpenGL 3D viewer library