Author: tille
Date: 2015-01-20 19:28:18 +0000 (Tue, 20 Jan 2015)
New Revision: 18599
Added:
trunk/packages/swarm-cluster/trunk/debian/patches/
trunk/packages/swarm-cluster/trunk/debian/patches/hardening.patch
trunk/packages/swarm-cluster/trunk/debian/patches/series
Modified:
trunk/packages/swarm-cluster/trunk/debian/control
trunk/packages/swarm-cluster/trunk/debian/copyright
trunk/packages/swarm-cluster/trunk/debian/docs
trunk/packages/swarm-cluster/trunk/debian/rules
Log:
Some polishing
Modified: trunk/packages/swarm-cluster/trunk/debian/control
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/control 2015-01-20 14:14:43 UTC (rev 18598)
+++ trunk/packages/swarm-cluster/trunk/debian/control 2015-01-20 19:28:18 UTC (rev 18599)
@@ -6,7 +6,7 @@
Priority: optional
Build-Depends: debhelper (>= 9),
man-db,
- ghostscript
+ python-markdown
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/swarm-cluster/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/swarm-cluster/trunk/
Modified: trunk/packages/swarm-cluster/trunk/debian/copyright
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/copyright 2015-01-20 14:14:43 UTC (rev 18598)
+++ trunk/packages/swarm-cluster/trunk/debian/copyright 2015-01-20 19:28:18 UTC (rev 18599)
@@ -7,7 +7,7 @@
Files: *
Copyright: (C) 2012-2014 Torbjorn Rognes and Frederic Mahe
-License: Affero GPL-3
+License: Affero-GPL-3
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
.
@@ -679,10 +679,10 @@
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-
+ .
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-
+ .
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Modified: trunk/packages/swarm-cluster/trunk/debian/docs
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/docs 2015-01-20 14:14:43 UTC (rev 18598)
+++ trunk/packages/swarm-cluster/trunk/debian/docs 2015-01-20 19:28:18 UTC (rev 18599)
@@ -1,2 +1,2 @@
*.pdf
-README.md
+README.html
Added: trunk/packages/swarm-cluster/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/patches/hardening.patch (rev 0)
+++ trunk/packages/swarm-cluster/trunk/debian/patches/hardening.patch 2015-01-20 19:28:18 UTC (rev 18599)
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Changed: Wed, 14 Jan 2015 10:40:22 +0000
+Description: Propagate hardening options
+
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@ COMMON=-g
+ COMPILEOPT=-Wall -mssse3 -mtune=core2 -Icityhash
+
+ LIBS=-lpthread
+-LINKFLAGS=$(COMMON)
++LINKFLAGS=$(COMMON) $(LDFLAGS)
+
+ # Intel options
+ #CXX=icpc
Added: trunk/packages/swarm-cluster/trunk/debian/patches/series
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/patches/series (rev 0)
+++ trunk/packages/swarm-cluster/trunk/debian/patches/series 2015-01-20 19:28:18 UTC (rev 18599)
@@ -0,0 +1 @@
+hardening.patch
Modified: trunk/packages/swarm-cluster/trunk/debian/rules
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/rules 2015-01-20 14:14:43 UTC (rev 18598)
+++ trunk/packages/swarm-cluster/trunk/debian/rules 2015-01-20 19:28:18 UTC (rev 18599)
@@ -7,9 +7,8 @@
override_dh_auto_build:
dh_auto_build
- man -t ./swarm.1 | ps2pdf -sPAPERSIZE=a4 - > swarm_manual.pdf
+ markdown_py -f README.html README.md
override_dh_auto_clean:
dh_auto_clean
- rm -rf Linux Mac swarm_manual.pdf*
-
+ rm -f README.html