[med-svn] r18500 - in trunk/packages/minia/trunk/debian: . patches

[Olivier Sallou]

Author: osallou
Date: 2014-11-21 07:07:54 +0000 (Fri, 21 Nov 2014)
New Revision: 18500

Modified:
   trunk/packages/minia/trunk/debian/changelog
   trunk/packages/minia/trunk/debian/patches/add_hardening
Log:
new release 1.6906

Modified: trunk/packages/minia/trunk/debian/changelog
===================================================================
--- trunk/packages/minia/trunk/debian/changelog	2014-11-21 06:55:57 UTC (rev 18499)
+++ trunk/packages/minia/trunk/debian/changelog	2014-11-21 07:07:54 UTC (rev 18500)
@@ -1,6 +1,7 @@
-minia (1.6906-1) UNRELEASED; urgency=medium
+minia (1.6906-1) unstable; urgency=medium
 
   * New upstream release 
+  $ d/patches: updates patches to new release
 
  -- Olivier Sallou <osallou at debian.org>  Fri, 21 Nov 2014 07:55:05 +0100
 

Modified: trunk/packages/minia/trunk/debian/patches/add_hardening
===================================================================
--- trunk/packages/minia/trunk/debian/patches/add_hardening	2014-11-21 06:55:57 UTC (rev 18499)
+++ trunk/packages/minia/trunk/debian/patches/add_hardening	2014-11-21 07:07:54 UTC (rev 18500)
@@ -4,23 +4,31 @@
 Author: Olivier Sallou <osallou at debian.org>
 Last-Updated: 2014-01-13
 Forwarded: no
---- a/makefile
-+++ b/makefile
-@@ -1,5 +1,7 @@
- CC=g++
--CFLAGS = -O4 -D_FILE_OFFSET_BITS=64 # needed to handle files > 2 GB on 32 bits systems
+Index: minia-1.6906/makefile
+===================================================================
+--- minia-1.6906.orig/makefile
++++ minia-1.6906/makefile
+@@ -1,4 +1,7 @@
+-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 # needed to handle files > 2 GB on 32 bits systems
 +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)
-@@ -60,7 +62,7 @@
- all: $(EXEC)
+@@ -60,7 +63,7 @@ all:
+ 	$(MAKE) $(EXEC)
  
- minia: clean $(OBJ) Minia.cpp
--	$(CC) -o $@ $(OBJ) Minia.cpp $(CFLAGS) -lz
-+	$(CC) -o $@ $(OBJ) Minia.cpp $(CFLAGS) $(LDFLAGS) -lz
+ minia: $(OBJ) Minia.cpp
+-	$(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)
+@@ -73,4 +76,4 @@ clean:
+ 	rm -rf *.o
+ 
+ install:
+-	cp minia /usr/local/bin
++	#cp minia /usr/local/bin