[sympow] 01/01: Imported Debian patch 1.023-4 (Closes: #766912)
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sun Oct 26 19:53:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository sympow.
commit 4e8e09d5100c8213e8786e2adde789cd269a2d27
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sun Oct 26 20:50:32 2014 +0100
Imported Debian patch 1.023-4 (Closes: #766912)
---
debian/changelog | 7 +++++++
debian/patches/debianization-help2man.patch | 8 ++++----
debian/patches/debianization.patch | 23 ++++++++++++++++++----
debian/patches/upstream-endiantuple.patch | 4 ++--
...pstream-floating_point-rounding_precision.patch | 4 ++--
.../upstream-sage-Configure-adapted2debian.patch | 13 +++++++-----
debian/patches/upstream-system_wide.patch | 4 ++--
7 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cdab4c4..6cc8d78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sympow (1.023-4) unstable; urgency=medium
+
+ * Debianization:
+ - build-arch/build-indep scheme, harden (Closes: #766912).
+
+ -- Jerome Benoit <calculus at rezozer.net> Sun, 26 Oct 2014 19:47:04 +0000
+
sympow (1.023-3) unstable; urgency=medium
* Debianization:
diff --git a/debian/patches/debianization-help2man.patch b/debian/patches/debianization-help2man.patch
index 80a5bd7..2164a05 100644
--- a/debian/patches/debianization-help2man.patch
+++ b/debian/patches/debianization-help2man.patch
@@ -7,7 +7,7 @@ Last-Update: 2014-10-25
--- a/Configure
+++ b/Configure
-@@ -81,6 +81,12 @@
+@@ -83,6 +83,12 @@
echo "**ERROR**: Could not find uname"; exit;
fi
@@ -20,7 +20,7 @@ Last-Update: 2014-10-25
## Sage material (spkg-install)
#######################################################################
# Fix FPU precision
-@@ -265,6 +271,13 @@
+@@ -267,6 +273,13 @@
echo "CFLAGS += -Wno-unused-result" >> $FILE
@@ -34,7 +34,7 @@ Last-Update: 2014-10-25
echo "SRCS0 = fpu.c" >> $FILE
echo "SRCS1 = analrank.c analytic.c compute.c compute2.c help.c" >> $FILE
echo "SRCS2 = conductors.c disk.c ec_ap.c ec_ap_bsgs.c ec_ap_large.c" >> $FILE
-@@ -310,7 +323,7 @@
+@@ -312,7 +325,7 @@
echo "default: build-arch" >> $FILE
echo "all: build-arch build-indep" >> $FILE
@@ -43,7 +43,7 @@ Last-Update: 2014-10-25
echo "build-indep: datafiles/param_data" >> $FILE
echo "sympow: \$(OBJS)" >> $FILE
echo " \$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(OPT) -o \$@ \$(DEFS) \$(OBJS) \$(LDFLAGS) \$(LIBS)" >> $FILE
-@@ -324,9 +337,11 @@
+@@ -326,9 +339,11 @@
echo " \$(SH) armd.sh" >> $FILE
echo " \$(SH) debian/adhoc/job/sympow-new_data.job" >> $FILE
echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 3c32cc1..1d9307b 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -32,16 +32,31 @@ Last-Update: 2014-10-25
echo "VERSION = $VERSION" >> $FILE
echo "#define RM \"$RM\"" >> $CONFIG
-@@ -38,7 +42,7 @@
- echo "#define GP gp" >> $CONFIG
+@@ -31,16 +35,16 @@
+ echo "#define GREP grep" >> $CONFIG
fi
+-GP=`which \gp` && echo "#define GP \"$GP\"" >> $CONFIG
+-if [ -z "$GP" ];
+-then
++##GP=`which \gp` && echo "#define GP \"$GP\"" >> $CONFIG
++##if [ -z "$GP" ];
++##then
+ GP="/usr/bin/gp"
+-echo "*WARNING*: Could not find gp --- will not be able to build new_data";
+-echo "*WARNING*: Assumed default path: $GP"
++##echo "*WARNING*: Could not find gp --- will not be able to build new_data";
++##echo "*WARNING*: Assumed default path: $GP"
+ echo "#define GP \"$GP\"" >> $CONFIG
+-fi
++##fi
+
-SED=`which \sed` && echo "#define SED \"$SED\"" >> $CONFIG
+SED=`which \sed` && echo "#define SED \"$SED\"" >> $CONFIG && echo "SED = $SED" >> $FILE
if [ -z "$SED" ];
then
echo "*WARNING*: Could not find sed --- will not be able to build new_data";
-@@ -259,6 +263,8 @@
+@@ -261,6 +265,8 @@
OPT="-O3 ${CFLAGS}" && echo "OPT = $OPT" >> $FILE
@@ -50,7 +65,7 @@ Last-Update: 2014-10-25
echo "SRCS0 = fpu.c" >> $FILE
echo "SRCS1 = analrank.c analytic.c compute.c compute2.c help.c" >> $FILE
echo "SRCS2 = conductors.c disk.c ec_ap.c ec_ap_bsgs.c ec_ap_large.c" >> $FILE
-@@ -302,25 +308,35 @@
+@@ -304,25 +310,35 @@
####echo "WDIR = SYMPOW-\$(VERSION)" >> $FILE && echo "" >> $FILE
####fi
diff --git a/debian/patches/upstream-endiantuple.patch b/debian/patches/upstream-endiantuple.patch
index 1a890b4..4f6c82d 100644
--- a/debian/patches/upstream-endiantuple.patch
+++ b/debian/patches/upstream-endiantuple.patch
@@ -9,7 +9,7 @@ Last-Update: 2014-10-06
--- a/Configure
+++ b/Configure
-@@ -52,6 +52,18 @@
+@@ -54,6 +54,18 @@
echo "#define SH \"$SH\"" >> $CONFIG
echo "SH = $SH" >> $FILE
@@ -28,7 +28,7 @@ Last-Update: 2014-10-06
CC=${CC:-gcc} && echo "CC = $CC" >> $FILE
##if [ -z "$CC" ];
##then
-@@ -186,6 +198,35 @@
+@@ -188,6 +200,35 @@
##
diff --git a/debian/patches/upstream-floating_point-rounding_precision.patch b/debian/patches/upstream-floating_point-rounding_precision.patch
index ab6f8ec..b96901c 100644
--- a/debian/patches/upstream-floating_point-rounding_precision.patch
+++ b/debian/patches/upstream-floating_point-rounding_precision.patch
@@ -73,7 +73,7 @@ Last-Update: 2014-10-25
- .section .note.GNU-stack,"", at progbits
--- a/Configure
+++ b/Configure
-@@ -88,9 +88,10 @@
+@@ -90,9 +90,10 @@
# possible in registers.
# We compile in the fpu.c which only does
# something if the macro x86 is defined.
@@ -87,7 +87,7 @@ Last-Update: 2014-10-25
# Compiled successfully, now run it
config/fpubits >/dev/null 2>/dev/null
status=$?
-@@ -100,20 +101,36 @@
+@@ -102,20 +103,36 @@
# we simply need the program not to crash (which would
# give an exit status > 128).
CFLAGS="$CFLAGS $flag"
diff --git a/debian/patches/upstream-sage-Configure-adapted2debian.patch b/debian/patches/upstream-sage-Configure-adapted2debian.patch
index c1e9bdb..1dfe76e 100644
--- a/debian/patches/upstream-sage-Configure-adapted2debian.patch
+++ b/debian/patches/upstream-sage-Configure-adapted2debian.patch
@@ -10,7 +10,7 @@ Origin: sage/debian
Author:
David Kirkby
Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-10-22
+Last-Update: 2014-10-26
--- a/Configure
+++ b/Configure
@@ -29,7 +29,7 @@ Last-Update: 2014-10-22
if [ -z "$RM" ];
then
echo "**ERROR**: Could not find rm"; exit;
-@@ -19,21 +19,21 @@
+@@ -19,21 +19,23 @@
echo "VERSION = $VERSION" >> $FILE
echo "#define RM \"$RM\"" >> $CONFIG
@@ -45,8 +45,11 @@ Last-Update: 2014-10-22
+GP=`which \gp` && echo "#define GP \"$GP\"" >> $CONFIG
if [ -z "$GP" ];
then
++GP="/usr/bin/gp"
echo "*WARNING*: Could not find gp --- will not be able to build new_data";
- echo "#define GP gp" >> $CONFIG
+-echo "#define GP gp" >> $CONFIG
++echo "*WARNING*: Assumed default path: $GP"
++echo "#define GP \"$GP\"" >> $CONFIG
fi
-SED=sed && echo "#define SED \"$SED\"" >> $CONFIG
@@ -54,7 +57,7 @@ Last-Update: 2014-10-22
if [ -z "$SED" ];
then
echo "*WARNING*: Could not find sed --- will not be able to build new_data";
-@@ -43,62 +43,167 @@
+@@ -43,62 +45,167 @@
[ -n "$GREP" ] && [ -n "$GP" ] && [ -n "$SED" ]\
&& echo "#define NEW_DATA" >> $CONFIG
@@ -264,7 +267,7 @@ Last-Update: 2014-10-22
echo "OTHER = new_data COPYING README Configure fpu32.s fpu64.s" >> $FILE
echo "OTHERgp = standard1.gp standard2.gp standard3.gp" >> $FILE
echo "OTHERb = armd.gp ianalrank.gp ihmd.gp imd.gp armd.sh" >> $FILE
-@@ -110,57 +215,57 @@
+@@ -110,57 +217,57 @@
echo "DATAFILES = $df/*M.txt $df/*S.txt $df/param_data" >> $FILE
echo "RM = $RM" >> $FILE
diff --git a/debian/patches/upstream-system_wide.patch b/debian/patches/upstream-system_wide.patch
index 81055d3..1780c19 100644
--- a/debian/patches/upstream-system_wide.patch
+++ b/debian/patches/upstream-system_wide.patch
@@ -706,7 +706,7 @@ Last-Update: 2014-10-24
echo "#define VERSION \"$VERSION\"" >> $CONFIG
echo "VERSION = $VERSION" >> $FILE
echo "#define RM \"$RM\"" >> $CONFIG
-@@ -111,10 +116,10 @@
+@@ -113,10 +118,10 @@
return 2
}
@@ -720,7 +720,7 @@ Last-Update: 2014-10-24
exit 1
fi
-@@ -268,6 +273,13 @@
+@@ -270,6 +275,13 @@
echo "clean:" >> $FILE
##echo " \$(RM) -f \$(OBJSf) sympow \$(TILDES) \$(TARS)" >> $FILE
echo " \$(RM) -f \$(OBJS) sympow \$(TILDES)" >> $FILE
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sympow.git
More information about the debian-science-commits
mailing list