[sympow] 01/01: Imported Debian patch 1.023-2 (Closes: #766231)
Jerome Benoit
calculus-guest at moszumanska.debian.org
Wed Oct 22 02:26:45 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 cca00f11413605a4137712bbf9f99882063b80c8
Author: Jerome Benoit <calculus at rezozer.net>
Date: Wed Oct 22 02:45:26 2014 +0200
Imported Debian patch 1.023-2 (Closes: #766231)
---
debian/changelog | 11 +++++
debian/control | 2 +-
debian/patches/debianization-help2man.patch | 6 +--
debian/patches/debianization.patch | 6 +--
debian/patches/upstream-endiantuple.patch | 2 +-
...pstream-floating_point-rounding_precision.patch | 49 ++++++++++++++++------
.../upstream-sage-Configure-adapted2debian.patch | 8 ++--
debian/patches/upstream-system_wide.patch | 8 ++--
debian/source/lintian-overrides | 1 +
9 files changed, 64 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b2a3466..096111c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+sympow (1.023-2) unstable; urgency=medium
+
+ * Debianization:
+ - debian/control:
+ - Homepage field, refresh;
+ - debian/patches/:
+ - floating-point rounding precision setup, harden (Closes: #766231);
+ - lintian complains due to copyright sections for Sage patches, neutralize.
+
+ -- Jerome Benoit <calculus at rezozer.net> Wed, 22 Oct 2014 02:06:21 +0000
+
sympow (1.023-1) unstable; urgency=medium
* New upstrean release; thanks to the upstream maintainer
diff --git a/debian/control b/debian/control
index 7bec181..8df0474 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 9), autoconf, help2man,
pari-gp (>= 2.7.2)
Standards-Version: 3.9.6
-Homepage: http://www.maths.bris.ac.uk/~mamjw/
+Homepage: http://magma.maths.usyd.edu.au/~watkins/
Vcs-Git: git://anonscm.debian.org/debian-science/packages/sympow.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/sympow.git
diff --git a/debian/patches/debianization-help2man.patch b/debian/patches/debianization-help2man.patch
index f30dc72..920dd3e 100644
--- a/debian/patches/debianization-help2man.patch
+++ b/debian/patches/debianization-help2man.patch
@@ -30,7 +30,7 @@ Last-Update: 2014-09-27
## Sage material (spkg-install)
#######################################################################
# Fix FPU precision
-@@ -256,6 +265,13 @@
+@@ -261,6 +270,13 @@
echo "CFLAGS += -Wno-unused-result" >> $FILE
@@ -44,7 +44,7 @@ Last-Update: 2014-09-27
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
-@@ -301,7 +317,7 @@
+@@ -306,7 +322,7 @@
echo "default: all" >> $FILE
echo "all: build-arch build-indep" >> $FILE
@@ -53,7 +53,7 @@ Last-Update: 2014-09-27
echo "build-indep: datafiles/param_data" >> $FILE
echo "sympow: \$(OBJS)" >> $FILE
echo " \$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(OPT) -o \$@ \$(DEFS) \$(OBJS) \$(LDFLAGS) \$(LIBS)" >> $FILE
-@@ -315,9 +331,11 @@
+@@ -320,9 +336,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 35ad782..843a10e 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -27,16 +27,16 @@ Last-Update: 2014-09-29
if [ -z "$SED" ];
then
echo "*WARNING*: Could not find sed --- will not be able to build new_data";
-@@ -254,6 +254,8 @@
+@@ -259,6 +259,8 @@
- OPT="${CFLAGS} -O3" && echo "OPT = $OPT" >> $FILE
+ OPT="-O3 ${CFLAGS}" && echo "OPT = $OPT" >> $FILE
+echo "CFLAGS += -Wno-unused-result" >> $FILE
+
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
-@@ -297,25 +299,35 @@
+@@ -302,25 +304,35 @@
####echo "WDIR = SYMPOW-\$(VERSION)" >> $FILE && echo "" >> $FILE
####fi
diff --git a/debian/patches/upstream-endiantuple.patch b/debian/patches/upstream-endiantuple.patch
index 192c509..1a890b4 100644
--- a/debian/patches/upstream-endiantuple.patch
+++ b/debian/patches/upstream-endiantuple.patch
@@ -28,7 +28,7 @@ Last-Update: 2014-10-06
CC=${CC:-gcc} && echo "CC = $CC" >> $FILE
##if [ -z "$CC" ];
##then
-@@ -181,6 +193,35 @@
+@@ -186,6 +198,35 @@
##
diff --git a/debian/patches/upstream-floating_point-rounding_precision.patch b/debian/patches/upstream-floating_point-rounding_precision.patch
index 8bfe87c..d3193f8 100644
--- a/debian/patches/upstream-floating_point-rounding_precision.patch
+++ b/debian/patches/upstream-floating_point-rounding_precision.patch
@@ -5,7 +5,7 @@ Description: floating-point rounding precision
the former material as last resort.
Origin: debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-10-07
+Last-Update: 2014-10-22
--- a/fpu32.s
+++ /dev/null
@@ -73,12 +73,35 @@ Last-Update: 2014-10-07
- .section .note.GNU-stack,"", at progbits
--- a/Configure
+++ b/Configure
-@@ -106,8 +106,15 @@
+@@ -88,8 +88,9 @@
+ # possible in registers.
+ # We compile in the fpu.c which only does
+ # something if the macro x86 is defined.
+- local flag=$1
+- local status=0
++ local flag=$1 # first argument: C FLAG to test
++ local bypassfputest=${2:-nobypass} # second argument: wether or not bypass the numerical test (default: not)
++ local status=0
+ if $CC $ORIGINALCFLAGS $CFLAGS -O3 $flag config/fpubits1.c config/fpubits2.c fpu.c -o config/fpubits 2>/dev/null; then
+ # Compiled successfully, now run it
+ config/fpubits >/dev/null 2>/dev/null
+@@ -100,20 +101,36 @@
+ # we simply need the program not to crash (which would
+ # give an exit status > 128).
+ CFLAGS="$CFLAGS $flag"
+- return $status
++ if [ "x$bypassfputest" = "xnobypass" ]; then
++ return $status
++ else
++ return 0
++ fi
+ fi
+ fi
return 2
}
+# Let move to 21st century
-+try_add_CFLAG '-std=c11'
++try_add_CFLAG '-std=c11' bypass
+if [ $? -ne 0 ]; then
+ echo >&2 "Error: move to 21st century is denied"
+ exit 1
@@ -86,22 +109,22 @@ Last-Update: 2014-10-07
+
# These flags never hurt, so add them if possible
-for FLAG in '-fno-fast-math' '-mfpmath=sse' '-Dx86'; do
+- try_add_CFLAG $FLAG
+for FLAG in '-fno-fast-math' '-mfpmath=sse'; do
- try_add_CFLAG $FLAG
++ try_add_CFLAG $FLAG bypass
done
-@@ -117,6 +124,11 @@
+ # Add at most one flag of the following to avoid gcc warnings:
+ # gcc versions which support -ffp-contract deprecate -mno-fused-madd
+ for FLAG in '-ffp-contract=on' '-mno-fused-madd'; do
++ try_add_CFLAG $FLAG bypass && break
++done
++
++# Select the most apropriate FPU control scheme
++for FLAG in '-DISOC99_FENV' '-DFPUCONTROLH' '-Dx86'; do
try_add_CFLAG $FLAG && break
done
-+# Select the most apropriate FPU control scheme
-+for FLAG in '-DISOC99_FENV' '-DFPUCONTROLH' '-Dx86'; do
-+ try_add_CFLAG $FLAG && break
-+done
-+
- # Some flags to try as last resort. These hurt performance, so only add
- # them if needed.
- for FLAG in '' '-ffloat-store' '-O0'; do
--- a/fpu.c
+++ b/fpu.c
@@ -28,13 +28,35 @@
diff --git a/debian/patches/upstream-sage-Configure-adapted2debian.patch b/debian/patches/upstream-sage-Configure-adapted2debian.patch
index 57eb224..c1e9bdb 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-07
+Last-Update: 2014-10-22
--- a/Configure
+++ b/Configure
@@ -137,7 +137,7 @@ Last-Update: 2014-10-07
+ # something if the macro x86 is defined.
+ local flag=$1
+ local status=0
-+ if $CC $ORIGINALCFLAGS $CFLAGS $flag -O3 config/fpubits1.c config/fpubits2.c fpu.c -o config/fpubits 2>/dev/null; then
++ if $CC $ORIGINALCFLAGS $CFLAGS -O3 $flag config/fpubits1.c config/fpubits2.c fpu.c -o config/fpubits 2>/dev/null; then
+ # Compiled successfully, now run it
+ config/fpubits >/dev/null 2>/dev/null
+ status=$?
@@ -179,7 +179,7 @@ Last-Update: 2014-10-07
-echo "DEFS = $DEFS" >> $FILE
+# Check the actual FPU precision with our new flags.
-+CC_ARGS="$ORIGINALCFLAGS $CFLAGS -O3 config/fpubits1.c config/fpubits2.c fpu.c -o config/fpubits"
++CC_ARGS="$ORIGINALCFLAGS -O3 $CFLAGS config/fpubits1.c config/fpubits2.c fpu.c -o config/fpubits"
+$CC $CC_ARGS
+if [ $? -ne 0 ]; then
+ echo >&2 "Error: the command below failed:"
@@ -249,7 +249,7 @@ Last-Update: 2014-10-07
+##echo "DEFS = $DEFS" >> $FILE
-OPT="-O3" && echo "OPT = $OPT" >> $FILE
-+OPT="${CFLAGS} -O3" && echo "OPT = $OPT" >> $FILE
++OPT="-O3 ${CFLAGS}" && echo "OPT = $OPT" >> $FILE
+echo "SRCS0 = fpu.c" >> $FILE
echo "SRCS1 = analrank.c analytic.c compute.c compute2.c help.c" >> $FILE
diff --git a/debian/patches/upstream-system_wide.patch b/debian/patches/upstream-system_wide.patch
index d21b705..783d815 100644
--- a/debian/patches/upstream-system_wide.patch
+++ b/debian/patches/upstream-system_wide.patch
@@ -694,21 +694,21 @@ Last-Update: 2014-10-06
echo "#define VERSION \"$VERSION\"" >> $CONFIG
echo "VERSION = $VERSION" >> $FILE
echo "#define RM \"$RM\"" >> $CONFIG
-@@ -106,10 +111,10 @@
+@@ -111,10 +116,10 @@
return 2
}
-# Let move to 21st century
--try_add_CFLAG '-std=c11'
+-try_add_CFLAG '-std=c11' bypass
+# Let move to 21st century and add GNU features (asprintf)
-+try_add_CFLAG '-std=gnu11'
++try_add_CFLAG '-std=gnu11' bypass
if [ $? -ne 0 ]; then
- echo >&2 "Error: move to 21st century is denied"
+ echo >&2 "Error: moving to 21st century and adding GNU feature are denied"
exit 1
fi
-@@ -263,6 +268,13 @@
+@@ -268,6 +273,13 @@
echo "clean:" >> $FILE
##echo " \$(RM) -f \$(OBJSf) sympow \$(TILDES) \$(TARS)" >> $FILE
echo " \$(RM) -f \$(OBJS) sympow \$(TILDES)" >> $FILE
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 8b06cb1..00ccadd 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1 +1,2 @@
debian-watch-may-check-gpg-signature
+unused-file-paragraph-in-dep5-copyright
--
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