[med-svn] r18224 - in trunk/packages/bowtie/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-10-06 10:02:22 +0000 (Mon, 06 Oct 2014)
New Revision: 18224

Modified:
   trunk/packages/bowtie/trunk/debian/changelog
   trunk/packages/bowtie/trunk/debian/patches/disable_bits_flag.patch
   trunk/packages/bowtie/trunk/debian/patches/no_hash_style_both_for_mips.patch
   trunk/packages/bowtie/trunk/debian/patches/use-dpkg-buildflags.patch
   trunk/packages/bowtie/trunk/debian/patches/use_debian_seqan.patch
Log:
Update patches to latest upstream version


Modified: trunk/packages/bowtie/trunk/debian/changelog
===================================================================
--- trunk/packages/bowtie/trunk/debian/changelog	2014-10-06 09:50:59 UTC (rev 18223)
+++ trunk/packages/bowtie/trunk/debian/changelog	2014-10-06 10:02:22 UTC (rev 18224)
@@ -1,4 +1,4 @@
-bowtie (1.1.0-1) UNRELEASED; urgency=medium
+bowtie (1.1.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * cme fix dpkg-control

Modified: trunk/packages/bowtie/trunk/debian/patches/disable_bits_flag.patch
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/disable_bits_flag.patch	2014-10-06 09:50:59 UTC (rev 18223)
+++ trunk/packages/bowtie/trunk/debian/patches/disable_bits_flag.patch	2014-10-06 10:02:22 UTC (rev 18224)
@@ -7,7 +7,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -120,8 +120,8 @@ ifeq (32,$(BITS))
+@@ -126,8 +126,8 @@ ifeq (32,$(BITS))
      $(error bowtie2 compilation requires a 64-bit platform )
  endif
  

Modified: trunk/packages/bowtie/trunk/debian/patches/no_hash_style_both_for_mips.patch
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/no_hash_style_both_for_mips.patch	2014-10-06 09:50:59 UTC (rev 18223)
+++ trunk/packages/bowtie/trunk/debian/patches/no_hash_style_both_for_mips.patch	2014-10-06 10:02:22 UTC (rev 18224)
@@ -7,7 +7,7 @@
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Makefile
 +++ b/Makefile
-@@ -45,7 +45,9 @@ endif
+@@ -51,7 +51,9 @@ endif
  LINUX = 0
  ifneq (,$(findstring Linux,$(shell uname)))
      LINUX = 1

Modified: trunk/packages/bowtie/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/use-dpkg-buildflags.patch	2014-10-06 09:50:59 UTC (rev 18223)
+++ trunk/packages/bowtie/trunk/debian/patches/use-dpkg-buildflags.patch	2014-10-06 10:02:22 UTC (rev 18224)
@@ -6,7 +6,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -192,7 +192,7 @@ DEFS=-fno-strict-aliasing \
+@@ -198,7 +198,7 @@ DEFS=-fno-strict-aliasing \
       $(MM_DEF) \
       $(SHMEM_DEF)
  

Modified: trunk/packages/bowtie/trunk/debian/patches/use_debian_seqan.patch
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/use_debian_seqan.patch	2014-10-06 09:50:59 UTC (rev 18223)
+++ trunk/packages/bowtie/trunk/debian/patches/use_debian_seqan.patch	2014-10-06 10:02:22 UTC (rev 18224)
@@ -15,7 +15,7 @@
  SEQAN_INC = -I $(SEQAN_DIR)
  INC = $(SEQAN_INC) -I third_party
  CPP = g++
-@@ -145,7 +145,6 @@ GENERAL_LIST = $(wildcard scripts/*.sh)
+@@ -151,7 +151,6 @@ GENERAL_LIST = $(wildcard scripts/*.sh)
                 $(wildcard genomes/NC_008253.fna) \
                 $(wildcard reads/e_coli_1000.*) \
                 $(wildcard reads/e_coli_1000_*) \