[med-svn] r17820 - in trunk/packages/saint/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-08-22 13:44:18 +0000 (Fri, 22 Aug 2014)
New Revision: 17820

Modified:
   trunk/packages/saint/trunk/debian/changelog
   trunk/packages/saint/trunk/debian/patches/fix-makefile.patch
Log:
Refreshed patches and upload to unstable


Modified: trunk/packages/saint/trunk/debian/changelog
===================================================================
--- trunk/packages/saint/trunk/debian/changelog	2014-08-22 13:26:47 UTC (rev 17819)
+++ trunk/packages/saint/trunk/debian/changelog	2014-08-22 13:44:18 UTC (rev 17820)
@@ -1,4 +1,4 @@
-saint (2.4.0+dfsg-1) UNRELEASED; urgency=medium
+saint (2.4.0+dfsg-1) unstable; urgency=medium
 
   * New upstream version
   * adapted get-orig-source target to new uscan syntax

Modified: trunk/packages/saint/trunk/debian/patches/fix-makefile.patch
===================================================================
--- trunk/packages/saint/trunk/debian/patches/fix-makefile.patch	2014-08-22 13:26:47 UTC (rev 17819)
+++ trunk/packages/saint/trunk/debian/patches/fix-makefile.patch	2014-08-22 13:44:18 UTC (rev 17820)
@@ -1,10 +1,8 @@
 Author: Thorsten Alteholz + Andreas Tille
 Description: add hardening flags to makefile and fix clean target
-Index: SAINT_v2.3.4/Makefile
-===================================================================
---- SAINT_v2.3.4.orig/Makefile	2013-05-16 21:11:02.000000000 +0200
-+++ SAINT_v2.3.4/Makefile	2013-05-16 21:12:28.000000000 +0200
-@@ -14,8 +14,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -14,8 +14,8 @@ SRC      := $(TOPDIR)/src
  
  CC = gcc
  CXX = g++
@@ -15,7 +13,7 @@
  
  #---------------------------------------------------------------------------------
  # any extra libraries we wish to link with the projects
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ makeDirs:
  
  clean:
  	rm -rf $(BUILD)
@@ -24,7 +22,7 @@
  
  all: makeDirs \
          saint-reformat \
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ all: makeDirs \
  saint-reformat:
  	$(CC) $(CFLAGS) -c $(SRC)/SAINTreformat/*.c $(SRC)/SAINTreformat/*.h
  	mv *.o $(BUILD)
@@ -33,7 +31,7 @@
  	rm $(BUILD)/*.o
  	@echo
  	@echo
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ saint-reformat:
  saint-spc-noctrl-matrix:
  	$(CC) $(CFLAGS) -c $(SRC)/SAINTspc-noctrl-matrix/*.c $(SRC)/SAINTspc-noctrl-matrix/*.h
  	mv *.o $(BUILD)
@@ -42,7 +40,7 @@
  	rm $(BUILD)/*.o
  	@echo
  	@echo
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ saint-spc-noctrl-matrix:
  saint-spc-noctrl:
  	$(CC) $(CFLAGS) -c $(SRC)/SAINTspc-noctrl/*.c $(SRC)/SAINTspc-noctrl/*.h
  	mv *.o $(BUILD)
@@ -51,7 +49,7 @@
  	rm $(BUILD)/*.o
  	@echo
  	@echo
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ saint-spc-noctrl:
  saint-spc-ctrl:
  	$(CC) $(CFLAGS) -c $(SRC)/SAINTspc-ctrl/*.c $(SRC)/SAINTspc-ctrl/*.h
  	mv *.o $(BUILD)
@@ -60,7 +58,7 @@
  	rm $(BUILD)/*.o
  	@echo
  	@echo
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ saint-spc-ctrl:
  saint-int-ctrl:
  	$(CC) $(CFLAGS) -c $(SRC)/SAINTint-ctrl/*.c $(SRC)/SAINTint-ctrl/*.h
  	mv *.o $(BUILD)