[med-svn] r17764 - in trunk/packages/discosnp/trunk/debian: . patches

[Olivier Sallou]

Author: osallou
Date: 2014-08-18 15:11:48 +0000 (Mon, 18 Aug 2014)
New Revision: 17764

Modified:
   trunk/packages/discosnp/trunk/debian/changelog
   trunk/packages/discosnp/trunk/debian/patches/fix_build
Log:
new upstream release 1.2.3, adapt patches

Modified: trunk/packages/discosnp/trunk/debian/changelog
===================================================================
--- trunk/packages/discosnp/trunk/debian/changelog	2014-08-18 13:32:39 UTC (rev 17763)
+++ trunk/packages/discosnp/trunk/debian/changelog	2014-08-18 15:11:48 UTC (rev 17764)
@@ -1,3 +1,9 @@
+discosnp (1.2.3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Olivier Sallou <osallou at debian.org>  Mon, 18 Aug 2014 16:42:33 +0200
+
 discosnp (1.2.2-1) unstable; urgency=medium
 
   * New upstream release 

Modified: trunk/packages/discosnp/trunk/debian/patches/fix_build
===================================================================
--- trunk/packages/discosnp/trunk/debian/patches/fix_build	2014-08-18 13:32:39 UTC (rev 17763)
+++ trunk/packages/discosnp/trunk/debian/patches/fix_build	2014-08-18 15:11:48 UTC (rev 17764)
@@ -42,20 +42,23 @@
 ===================================================================
 --- discoSnp.orig/kissreads/Makefile
 +++ discoSnp/kissreads/Makefile
-@@ -19,9 +19,10 @@ CC		=gcc
- 
+@@ -20,10 +20,13 @@ CC		=gcc
  # optimized flags
  
--CFLAGS=-Wall -O3 -lz -fopenmp -DOMP #openmp is incompatiblre with clang #@!§
+ #CFLAGS=-Wall -O3 -lz -fopenmp -DOMP #openmp is incompatiblre with clang #@!§
+-CFLAGS= -O3 -lz -fopenmp -DOMP #openmp is incompatiblre with clang #@!
++#CFLAGS= -O3 -lz -fopenmp -DOMP #openmp is incompatiblre with clang #@!
 +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -Wall -O3 -lz
 +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wall -lm -O3 -lz
  CFLAGS+=$(MYFLAGS)
--LDFLAGS+=-Wall -lm -O3 -lz -DOMP -fopenmp#-fopenmp
+ #LDFLAGS+=-Wall -lm -O3 -lz -DOMP -fopenmp#-fopenmp
+-LDFLAGS+= -lm -O3 -lz -DOMP -fopenmp#-fopenmp
++#LDFLAGS+= -lm -O3 -lz -DOMP -fopenmp#-fopenmp
  
  ## debug flags
  
-@@ -49,7 +50,7 @@ all: $(ALL)
+@@ -51,7 +54,7 @@ all: $(ALL)
  	@echo "#################"
  
  kissreads: $(OBJ) 
@@ -68,21 +71,21 @@
 ===================================================================
 --- discoSnp.orig/minia/makefile
 +++ discoSnp/minia/makefile
-@@ -1,5 +1,7 @@
- CC=g++
+@@ -1,4 +1,7 @@
 -CFLAGS+= -O4 -D_FILE_OFFSET_BITS=64 # needed to handle files > 2 GB on 32 bits systems
++#CFLAGS+= -O4 -D_FILE_OFFSET_BITS=64 # needed to handle files > 2 GB on 32 bits systems
 +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -O4 -D_FILE_OFFSET_BITS=64
 +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
  SRC=Pool.cpp Bank.cpp Bloom.cpp Hash16.cpp LargeInt.cpp Kmer.cpp Terminator.cpp Traversal.cpp LinearCounter.cpp Set.cpp Utils.cpp SortingCount.cpp Debloom.cpp OAHash.cpp
  EXEC=minia
  OBJ= $(SRC:.cpp=.o)
-@@ -61,7 +63,7 @@ all:
+@@ -60,7 +63,7 @@ all:
  	$(MAKE) $(EXEC)
  
  minia: $(OBJ) Minia.cpp
--	$(CC) -o $@ $(OBJ) Minia.cpp $(CFLAGS) -lz
-+	$(CC) -o $@ $(OBJ) Minia.cpp $(CFLAGS) $(LDFLAGS) -lz
+-	$(CXX) -o $@ $(OBJ) Minia.cpp $(CFLAGS) -lz
++	$(CXX) -o $@ $(OBJ) Minia.cpp $(CFLAGS) $(LDFLAGS) -lz
  
  %.o: %.cpp %.h
- 	$(CC) -o $@ -c $< $(CFLAGS)
+ 	$(CXX) -o $@ -c $< $(CFLAGS)