[med-svn] r19259 - in trunk/packages/swarm-cluster/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-05-19 13:37:00 +0000 (Tue, 19 May 2015)
New Revision: 19259

Modified:
   trunk/packages/swarm-cluster/trunk/debian/changelog
   trunk/packages/swarm-cluster/trunk/debian/copyright
   trunk/packages/swarm-cluster/trunk/debian/docs
   trunk/packages/swarm-cluster/trunk/debian/install
   trunk/packages/swarm-cluster/trunk/debian/manpages
   trunk/packages/swarm-cluster/trunk/debian/patches/hardening.patch
   trunk/packages/swarm-cluster/trunk/debian/rules
   trunk/packages/swarm-cluster/trunk/debian/watch
Log:
New upstream version


Modified: trunk/packages/swarm-cluster/trunk/debian/changelog
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/changelog	2015-05-19 06:57:41 UTC (rev 19258)
+++ trunk/packages/swarm-cluster/trunk/debian/changelog	2015-05-19 13:37:00 UTC (rev 19259)
@@ -1,3 +1,9 @@
+swarm-cluster (2.1.1-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Andreas Tille <tille at debian.org>  Tue, 19 May 2015 15:29:49 +0200
+
 swarm-cluster (1.2.19+dfsg-1) unstable; urgency=medium
 
   * Initial Debian release

Modified: trunk/packages/swarm-cluster/trunk/debian/copyright
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/copyright	2015-05-19 06:57:41 UTC (rev 19258)
+++ trunk/packages/swarm-cluster/trunk/debian/copyright	2015-05-19 13:37:00 UTC (rev 19259)
@@ -2,8 +2,6 @@
 Upstream-Name: swarm
 Upstream-Contact: Torbjørn Rognes <torognes at ifi.uio.no>
 Source: https://github.com/torognes/swarm
-Files-Excluded: Linux/
-                Mac/
 
 Files: *
 Copyright: (C) 2012-2014 Torbjørn Rognes and Frederic Mahe

Modified: trunk/packages/swarm-cluster/trunk/debian/docs
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/docs	2015-05-19 06:57:41 UTC (rev 19258)
+++ trunk/packages/swarm-cluster/trunk/debian/docs	2015-05-19 13:37:00 UTC (rev 19259)
@@ -1,2 +1,2 @@
-*.pdf
+man/*.pdf
 README.html

Modified: trunk/packages/swarm-cluster/trunk/debian/install
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/install	2015-05-19 06:57:41 UTC (rev 19258)
+++ trunk/packages/swarm-cluster/trunk/debian/install	2015-05-19 13:37:00 UTC (rev 19259)
@@ -1,2 +1,2 @@
-swarm	/usr/bin
-scripts  /usr/share/swarm/
+src/swarm	usr/bin
+scripts		usr/share/swarm

Modified: trunk/packages/swarm-cluster/trunk/debian/manpages
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/manpages	2015-05-19 06:57:41 UTC (rev 19258)
+++ trunk/packages/swarm-cluster/trunk/debian/manpages	2015-05-19 13:37:00 UTC (rev 19259)
@@ -1 +1 @@
-*.1
+man/*.1

Modified: trunk/packages/swarm-cluster/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/patches/hardening.patch	2015-05-19 06:57:41 UTC (rev 19258)
+++ trunk/packages/swarm-cluster/trunk/debian/patches/hardening.patch	2015-05-19 13:37:00 UTC (rev 19259)
@@ -2,14 +2,14 @@
 Last-Changed: Wed, 14 Jan 2015 10:40:22 +0000
 Description: Propagate hardening options
 
---- a/Makefile
-+++ b/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -28,7 +28,7 @@ COMMON=-g
- COMPILEOPT=-Wall -mssse3 -mtune=core2 -Icityhash
+ COMPILEOPT=-Wall -Wsign-compare -O3 -msse2 -mtune=core2 -Icityhash
  
  LIBS=-lpthread
 -LINKFLAGS=$(COMMON)
 +LINKFLAGS=$(COMMON) $(LDFLAGS)
  
- # Intel options
- #CXX=icpc
+ CXX=g++
+ CXXFLAGS=$(COMPILEOPT) $(COMMON)

Modified: trunk/packages/swarm-cluster/trunk/debian/rules
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/rules	2015-05-19 06:57:41 UTC (rev 19258)
+++ trunk/packages/swarm-cluster/trunk/debian/rules	2015-05-19 13:37:00 UTC (rev 19259)
@@ -3,7 +3,7 @@
 export DH_OPTIONS
 
 %:
-	dh  $@
+	dh $@ --sourcedirectory=src
 
 override_dh_auto_build:
 	dh_auto_build

Modified: trunk/packages/swarm-cluster/trunk/debian/watch
===================================================================
--- trunk/packages/swarm-cluster/trunk/debian/watch	2015-05-19 06:57:41 UTC (rev 19258)
+++ trunk/packages/swarm-cluster/trunk/debian/watch	2015-05-19 13:37:00 UTC (rev 19259)
@@ -1,3 +1,2 @@
 version=3
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
-  https://github.com/torognes/swarm/releases .*/archive/v*([0-9.rc-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+https://github.com/torognes/swarm/releases .*/archive/v*([0-9.rc-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)