[med-svn] r13609 - in trunk/packages/saint/trunk/debian: . patches
Thorsten Alteholz
alteholz at alioth.debian.org
Thu May 16 20:03:27 UTC 2013
Author: alteholz
Date: 2013-05-16 20:03:26 +0000 (Thu, 16 May 2013)
New Revision: 13609
Modified:
trunk/packages/saint/trunk/debian/
trunk/packages/saint/trunk/debian/changelog
trunk/packages/saint/trunk/debian/control
trunk/packages/saint/trunk/debian/get-orig-source
trunk/packages/saint/trunk/debian/patches/fix-makefile.patch
trunk/packages/saint/trunk/debian/saint-int-ctrl.1
Log:
new upstream version
Property changes on: trunk/packages/saint/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/packages/saint/trunk/debian/changelog
===================================================================
--- trunk/packages/saint/trunk/debian/changelog 2013-05-16 16:28:44 UTC (rev 13608)
+++ trunk/packages/saint/trunk/debian/changelog 2013-05-16 20:03:26 UTC (rev 13609)
@@ -1,9 +1,13 @@
-saint (2.3.3+dfsg-1) UNRELEASED; urgency=low
+saint (2.3.4+dfsg-1) unstable; urgency=low
+ * new upstream version
+ * debian/control: bump standard to 3.9.4 (no changes needed)
+
+ [Andreas Tille]
* debian/copyright:
- Add Files-Excluded to document what was removed from original source
- -- Andreas Tille <tille at debian.org> Fri, 24 Aug 2012 16:20:26 +0200
+ -- Thorsten Alteholz <debian at alteholz.de> Thu, 16 May 2013 21:20:00 +0200
saint (2.3.3-1) unstable; urgency=low
Modified: trunk/packages/saint/trunk/debian/control
===================================================================
--- trunk/packages/saint/trunk/debian/control 2013-05-16 16:28:44 UTC (rev 13608)
+++ trunk/packages/saint/trunk/debian/control 2013-05-16 20:03:26 UTC (rev 13609)
@@ -2,9 +2,10 @@
Section: science
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>
+Uploaders: Andreas Tille <tille at debian.org>,
+ Thorsten Alteholz <debian at alteholz.de>
Build-Depends: debhelper (>= 9), libgsl0-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://saint-apms.sourceforge.net/Main.html
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/saint/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/saint/trunk/
Modified: trunk/packages/saint/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/saint/trunk/debian/get-orig-source 2013-05-16 16:28:44 UTC (rev 13608)
+++ trunk/packages/saint/trunk/debian/get-orig-source 2013-05-16 20:03:26 UTC (rev 13609)
@@ -30,5 +30,5 @@
find ${upstream} -name "*.c" -type f -exec chmod a-x \{\} \;
find ${upstream} -name "*.h" -type f -exec chmod a-x \{\} \;
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION".orig.tar.gz "${upstream}"
+GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION"+dfsg.orig.tar.gz "${upstream}"
rm -rf "$upstream"
Modified: trunk/packages/saint/trunk/debian/patches/fix-makefile.patch
===================================================================
--- trunk/packages/saint/trunk/debian/patches/fix-makefile.patch 2013-05-16 16:28:44 UTC (rev 13608)
+++ trunk/packages/saint/trunk/debian/patches/fix-makefile.patch 2013-05-16 20:03:26 UTC (rev 13609)
@@ -1,5 +1,20 @@
---- SAINT_v2.3.3.orig/Makefile
-+++ SAINT_v2.3.3/Makefile
+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 @@
+
+ CC = gcc
+ CXX = g++
+-CFLAGS = -g -O3
+-CXXFLAGS = $(CFLAGS)
++CFLAGS += -g -O3
++CXXFLAGS += $(CFLAGS)
+
+ #---------------------------------------------------------------------------------
+ # any extra libraries we wish to link with the projects
@@ -29,7 +29,7 @@
clean:
@@ -9,3 +24,48 @@
all: makeDirs \
saint-reformat \
+@@ -43,7 +43,7 @@
+ saint-reformat:
+ $(CC) $(CFLAGS) -c $(SRC)/SAINTreformat/*.c $(SRC)/SAINTreformat/*.h
+ mv *.o $(BUILD)
+- $(CC) $(LIBS) $(BUILD)/*.o -o $(TARGET)/saint-reformat
++ $(CC) $(LIBS) $(LDFLAGS) $(BUILD)/*.o -o $(TARGET)/saint-reformat
+ rm $(BUILD)/*.o
+ @echo
+ @echo
+@@ -52,7 +52,7 @@
+ saint-spc-noctrl-matrix:
+ $(CC) $(CFLAGS) -c $(SRC)/SAINTspc-noctrl-matrix/*.c $(SRC)/SAINTspc-noctrl-matrix/*.h
+ mv *.o $(BUILD)
+- $(CC) $(LIBS) $(BUILD)/*.o -o $(TARGET)/saint-spc-noctrl-matrix
++ $(CC) $(LIBS) $(LDFLAGS) $(BUILD)/*.o -o $(TARGET)/saint-spc-noctrl-matrix
+ rm $(BUILD)/*.o
+ @echo
+ @echo
+@@ -60,7 +60,7 @@
+ saint-spc-noctrl:
+ $(CC) $(CFLAGS) -c $(SRC)/SAINTspc-noctrl/*.c $(SRC)/SAINTspc-noctrl/*.h
+ mv *.o $(BUILD)
+- $(CC) $(LIBS) $(BUILD)/*.o -o $(TARGET)/saint-spc-noctrl
++ $(CC) $(LIBS) $(LDFLAGS) $(BUILD)/*.o -o $(TARGET)/saint-spc-noctrl
+ rm $(BUILD)/*.o
+ @echo
+ @echo
+@@ -69,7 +69,7 @@
+ saint-spc-ctrl:
+ $(CC) $(CFLAGS) -c $(SRC)/SAINTspc-ctrl/*.c $(SRC)/SAINTspc-ctrl/*.h
+ mv *.o $(BUILD)
+- $(CC) $(LIBS) $(BUILD)/*.o -o $(TARGET)/saint-spc-ctrl
++ $(CC) $(LIBS) $(LDFLAGS) $(BUILD)/*.o -o $(TARGET)/saint-spc-ctrl
+ rm $(BUILD)/*.o
+ @echo
+ @echo
+@@ -78,7 +78,7 @@
+ saint-int-ctrl:
+ $(CC) $(CFLAGS) -c $(SRC)/SAINTint-ctrl/*.c $(SRC)/SAINTint-ctrl/*.h
+ mv *.o $(BUILD)
+- $(CC) $(LIBS) $(BUILD)/*.o -o $(TARGET)/saint-int-ctrl
++ $(CC) $(LIBS) $(LDFLAGS) $(BUILD)/*.o -o $(TARGET)/saint-int-ctrl
+ rm $(BUILD)/*.o
+ @echo
+ @echo
Modified: trunk/packages/saint/trunk/debian/saint-int-ctrl.1
===================================================================
--- trunk/packages/saint/trunk/debian/saint-int-ctrl.1 2013-05-16 16:28:44 UTC (rev 13608)
+++ trunk/packages/saint/trunk/debian/saint-int-ctrl.1 2013-05-16 20:03:26 UTC (rev 13609)
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.8.
.TH saint-int-ctrl "1" "April 2012" "User Commands"
.SH NAME
-saint-int-ctrl \- suport continuous measurements in SAINT
+saint-int-ctrl \- support continuous measurements in SAINT
.SH DESCRIPTION
usage: saint\-int\-ctrl [interactionFile] [preyFile] [baitFile] [nburnin] [niter]
.SH "SEE ALSO"
More information about the debian-med-commit
mailing list