[med-svn] [bowtie2] 01/04: Revert the commit with applied patch

[Alex Mestiashvili]

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

malex-guest pushed a commit to branch master
in repository bowtie2.

commit a2d7003d4db8a444229b6668001418a4fd3ee774
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Thu Apr 28 09:49:05 2016 +0200

    Revert the commit with applied patch
    
    This reverts commit 0698da15ce3869ab54be77618f4785936ee43b72.
---
 Makefile                       | 3 +--
 debian/patches/hardening.patch | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c64334f..667eda1 100644
--- a/Makefile
+++ b/Makefile
@@ -254,8 +254,7 @@ DEFS=-fno-strict-aliasing \
      $(FILE_FLAGS) \
      $(PREF_DEF) \
      $(MM_DEF) \
-     $(SHMEM_DEF)\
-     $(CPPFLAGS)
+     $(SHMEM_DEF)
 
 #
 # bowtie2-build targets
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 63cac4c..54a1811 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -2,9 +2,9 @@ Description: Patch injects hardening CPPFLAGS
 Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
 Origin: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Last-Update: Mon, 30 Jul 2012 13:51:31 +0200
---- bowtie2.orig/Makefile
-+++ bowtie2/Makefile
-@@ -254,7 +254,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -250,7 +250,8 @@ DEFS=-fno-strict-aliasing \
       $(FILE_FLAGS) \
       $(PREF_DEF) \
       $(MM_DEF) \

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