Author: osallou Date: 2014-08-18 17:54:53 +0000 (Mon, 18 Aug 2014) New Revision: 17772
Modified: trunk/packages/mapsembler2/trunk/debian/changelog trunk/packages/mapsembler2/trunk/debian/copyright trunk/packages/mapsembler2/trunk/debian/patches/add_hardening trunk/packages/mapsembler2/trunk/debian/rules Log: add some missing hardening, typo fix in copyright Modified: trunk/packages/mapsembler2/trunk/debian/changelog =================================================================== --- trunk/packages/mapsembler2/trunk/debian/changelog 2014-08-18 17:37:10 UTC (rev 17771) +++ trunk/packages/mapsembler2/trunk/debian/changelog 2014-08-18 17:54:53 UTC (rev 17772) @@ -1,12 +1,7 @@ -mapsembler2 (2.2.1+dfsg-1) UNRELEASED; urgency=medium +mapsembler2 (2.2.1+dfsg-1) unstable; urgency=medium * New upstream release - TODO: - Contains many third party libs that need to use Debian packaged one in - mapsembler2_extremities/thirdparty/gatb-core/thirdparty/ - Change of license to Affero GPL, license to check in sub folders - Binaries changed of location, should check in compile_all_tools.sh - to find required binaries + Change of license to AGPL-3 -- Olivier Sallou <[email protected]> Thu, 29 May 2014 15:07:28 +0200 Modified: trunk/packages/mapsembler2/trunk/debian/copyright =================================================================== --- trunk/packages/mapsembler2/trunk/debian/copyright 2014-08-18 17:37:10 UTC (rev 17771) +++ trunk/packages/mapsembler2/trunk/debian/copyright 2014-08-18 17:54:53 UTC (rev 17772) @@ -57,10 +57,25 @@ Copyright: 2012 Rayan Chiki <[email protected]> 2012 Guillaume Rizk License: AGPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + The complete text of the GNU Affero General Public License + can be found in the file `/usr/share/doc/mapsembler2/LICENCE.md.gz'. + Files: mapsembler2_extremities/thirdparty/gatb-core/* Copyright: 2014 INRIA R.Chikhi, G.Rizk, E.Drezen -Licence: AGPL-3+ +License: AGPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or Modified: trunk/packages/mapsembler2/trunk/debian/patches/add_hardening =================================================================== --- trunk/packages/mapsembler2/trunk/debian/patches/add_hardening 2014-08-18 17:37:10 UTC (rev 17771) +++ trunk/packages/mapsembler2/trunk/debian/patches/add_hardening 2014-08-18 17:54:53 UTC (rev 17772) @@ -1,3 +1,8 @@ +Subject: add Debian hardening flags +Description: add hardening +Author: Olivier Sallou <[email protected]> +Last-Updated: 2014-08-18 +Forwarded: no Index: mapsembler2_pipeline/kissreads/Makefile =================================================================== --- mapsembler2_pipeline.orig/kissreads/Makefile @@ -65,3 +70,19 @@ %.o: %.cpp %.h $(CC) -lz -o $@ -c $< $(CFLAGS) +Index: mapsembler2_pipeline/mapsembler2_extremities/CMakeLists.txt +=================================================================== +--- mapsembler2_pipeline.orig/mapsembler2_extremities/CMakeLists.txt ++++ mapsembler2_pipeline/mapsembler2_extremities/CMakeLists.txt +@@ -2,6 +2,11 @@ project(mapsembler2_extremities) + + cmake_minimum_required(VERSION 2.6) + ++CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) ++CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) ++CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) ++LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) ++ + ################################################################################ + # Define cmake modules directory + ################################################################################ Modified: trunk/packages/mapsembler2/trunk/debian/rules =================================================================== --- trunk/packages/mapsembler2/trunk/debian/rules 2014-08-18 17:37:10 UTC (rev 17771) +++ trunk/packages/mapsembler2/trunk/debian/rules 2014-08-18 17:54:53 UTC (rev 17772) @@ -5,6 +5,11 @@ SRC_VERSION =$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p') +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + %: dh $@ _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
