[sympow] 01/01: Imported Debian patch 1.023-5 (Closes: #766934)
Jerome Benoit
calculus-guest at moszumanska.debian.org
Mon Oct 27 03:53:38 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 300e52197b63858321c0d58e61abf1d3e108615c
Author: Jerome Benoit <calculus at rezozer.net>
Date: Mon Oct 27 02:31:21 2014 +0100
Imported Debian patch 1.023-5 (Closes: #766934)
---
debian/changelog | 9 +++
debian/patches/debianization-help2man.patch | 8 +-
debian/patches/debianization.patch | 59 +++++++++-----
debian/patches/upstream-endiantuple.patch | 4 +-
...pstream-floating_point-rounding_precision.patch | 4 +-
.../upstream-sage-Configure-adapted2debian.patch | 91 ++++++++++++----------
debian/patches/upstream-system_wide.patch | 4 +-
debian/rules | 3 +
8 files changed, 110 insertions(+), 72 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6cc8d78..d9c55fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sympow (1.023-5) unstable; urgency=medium
+
+ * Debianization:
+ - debian/patches/:
+ - minor consistency correction;
+ - binary-arch/binary-indep scheme, harden (Closes: #766934).
+
+ -- Jerome Benoit <calculus at rezozer.net> Mon, 27 Oct 2014 03:02:48 +0000
+
sympow (1.023-4) unstable; urgency=medium
* Debianization:
diff --git a/debian/patches/debianization-help2man.patch b/debian/patches/debianization-help2man.patch
index 2164a05..72850b5 100644
--- a/debian/patches/debianization-help2man.patch
+++ b/debian/patches/debianization-help2man.patch
@@ -8,8 +8,8 @@ Last-Update: 2014-10-25
--- a/Configure
+++ b/Configure
@@ -83,6 +83,12 @@
- echo "**ERROR**: Could not find uname"; exit;
- fi
+ ##echo "**ERROR**: Could not find uname"; exit;
+ ##fi
+HELP2MAN=`which \help2man` && echo "HELP2MAN = $HELP2MAN" >> $FILE
+if [ -z "$HELP2MAN" ];
@@ -54,5 +54,5 @@ Last-Update: 2014-10-25
-echo " \$(RM) -f \$(OBJS) sympow \$(TILDES)" >> $FILE
+echo " \$(RM) -f \$(OBJS) sympow sympow.1 \$(TILDES)" >> $FILE
echo " \$(RM) -rf datafiles" >> $FILE
- echo "install: all" >> $FILE
- echo " install -d \$(DESTDIR)/$PREFIX/bin" >> $FILE
+ echo "install-arch: build-arch" >> $FILE
+ echo " install -d \$(DESTDIR)$PREFIX/bin" >> $FILE
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 1d9307b..6e73672 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -3,7 +3,7 @@ Description: debianization
to address Debian specific stuff in general.
This is a Debian centric patch.
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-10-25
+Last-Update: 2014-10-27
--- a/Configure
+++ b/Configure
@@ -32,23 +32,23 @@ Last-Update: 2014-10-25
echo "VERSION = $VERSION" >> $FILE
echo "#define RM \"$RM\"" >> $CONFIG
-@@ -31,16 +35,16 @@
- echo "#define GREP grep" >> $CONFIG
+@@ -31,14 +35,16 @@
+ echo "#define GREP \"grep\"" >> $CONFIG
fi
-GP=`which \gp` && echo "#define GP \"$GP\"" >> $CONFIG
-if [ -z "$GP" ];
-then
+-echo "*WARNING*: Could not find gp --- will not be able to build new_data";
+-echo "#define GP \"gp\"" >> $CONFIG
+-fi
+##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"
++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 "#define GP \"$GP\"" >> $CONFIG
--fi
++echo "#define GP \"$GP\"" >> $CONFIG
+##fi
-SED=`which \sed` && echo "#define SED \"$SED\"" >> $CONFIG
@@ -56,7 +56,7 @@ Last-Update: 2014-10-25
if [ -z "$SED" ];
then
echo "*WARNING*: Could not find sed --- will not be able to build new_data";
-@@ -261,6 +265,8 @@
+@@ -259,6 +265,8 @@
OPT="-O3 ${CFLAGS}" && echo "OPT = $OPT" >> $FILE
@@ -65,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
-@@ -304,25 +310,35 @@
+@@ -302,25 +310,37 @@
####echo "WDIR = SYMPOW-\$(VERSION)" >> $FILE && echo "" >> $FILE
####fi
@@ -91,19 +91,40 @@ Last-Update: 2014-10-25
echo "clean:" >> $FILE
##echo " \$(RM) -f \$(OBJSf) sympow \$(TILDES) \$(TARS)" >> $FILE
echo " \$(RM) -f \$(OBJS) sympow \$(TILDES)" >> $FILE
+-echo "install: all" >> $FILE
+-echo " install -d \$(DESTDIR)/$PREFIX/bin" >> $FILE
+-echo " install -d \$(DESTDIR)/$PREFIX/lib/sympow" >> $FILE
+-echo " install -d \$(DESTDIR)/$PREFIX/share/sympow" >> $FILE
+-echo " install -t \$(DESTDIR)/$PREFIX/bin sympow" >> $FILE
+-echo " install -t \$(DESTDIR)/$PREFIX/lib/sympow new_data" >> $FILE
+-echo " cp -t \$(DESTDIR)/$PREFIX/share/sympow standard1.gp standard2.gp standard3.gp" >> $FILE
+echo " \$(RM) -rf datafiles" >> $FILE
- echo "install: all" >> $FILE
- echo " install -d \$(DESTDIR)/$PREFIX/bin" >> $FILE
- echo " install -d \$(DESTDIR)/$PREFIX/lib/sympow" >> $FILE
- echo " install -d \$(DESTDIR)/$PREFIX/share/sympow" >> $FILE
-+echo " install -d \$(DESTDIR)/$PREFIX/share/sympow/datafiles" >> $FILE
- echo " install -t \$(DESTDIR)/$PREFIX/bin sympow" >> $FILE
- echo " install -t \$(DESTDIR)/$PREFIX/lib/sympow new_data" >> $FILE
- echo " cp -t \$(DESTDIR)/$PREFIX/share/sympow standard1.gp standard2.gp standard3.gp" >> $FILE
-+echo " cp -t \$(DESTDIR)/$PREFIX/share/sympow/datafiles datafiles/*.txt datafiles/param_data" >> $FILE
++echo "install-arch: build-arch" >> $FILE
++echo " install -d \$(DESTDIR)$PREFIX/bin" >> $FILE
++echo " install -t \$(DESTDIR)$PREFIX/bin sympow" >> $FILE
++echo "install-indep: build-indep" >> $FILE
++echo " install -d \$(DESTDIR)$PREFIX/lib/sympow" >> $FILE
++echo " install -d \$(DESTDIR)$PREFIX/share/sympow" >> $FILE
++echo " install -d \$(DESTDIR)$PREFIX/share/sympow/datafiles" >> $FILE
++echo " install -t \$(DESTDIR)$PREFIX/lib/sympow new_data" >> $FILE
++echo " cp -t \$(DESTDIR)$PREFIX/share/sympow standard1.gp standard2.gp standard3.gp" >> $FILE
++echo " cp -t \$(DESTDIR)$PREFIX/share/sympow/datafiles datafiles/*.txt datafiles/param_data" >> $FILE
++echo "install: install-arch #install-indep" >> $FILE
####if [ -n "$TAR" ];
####then
####echo "source:" >> $FILE
+@@ -342,7 +362,7 @@
+ $RM -f Makefile.new
+
+ echo "Makefile has been re-made. Use make if you wish to build SYMPOW"
+-echo ""
+-echo "**ATTENTION** If you wish build SYMPOW, please ensure beforehand"
+-echo "that the various licenses of your C compiler, linker, assembler, etc."
+-echo "allow you to create a derived work based on SYMPOW and your C libraries"
++####echo ""
++####echo "**ATTENTION** If you wish build SYMPOW, please ensure beforehand"
++####echo "that the various licenses of your C compiler, linker, assembler, etc."
++####echo "allow you to create a derived work based on SYMPOW and your C libraries"
--- a/sympow.h
+++ b/sympow.h
@@ -1,3 +1,4 @@
diff --git a/debian/patches/upstream-endiantuple.patch b/debian/patches/upstream-endiantuple.patch
index 4f6c82d..1a890b4 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
-@@ -54,6 +54,18 @@
+@@ -52,6 +52,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
-@@ -188,6 +200,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 b96901c..ab6f8ec 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
-@@ -90,9 +90,10 @@
+@@ -88,9 +88,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=$?
-@@ -102,20 +103,36 @@
+@@ -100,20 +101,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 1dfe76e..a456499 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-26
+Last-Update: 2014-10-27
--- a/Configure
+++ b/Configure
@@ -29,7 +29,7 @@ Last-Update: 2014-10-26
if [ -z "$RM" ];
then
echo "**ERROR**: Could not find rm"; exit;
-@@ -19,21 +19,23 @@
+@@ -19,86 +19,191 @@
echo "VERSION = $VERSION" >> $FILE
echo "#define RM \"$RM\"" >> $CONFIG
@@ -38,18 +38,17 @@ Last-Update: 2014-10-26
if [ -z "$GREP" ];
then
echo "*WARNING*: Could not find grep --- will not be able to build new_data";
- echo "#define GREP grep" >> $CONFIG
+-echo "#define GREP grep" >> $CONFIG
++echo "#define GREP \"grep\"" >> $CONFIG
fi
-GP=gp && echo "#define GP \"$GP\"" >> $CONFIG
+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 "*WARNING*: Assumed default path: $GP"
-+echo "#define GP \"$GP\"" >> $CONFIG
++echo "#define GP \"gp\"" >> $CONFIG
fi
-SED=sed && echo "#define SED \"$SED\"" >> $CONFIG
@@ -57,7 +56,10 @@ Last-Update: 2014-10-26
if [ -z "$SED" ];
then
echo "*WARNING*: Could not find sed --- will not be able to build new_data";
-@@ -43,62 +45,167 @@
+-echo "#define SED sed" >> $CONFIG
++echo "#define SED \"sed\"" >> $CONFIG
+ fi
+
[ -n "$GREP" ] && [ -n "$GP" ] && [ -n "$SED" ]\
&& echo "#define NEW_DATA" >> $CONFIG
@@ -66,12 +68,6 @@ Last-Update: 2014-10-26
-then
-echo "**ERROR**: Could not find sh"; exit;
-fi
--
--CC=cc && echo "CC = $CC" >> $FILE
--if [ -z "$CC" ];
--then
--echo "**ERROR**: Could not find cc"; exit;
--fi
+SH=/bin/sh
+echo "#define SH \"$SH\"" >> $CONFIG
+echo "SH = $SH" >> $FILE
@@ -82,33 +78,12 @@ Last-Update: 2014-10-26
+##echo "**ERROR**: Could not find cc"; exit;
+##fi
+export CC
-
--UNAME=uname
-+UNAME=`which \uname`
- if [ -z "$UNAME" ];
- then
- echo "**ERROR**: Could not find uname"; exit;
- fi
--MACH=`"$UNAME" -m`
--for x in ix86 i386 i486 i586 i686 i386pc x86_64 ia64
--do
--if [ "$MACH" = "$x" ];
--then
--if [ "$x" = "x86_64" ] || [ "$x" = "ia64" ]
--then
--echo "You appear to have a $x based system --- linking fpu.s to fpu64.s"
--$RM -f fpu.s
--LN=ln
--$LN -s fpu64.s fpu.s
--DEFS="-Dx86 -m64"
--else
--echo "You appear to have a $x based system --- linking fpu.s to fpu32.s"
--$RM -f fpu.s
--LN=ln
--$LN -s fpu32.s fpu.s
--DEFS="-Dx86 -m32"
--fi
--fi
++
++##UNAME=`which \uname`
++##if [ -z "$UNAME" ];
++##then
++##echo "**ERROR**: Could not find uname"; exit;
++##fi
+
+## Sage material (spkg-install)
+#######################################################################
@@ -160,13 +135,43 @@ Last-Update: 2014-10-26
+for FLAG in '-fno-fast-math' '-mfpmath=sse' '-Dx86'; do
+ try_add_CFLAG $FLAG
+done
-+
+
+-CC=cc && echo "CC = $CC" >> $FILE
+-if [ -z "$CC" ];
+-then
+-echo "**ERROR**: Could not find cc"; exit;
+-fi
+# 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 && break
+done
-+
+
+-UNAME=uname
+-if [ -z "$UNAME" ];
+-then
+-echo "**ERROR**: Could not find uname"; exit;
+-fi
+-MACH=`"$UNAME" -m`
+-for x in ix86 i386 i486 i586 i686 i386pc x86_64 ia64
+-do
+-if [ "$MACH" = "$x" ];
+-then
+-if [ "$x" = "x86_64" ] || [ "$x" = "ia64" ]
+-then
+-echo "You appear to have a $x based system --- linking fpu.s to fpu64.s"
+-$RM -f fpu.s
+-LN=ln
+-$LN -s fpu64.s fpu.s
+-DEFS="-Dx86 -m64"
+-else
+-echo "You appear to have a $x based system --- linking fpu.s to fpu32.s"
+-$RM -f fpu.s
+-LN=ln
+-$LN -s fpu32.s fpu.s
+-DEFS="-Dx86 -m32"
+-fi
+-fi
+# Some flags to try as last resort. These hurt performance, so only add
+# them if needed.
+for FLAG in '' '-ffloat-store' '-O0'; do
@@ -267,7 +272,7 @@ Last-Update: 2014-10-26
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 +217,57 @@
+@@ -110,57 +215,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 1780c19..81055d3 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
-@@ -113,10 +118,10 @@
+@@ -111,10 +116,10 @@
return 2
}
@@ -720,7 +720,7 @@ Last-Update: 2014-10-24
exit 1
fi
-@@ -270,6 +275,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/rules b/debian/rules
index 2eac93c..e5d0e39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,9 @@ override_dh_auto_configure:
override_dh_auto_build-indep:
$(MAKE) build-indep
+override_dh_auto_install-indep:
+ $(MAKE) install-indep DESTDIR=$(CURDIR)/debian/tmp
+
override_dh_installchangelogs:
sed -e '/^\s*$$/d' README | csplit --prefix AdHocChangeLog - %ChangeLog%
echo '\n\n -- changelog extracted as-is from README (Debian)' >> AdHocChangeLog00
--
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