[med-svn] r18503 - in trunk/packages/minia/tags: . 1.6906-1/debian 1.6906-1/debian/patches

[Olivier Sallou]

Author: osallou
Date: 2014-11-21 07:10:14 +0000 (Fri, 21 Nov 2014)
New Revision: 18503

Added:
   trunk/packages/minia/tags/1.6906-1/
   trunk/packages/minia/tags/1.6906-1/debian/changelog
   trunk/packages/minia/tags/1.6906-1/debian/patches/add_hardening
Removed:
   trunk/packages/minia/tags/1.6906-1/debian/changelog
   trunk/packages/minia/tags/1.6906-1/debian/patches/add_hardening
Log:
[svn-buildpackage] Tagging minia 1.6906-1

Deleted: trunk/packages/minia/tags/1.6906-1/debian/changelog
===================================================================
--- trunk/packages/minia/trunk/debian/changelog	2014-11-21 06:49:46 UTC (rev 18498)
+++ trunk/packages/minia/tags/1.6906-1/debian/changelog	2014-11-21 07:10:14 UTC (rev 18503)
@@ -1,24 +0,0 @@
-minia (1.6088-1) unstable; urgency=low
-
-  * New upstream release 
-    Upstream doc added to source package
-
- -- Olivier Sallou <osallou at debian.org>  Fri, 21 Feb 2014 15:05:20 +0100
-
-minia (1.6067+dfsg-2) unstable; urgency=low
-
-  [ Olivier Sallou ]
-  * d/control: Add info on assembler term (Closes: #735158).
-               Add missing deps (Closes: #735331).
-
-  [ Andreas Tille ]
-  * d/upstream: Fixed reference
-
- -- Olivier Sallou <osallou at debian.org>  Mon, 13 Jan 2014 13:24:12 +0100
-
-minia (1.6067+dfsg-1) unstable; urgency=medium
-
-  * First debian package (Closes: #735158).
-
- -- Olivier Sallou <osallou at debian.org>  Sat, 21 Dec 2013 16:55:29 +0100
-

Copied: trunk/packages/minia/tags/1.6906-1/debian/changelog (from rev 18500, trunk/packages/minia/trunk/debian/changelog)
===================================================================
--- trunk/packages/minia/tags/1.6906-1/debian/changelog	                        (rev 0)
+++ trunk/packages/minia/tags/1.6906-1/debian/changelog	2014-11-21 07:10:14 UTC (rev 18503)
@@ -0,0 +1,31 @@
+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
+
+minia (1.6088-1) unstable; urgency=low
+
+  * New upstream release 
+    Upstream doc added to source package
+
+ -- Olivier Sallou <osallou at debian.org>  Fri, 21 Feb 2014 15:05:20 +0100
+
+minia (1.6067+dfsg-2) unstable; urgency=low
+
+  [ Olivier Sallou ]
+  * d/control: Add info on assembler term (Closes: #735158).
+               Add missing deps (Closes: #735331).
+
+  [ Andreas Tille ]
+  * d/upstream: Fixed reference
+
+ -- Olivier Sallou <osallou at debian.org>  Mon, 13 Jan 2014 13:24:12 +0100
+
+minia (1.6067+dfsg-1) unstable; urgency=medium
+
+  * First debian package (Closes: #735158).
+
+ -- Olivier Sallou <osallou at debian.org>  Sat, 21 Dec 2013 16:55:29 +0100
+

Deleted: trunk/packages/minia/tags/1.6906-1/debian/patches/add_hardening
===================================================================
--- trunk/packages/minia/trunk/debian/patches/add_hardening	2014-11-21 06:49:46 UTC (rev 18498)
+++ trunk/packages/minia/tags/1.6906-1/debian/patches/add_hardening	2014-11-21 07:10:14 UTC (rev 18503)
@@ -1,26 +0,0 @@
-Subject: add hardening flags
-Description: upstream makefile does not ake env CFLAGS. Add those
- to manage hardening and fortity
-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
-+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)
- 
- minia: clean $(OBJ) Minia.cpp
--	$(CC) -o $@ $(OBJ) Minia.cpp $(CFLAGS) -lz
-+	$(CC) -o $@ $(OBJ) Minia.cpp $(CFLAGS) $(LDFLAGS) -lz
- 
- %.o: %.cpp %.h
- 	$(CC) -o $@ -c $< $(CFLAGS)

Copied: trunk/packages/minia/tags/1.6906-1/debian/patches/add_hardening (from rev 18500, trunk/packages/minia/trunk/debian/patches/add_hardening)
===================================================================
--- trunk/packages/minia/tags/1.6906-1/debian/patches/add_hardening	                        (rev 0)
+++ trunk/packages/minia/tags/1.6906-1/debian/patches/add_hardening	2014-11-21 07:10:14 UTC (rev 18503)
@@ -0,0 +1,34 @@
+Subject: add hardening flags
+Description: upstream makefile does not ake env CFLAGS. Add those
+ to manage hardening and fortity
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2014-01-13
+Forwarded: no
+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 +63,7 @@ all:
+ 	$(MAKE) $(EXEC)
+ 
+ minia: $(OBJ) Minia.cpp
+-	$(CXX) -o $@ $(OBJ) Minia.cpp $(CFLAGS) -lz
++	$(CXX) -o $@ $(OBJ) Minia.cpp $(CFLAGS) $(LDFLAGS) -lz
+ 
+ %.o: %.cpp %.h
+ 	$(CXX) -o $@ -c $< $(CFLAGS)
+@@ -73,4 +76,4 @@ clean:
+ 	rm -rf *.o
+ 
+ install:
+-	cp minia /usr/local/bin
++	#cp minia /usr/local/bin