[med-svn] [kmc] 11/15: finalize new patches

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

sascha-guest pushed a commit to branch master
in repository kmc.

commit cf30e28bf55a0a8f2057ef3d1ce061d3295c6586
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Mon Aug 24 21:10:58 2015 +0000

    finalize new patches
---
 debian/patches/allow-dry-clean | 2 ++
 debian/patches/disable-asmlib  | 2 ++
 debian/patches/hardening       | 7 +++++--
 debian/patches/use-shared-libs | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/patches/allow-dry-clean b/debian/patches/allow-dry-clean
index 67c5310..223793d 100644
--- a/debian/patches/allow-dry-clean
+++ b/debian/patches/allow-dry-clean
@@ -1,3 +1,5 @@
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+Description: allow to run the clean target without having built kmc before
 --- a/makefile
 +++ b/makefile
 @@ -32,8 +32,6 @@
diff --git a/debian/patches/disable-asmlib b/debian/patches/disable-asmlib
index 5173015..b3c83ba 100644
--- a/debian/patches/disable-asmlib
+++ b/debian/patches/disable-asmlib
@@ -1,3 +1,5 @@
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+Description: disable the use of asmlib, which is removed for licensing reasons
 --- a/makefile
 +++ b/makefile
 @@ -1,15 +1,15 @@
diff --git a/debian/patches/hardening b/debian/patches/hardening
index 60453b8..2e4afac 100644
--- a/debian/patches/hardening
+++ b/debian/patches/hardening
@@ -1,16 +1,19 @@
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+Description: pass through compiler flags for hardening
 --- a/makefile
 +++ b/makefile
-@@ -5,8 +5,7 @@
+@@ -5,8 +5,8 @@
  KMC_API_DIR = kmc_api
  KMC_DUMP_DIR = kmc_dump
  
 -CC 	= g++
 -CFLAGS	= -Wall -O3 -m64 -static -fopenmp -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
++CC = g++
 +CFLAGS	+= -Wall -O3 -fopenmp -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
  CLINK	= -lm -lz -lbz2 -fopenmp -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
  
  DISABLE_ASMLIB = true
-@@ -40,14 +39,14 @@
+@@ -40,14 +40,14 @@
  endif
  
  .cpp.o:
diff --git a/debian/patches/use-shared-libs b/debian/patches/use-shared-libs
index cf19b9c..6b986ca 100644
--- a/debian/patches/use-shared-libs
+++ b/debian/patches/use-shared-libs
@@ -1,3 +1,5 @@
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+Description: use shared libraries
 --- a/makefile
 +++ b/makefile
 @@ -7,7 +7,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/kmc.git