Author: gert-guest Date: 2016-07-08 17:33:52 +0000 (Fri, 08 Jul 2016) New Revision: 22453
Added: trunk/packages/sofa-framework/trunk/debian/patches/hardening.patch Modified: trunk/packages/sofa-framework/trunk/debian/changelog trunk/packages/sofa-framework/trunk/debian/copyright trunk/packages/sofa-framework/trunk/debian/patches/gcc-6.patch trunk/packages/sofa-framework/trunk/debian/patches/series trunk/packages/sofa-framework/trunk/debian/rules Log: update package to fix some lintian warnings Modified: trunk/packages/sofa-framework/trunk/debian/changelog =================================================================== --- trunk/packages/sofa-framework/trunk/debian/changelog 2016-07-08 16:00:58 UTC (rev 22452) +++ trunk/packages/sofa-framework/trunk/debian/changelog 2016-07-08 17:33:52 UTC (rev 22453) @@ -3,6 +3,9 @@ * Team upload. * d/p/gcc-6: Add patch to fix compilation with gcc-6, Closes: #811747 * cme fix dpkg-control + * d/copyright: DEP5 - remove duplicate entries + * d/rules: hardening += all + * d/p/hardening: Add hardening flags -- Gert Wollny <[email protected]> Fri, 08 Jul 2016 15:55:28 +0000 Modified: trunk/packages/sofa-framework/trunk/debian/copyright =================================================================== --- trunk/packages/sofa-framework/trunk/debian/copyright 2016-07-08 16:00:58 UTC (rev 22452) +++ trunk/packages/sofa-framework/trunk/debian/copyright 2016-07-08 17:33:52 UTC (rev 22453) @@ -7,27 +7,22 @@ Files: framework/* Copyright: 2006-2008 MGH, INRIA, USTL, UJF, CNRS License: LGPL-2.1+ - see `/usr/share/common-licenses/LGPL-2.1' Files: modules/* Copyright: 2006-2008 MGH, INRIA, USTL, UJF, CNRS License: LGPL-2.1+ - see `/usr/share/common-licenses/LGPL-2.1' Files: applications/* Copyright: 2006-2008 MGH, INRIA, USTL, UJF, CNRS License: GPL-2+ - see `/usr/share/common-licenses/GPL-2' Files: extlibs/LML/* Copyright: 2003 TIMC (Emmanuel Promayon) License: GPL-2+ - see `/usr/share/common-licenses/GPL-2' Files: extlibs/miniFlowVR/* Copyright: 2005 Laboratoire Informatique et Distribution (UMR5132), INRIA Project MOVI. License: LGPL - see `/usr/share/common-licenses/LGPL' Files: extlibs/miniFlowVR/src/librender/* Copyright: 2005 Laboratoire Informatique et Distribution (UMR5132), INRIA Project MOVI. Modified: trunk/packages/sofa-framework/trunk/debian/patches/gcc-6.patch =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/gcc-6.patch 2016-07-08 16:00:58 UTC (rev 22452) +++ trunk/packages/sofa-framework/trunk/debian/patches/gcc-6.patch 2016-07-08 17:33:52 UTC (rev 22453) @@ -1,3 +1,8 @@ +Description: Fix compilation with gcc-6 +Author: Gert Wollny <[email protected]> +Bug-Debian: https://bugs.debian.org/811747 +Forwarded: No + --- a/extlibs/miniFlowVR/src/ftlm/type.cpp +++ b/extlibs/miniFlowVR/src/ftlm/type.cpp @@ -306,7 +306,7 @@ Added: trunk/packages/sofa-framework/trunk/debian/patches/hardening.patch =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/hardening.patch (rev 0) +++ trunk/packages/sofa-framework/trunk/debian/patches/hardening.patch 2016-07-08 17:33:52 UTC (rev 22453) @@ -0,0 +1,14 @@ +--- a/sofa-default.cfg ++++ b/sofa-default.cfg +@@ -113,6 +113,11 @@ + QMAKE_CXXFLAGS += -W + QMAKE_CFLAGS += -W + ++QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS) ++QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS) ++QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS) ++QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS) ++ + # Uncomment if you want debug symbols even in release build + # QMAKE_CXXFLAGS += -g + Modified: trunk/packages/sofa-framework/trunk/debian/patches/series =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/series 2016-07-08 16:00:58 UTC (rev 22452) +++ trunk/packages/sofa-framework/trunk/debian/patches/series 2016-07-08 17:33:52 UTC (rev 22453) @@ -11,3 +11,4 @@ default-arguments-in-definition.patch gcc-4-9-workaround.patch gcc-6.patch +hardening.patch Modified: trunk/packages/sofa-framework/trunk/debian/rules =================================================================== --- trunk/packages/sofa-framework/trunk/debian/rules 2016-07-08 16:00:58 UTC (rev 22452) +++ trunk/packages/sofa-framework/trunk/debian/rules 2016-07-08 17:33:52 UTC (rev 22453) @@ -5,6 +5,8 @@ PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') DEB_SOURCE_PACKAGE:=$(PACKAGE) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + devpkg := libsofa1-dev apppkg := sofa-apps docpkg := sofa-doc _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
