diff -Nru boinc-app-seti-8.00~svn3363/debian/changelog boinc-app-seti-8.00~svn3363/debian/changelog --- boinc-app-seti-8.00~svn3363/debian/changelog 2016-02-02 08:15:39.000000000 +0000 +++ boinc-app-seti-8.00~svn3363/debian/changelog 2016-07-14 09:40:58.000000000 +0000 @@ -1,3 +1,21 @@ +boinc-app-seti (8.00~svn3363-3) unstable; urgency=medium + + [ Steffen Moeller ] + * Transition to auto-dbg packages + * Removed dependency on unused libgsl (Closes: #823878), thanks for spotting + and suggesting so go to James Cowgill. + * Bumped standard to 3.9.8. + * Demand at least i686 architecture for x86. + * Introduce -march=native for local builds and added respective instructions + to debian/README.Debian + + [ Gianfranco Costamagna ] + * Fix VCS fields. + * Remove build fix for arm, preferring upstream fix. + * Fix build with gcc-6 and glib-2.23 (Closes: #831186) + + -- Gianfranco Costamagna Thu, 14 Jul 2016 11:40:51 +0200 + boinc-app-seti (8.00~svn3363-2) unstable; urgency=medium * Fix an armhf build failure by reverting the pld removal. diff -Nru boinc-app-seti-8.00~svn3363/debian/control boinc-app-seti-8.00~svn3363/debian/control --- boinc-app-seti-8.00~svn3363/debian/control 2015-10-28 11:36:06.000000000 +0000 +++ boinc-app-seti-8.00~svn3363/debian/control 2016-05-16 09:36:26.000000000 +0000 @@ -5,19 +5,18 @@ Uploaders: Steffen Moeller , Guo Yixuan (郭溢譞) , Gianfranco Costamagna -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Build-Depends: debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.16.1.1), freeglut3-dev, libboinc-app-dev, libfftw3-dev, - libgsl0-dev, libjpeg-dev, libxi-dev, libxmu-dev -Vcs-Git: git://anonscm.debian.org/pkg-boinc/boinc-app-seti.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-boinc/boinc-app-seti.git +Vcs-Git: https://anonscm.debian.org/git/pkg-boinc/boinc-app-seti.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-boinc/boinc-app-seti.git Homepage: http://setiathome.berkeley.edu/ Package: boinc-app-seti @@ -77,19 +76,3 @@ . This package provides graphic interface for SETI@HOME Enhanced application. The boinc-app-seti package only provides command line application. - -Package: boinc-app-seti-dbg -Architecture: any -Depends: boinc-app-seti (= ${binary:Version}) | boinc-app-seti-graphics (= ${binary:Version}), - ${misc:Depends} -Section: debug -Description: debug symbols for SETI@home - SETI@home is a distributed computing project using Internet-connected - computers for the Search for Extraterrestrial Intelligence (SETI). It - searches for possible evidence of extraterrestrial intelligence in - radio transmissions collected by the Arecibo radio telescope. - . - This package provide debug information. It comes handy when you have - optimised the code of SETI yourself and find it crash or be stuck in - an infinite loop or you may be asked to install the package for some - joint investigation with the SETI core developers. diff -Nru boinc-app-seti-8.00~svn3363/debian/patches/isnan-fix.patch boinc-app-seti-8.00~svn3363/debian/patches/isnan-fix.patch --- boinc-app-seti-8.00~svn3363/debian/patches/isnan-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ boinc-app-seti-8.00~svn3363/debian/patches/isnan-fix.patch 2016-07-14 09:44:37.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix isnan bad reference +Author: Gianfranco Costamagna +Bug-Debian: https://bugs.debian.org/831186 + +--- boinc-app-seti-8.00~svn3363.orig/client/vector/analyzeFuncs_vector.cpp ++++ boinc-app-seti-8.00~svn3363/client/vector/analyzeFuncs_vector.cpp +@@ -45,9 +45,7 @@ + #include + #include + #include +-#ifdef __APPLE_CC__ + #define isnan std::isnan +-#endif + #include + #include + #ifdef HAVE_FLOAT_H diff -Nru boinc-app-seti-8.00~svn3363/debian/patches/series boinc-app-seti-8.00~svn3363/debian/patches/series --- boinc-app-seti-8.00~svn3363/debian/patches/series 2016-02-01 16:12:43.000000000 +0000 +++ boinc-app-seti-8.00~svn3363/debian/patches/series 2016-07-14 09:40:13.000000000 +0000 @@ -11,4 +11,6 @@ 006_omitting_archs.patch 007_worker_comments.patch 216-fix-build.patch -fix-arm-build.patch +#fix-arm-build.patch +isnan-fix.patch +upstream-fix.patch diff -Nru boinc-app-seti-8.00~svn3363/debian/patches/upstream-fix.patch boinc-app-seti-8.00~svn3363/debian/patches/upstream-fix.patch --- boinc-app-seti-8.00~svn3363/debian/patches/upstream-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ boinc-app-seti-8.00~svn3363/debian/patches/upstream-fix.patch 2016-07-14 09:27:01.000000000 +0000 @@ -0,0 +1,11 @@ +Description: cherry-pick little upstream fix for arm +--- boinc-app-seti-8.00~svn3363.orig/client/vector/analyzeFuncs_vfp_aux.cpp ++++ boinc-app-seti-8.00~svn3363/client/vector/analyzeFuncs_vfp_aux.cpp +@@ -47,6 +47,7 @@ + #include "diagnostics.h" + #include "asmlib.h" + #include "pulsefind.h" ++#include "fp_arm.h" + + + template diff -Nru boinc-app-seti-8.00~svn3363/debian/README.Debian boinc-app-seti-8.00~svn3363/debian/README.Debian --- boinc-app-seti-8.00~svn3363/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ boinc-app-seti-8.00~svn3363/debian/README.Debian 2016-05-16 09:36:00.000000000 +0000 @@ -0,0 +1,17 @@ +boinc-app-seti +============== + +This package nicely integrates with BOINC for those contributing to SETI. To +best possibly help with the computation, it is suggested to recompile the +package locally. To indicate that there are no ambitions to upload the +compiled-to-local-package to the archive, add "local" to the DEB_BUILD_OPTIONS. + +The following you may perform on any Debian platform that understands the +-march=native flag, which is Linux as of today: + + sudo apt-get build-dep boinc-app-seti + DEB_BUILD_OPTIONS=local apt-get source --compile boinc-app-seti + sudo dpkg -i boinc-app-seti_*.deb + + + -- Steffen Moeller Sun, 15 May 2016 21:09:02 +0200 diff -Nru boinc-app-seti-8.00~svn3363/debian/rules boinc-app-seti-8.00~svn3363/debian/rules --- boinc-app-seti-8.00~svn3363/debian/rules 2016-02-01 14:14:53.000000000 +0000 +++ boinc-app-seti-8.00~svn3363/debian/rules 2016-05-16 09:54:10.000000000 +0000 @@ -59,13 +59,9 @@ ifneq (clang,$(CXX)) CFLAGS_APPEND += -O3 -#CFLAGS_APPEND += -mnative #CFLAGS_APPEND += -mno-avx #CFLAGS_APPEND += -msse4.2 GCCVERSION=$(shell $(CXX) --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.) -# gcc 4.6 on precise has issues while gcc 4.7 and 4.8 on sid are just fine with -mno-avx set on non bulldozer/SandyBridge machines -# CFLAGS_APPEND += -flto -# LDFLAGS += -flto endif ifeq (clang,$(CXX)) @@ -74,13 +70,26 @@ # -O4 implies link-time optimisation with clang, fails endif -# Although all source file are C++, some handwritten rules in -# client/Makefile.am seem to use CFLAGS only. -CFLAGS += $(CFLAGS_APPEND) -CXXFLAGS += $(CFLAGS_APPEND) +ifeq (linux,$(shell dpkg-architecture -qDEB_TARGET_ARCH_OS)) +ifneq (,$(findstring local,$(DEB_BUILD_OPTIONS))) +LOCALOPTIMISATION="yes" +endif +ifeq (,$(shell dpkg-parsechangelog | egrep '^Distribution:' |egrep -v 'UNRELEASED')) +LOCALOPTIMISATION="yes" +endif +endif -# This is a shame, but there is yet no AltiVec for Linux PowerPC with SETI -SETIEXTRAFLAGS= --disable-altivec +# If the package is not meant to be distributed to main servers, then maximise optimisation +ifneq (,$(LOCALOPTIMISATION)) + $(info I: Setting native flags for optimisation) + CFLAGS_APPEND += -march=native -mtune=native +else + $(info W: Would have set native flags for optimisation but supported only for linux) +ifeq ($(DEB_BUILD_GNU_CPU),i686) + # Demand i686 class system + CFLAGS_APPEND += -march=i686 -mcpu=i686 +endif +endif ifeq ($(DEB_BUILD_GNU_CPU),x86_64) SETIEXTRAFLAGS += --enable-sse3 @@ -92,6 +101,27 @@ SETIEXTRAFLAGS += --enable-sse2 --enable-sse --enable-mmx endif +# This is a shame, but there is yet no AltiVec for Linux PowerPC with SETI +SETIEXTRAFLAGS= --disable-altivec + +# Link-time optimisation demands knowledge about all CFLAGS both at +# compile time (as represented by CFLAGS and CXXFLAGS) but also at +# at link time. +#ifeq (,$(findstring nolto,$(DEB_BUILD_OPTIONS))) +# $(info I: Activating LinkTimeOptimisation) +# SETIEXTRAFLAGS += -flto +# LDFLAGS += -flto +# #CXX := $(CXX) $(CXXFLAGS) +# #CC := $(CC) $(CFLAGS) +# AR := gcc-ar +# RANLIB := gcc-ranlib +#endif + +# Although all source file are C++, some handwritten rules in +# client/Makefile.am seem to use CFLAGS only. +CFLAGS += $(CFLAGS_APPEND) +CXXFLAGS += $(CFLAGS_APPEND) + # Get upstream version from debian version. UPSTREAM_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | \ @@ -154,7 +184,7 @@ override_dh_strip: - dh_strip --dbg-package=boinc-app-seti-dbg + dh_strip --dbgsym-migration=boinc-app-seti-dbg origDir ?= .