From 31009204cbb5fb615f76746f5cbf4e95fa5def7d Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 30 Sep 2014 12:49:40 +0000 Subject: [PATCH 1/1] Import boinc-app-seti_7.28~svn2633-3.debian.tar.xz [dgit import tarball boinc-app-seti 7.28~svn2633-3 boinc-app-seti_7.28~svn2633-3.debian.tar.xz] --- README.source | 55 ++ boinc-app-seti-graphics.README.Debian | 40 ++ boinc-app-seti-graphics.dirs | 3 + boinc-app-seti-graphics.docs | 1 + boinc-app-seti-graphics.install | 4 + boinc-app-seti-graphics.postinst | 40 ++ boinc-app-seti-graphics.prerm | 44 ++ boinc-app-seti.README.Debian | 40 ++ boinc-app-seti.dirs | 3 + boinc-app-seti.docs | 1 + boinc-app-seti.install | 3 + boinc-app-seti.postinst | 40 ++ boinc-app-seti.prerm | 44 ++ changelog | 493 ++++++++++++++++++ clean | 2 + compat | 1 + control | 98 ++++ copyright | 112 ++++ extra-graphics/app_info.xml.in | 25 + extra-graphics/seti-graphics.cfg | 8 + extra/app_info.xml.in | 17 + extra/seti.cfg | 7 + gbp.conf | 4 + patches/001_disable_avx_in_configure.patch | 24 + patches/002_disable_static_linkage.patch | 29 ++ .../003_dont_use_own_jpeglib_and_glut.patch | 30 ++ .../004_disable_altivec_on_ppc_linux.patch | 24 + patches/005_powerpc_altivec.patch | 15 + patches/006_omitting_archs.patch | 49 ++ patches/007_worker_comments.patch | 40 ++ patches/210_fix_fgets_warning.patch | 61 +++ patches/211_give_stderr_some_output.patch | 54 ++ patches/212_increase_buffers.patch | 36 ++ patches/213_const_warning_reduction.patch | 51 ++ patches/214_fix_armhf.patch | 51 ++ patches/README.patches | 9 + patches/series | 13 + rules | 173 ++++++ source/format | 1 + 39 files changed, 1745 insertions(+) create mode 100644 README.source create mode 100644 boinc-app-seti-graphics.README.Debian create mode 100644 boinc-app-seti-graphics.dirs create mode 100644 boinc-app-seti-graphics.docs create mode 100644 boinc-app-seti-graphics.install create mode 100644 boinc-app-seti-graphics.postinst create mode 100644 boinc-app-seti-graphics.prerm create mode 100644 boinc-app-seti.README.Debian create mode 100644 boinc-app-seti.dirs create mode 100644 boinc-app-seti.docs create mode 100644 boinc-app-seti.install create mode 100644 boinc-app-seti.postinst create mode 100644 boinc-app-seti.prerm create mode 100644 changelog create mode 100644 clean create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 extra-graphics/app_info.xml.in create mode 100644 extra-graphics/seti-graphics.cfg create mode 100644 extra/app_info.xml.in create mode 100644 extra/seti.cfg create mode 100644 gbp.conf create mode 100644 patches/001_disable_avx_in_configure.patch create mode 100644 patches/002_disable_static_linkage.patch create mode 100644 patches/003_dont_use_own_jpeglib_and_glut.patch create mode 100644 patches/004_disable_altivec_on_ppc_linux.patch create mode 100644 patches/005_powerpc_altivec.patch create mode 100644 patches/006_omitting_archs.patch create mode 100644 patches/007_worker_comments.patch create mode 100644 patches/210_fix_fgets_warning.patch create mode 100644 patches/211_give_stderr_some_output.patch create mode 100644 patches/212_increase_buffers.patch create mode 100644 patches/213_const_warning_reduction.patch create mode 100644 patches/214_fix_armhf.patch create mode 100644 patches/README.patches create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format diff --git a/README.source b/README.source new file mode 100644 index 0000000..bbd520e --- /dev/null +++ b/README.source @@ -0,0 +1,55 @@ +Modifications to the upstream source: + Some files are removed for various reasons. + + Prebuilt windows binary: + client/win_build + + Not express clearly freedom to modify: + glut + + Not used in building: + jpeglib + splitter_old + mac_build + vector_lib + + Duplicate: + client/win_build/work_unit.sah: the same as client/test_workunits/reference_work_unit.sah + + Not used in building: + sah_config.h + +Repackaged upstream source: + The SETI@home project does not distribute source code releases as + tarballs, only subversion is available. + Source code be downloaded from this location: + + svn co https://setisvn.ssl.berkeley.edu/svn/seti_boinc + + For more information about the SETI@home source code see: + + http://setiathome.berkeley.edu/sah_porting.php + + The Debian BOINC Maintainers use a script called 'export-seti' to + download nightly tarballs and to prepare them for release in Debian. + This script is available in our git repository: + + http://anonscm.debian.org/gitweb/?p=pkg-boinc/scripts.git;a=blob_plain;f=export-seti + + The latest .orig.tar.gz tarball can always be retrieved, using this + script, by invoking the get-orig-source target of debian/rules. + +quilt configuration: + To keep it simple, this is recommended for ~/.quiltrc when editing debian/patches: + + QUILT_PATCHES="debian/patches" + QUILT_NO_DIFF_TIMESTAMPS=1 + +About graphics: + There're 2 flavors now: boinc-app-seti and boinc-app-seti-graphics. + Main difference in building process can be summarized as: + 1. Build seti with --enable-graphics, which generate 2 binaries. + 2. Put both into package boinc-app-seti-graphics, and put the + no-graphics one in boinc-app-seti. + 3. Mark boinc-app-seti and boinc-app-seti-graphics as in conflict with + each other. diff --git a/boinc-app-seti-graphics.README.Debian b/boinc-app-seti-graphics.README.Debian new file mode 100644 index 0000000..cf340c4 --- /dev/null +++ b/boinc-app-seti-graphics.README.Debian @@ -0,0 +1,40 @@ +BOINC version of SETI@home (boinc-app-seti) for Debian +====================================================== + +This package creates symlinks for the SETI@home binary and its app_info.xml +file in Debian's default BOINC data directory /var/lib/boinc-client. If you +are not using the default data directory you need to create these symlinks +yourself. + +Refer to the paragraph "Installing and configuring BOINC application packages" +in /usr/share/doc/boinc-client/README.Debian for detailed instructions. + + +About optimizing and compiler flags +----------------------------------- + +The package uses only default -O3 optimization flags for the compiler. +Consequently, users are not unlikely to be unsatisfied with the +performance of the Debian-binary when comparing it with the results +achieved on other systems. + +However, there is little else that can be done about it, the build daemons +that assemble the packages across all platforms cannot know on which +particular machine the resulting binary will be executed. To rescue us +just a bit: + * i686 machines are all presumed to have SSE2, a respective configure + option to SETI is set + * amd64 machines are all presumed to have SSE2 and SSE3, also passed + to the SETI configuration +It is straightforward to self-compile the package. The debian/rules +file already accommodates for a substitution e.g. of the compiler and +extra flags for further improvements. + + +About CUDA support +------------------ + +The CUDA code is separated from the regular SETI client, i.e. demanding +a separate checkout from the source code repository. Upstream plans to +merge that with the regular distribution, eventually. We will wait for that +rather than complicating things on our end. diff --git a/boinc-app-seti-graphics.dirs b/boinc-app-seti-graphics.dirs new file mode 100644 index 0000000..0bc1c91 --- /dev/null +++ b/boinc-app-seti-graphics.dirs @@ -0,0 +1,3 @@ +usr/lib/boinc-app-seti-graphics +usr/share/boinc-app-seti-graphics +usr/share/boinc-apps/info diff --git a/boinc-app-seti-graphics.docs b/boinc-app-seti-graphics.docs new file mode 100644 index 0000000..62deb04 --- /dev/null +++ b/boinc-app-seti-graphics.docs @@ -0,0 +1 @@ +AUTHORS diff --git a/boinc-app-seti-graphics.install b/boinc-app-seti-graphics.install new file mode 100644 index 0000000..32c348a --- /dev/null +++ b/boinc-app-seti-graphics.install @@ -0,0 +1,4 @@ +graphics/client/setiathome_v7 usr/lib/boinc-app-seti-graphics +graphics/client/setiathome_graphics usr/lib/boinc-app-seti-graphics +debian/extra-graphics/app_info.xml usr/share/boinc-app-seti-graphics +debian/extra-graphics/seti-graphics.cfg usr/share/boinc-apps/info diff --git a/boinc-app-seti-graphics.postinst b/boinc-app-seti-graphics.postinst new file mode 100644 index 0000000..14adda9 --- /dev/null +++ b/boinc-app-seti-graphics.postinst @@ -0,0 +1,40 @@ +#!/bin/sh +# postinst script for boinc-app-seti-graphics + +set -e + +BOINC_DIR=/var/lib/boinc-client +PROJECT=seti-graphics + +init_boinc_client() +{ + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d boinc-client $1 + else + /etc/init.d/boinc-client $1 + fi +} + +case "$1" in + configure) + update-boinc-applinks --create --project=$PROJECT --data-dir=$BOINC_DIR + chown -R boinc:boinc $BOINC_DIR/projects 2>/dev/null || true + + # Restart the BOINC core client after update-boinc-applinks has + # created the symlinks for the anonymous application(s) and the + # app_info.xml file. + init_boinc_client restart + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/boinc-app-seti-graphics.prerm b/boinc-app-seti-graphics.prerm new file mode 100644 index 0000000..b91b2a3 --- /dev/null +++ b/boinc-app-seti-graphics.prerm @@ -0,0 +1,44 @@ +#!/bin/sh +# prerm script for boinc-app-seti-graphics + +set -e + +BOINC_DIR=/var/lib/boinc-client +PROJECT=seti-graphics + +init_boinc_client() +{ + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d boinc-client $1 + else + /etc/init.d/boinc-client $1 + fi +} + +case "$1" in + remove) + # Stop the core client and wait one second to give it the + # chance to shut down gracefully before removing the S@h + # application. Start the client then again. + init_boinc_client stop + sleep 1 + update-boinc-applinks --remove --project=$PROJECT --data-dir=$BOINC_DIR + init_boinc_client start + ;; + + upgrade) + update-boinc-applinks --remove --project=$PROJECT --data-dir=$BOINC_DIR + ;; + + failed-upgrade|deconfigure) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/boinc-app-seti.README.Debian b/boinc-app-seti.README.Debian new file mode 100644 index 0000000..cf340c4 --- /dev/null +++ b/boinc-app-seti.README.Debian @@ -0,0 +1,40 @@ +BOINC version of SETI@home (boinc-app-seti) for Debian +====================================================== + +This package creates symlinks for the SETI@home binary and its app_info.xml +file in Debian's default BOINC data directory /var/lib/boinc-client. If you +are not using the default data directory you need to create these symlinks +yourself. + +Refer to the paragraph "Installing and configuring BOINC application packages" +in /usr/share/doc/boinc-client/README.Debian for detailed instructions. + + +About optimizing and compiler flags +----------------------------------- + +The package uses only default -O3 optimization flags for the compiler. +Consequently, users are not unlikely to be unsatisfied with the +performance of the Debian-binary when comparing it with the results +achieved on other systems. + +However, there is little else that can be done about it, the build daemons +that assemble the packages across all platforms cannot know on which +particular machine the resulting binary will be executed. To rescue us +just a bit: + * i686 machines are all presumed to have SSE2, a respective configure + option to SETI is set + * amd64 machines are all presumed to have SSE2 and SSE3, also passed + to the SETI configuration +It is straightforward to self-compile the package. The debian/rules +file already accommodates for a substitution e.g. of the compiler and +extra flags for further improvements. + + +About CUDA support +------------------ + +The CUDA code is separated from the regular SETI client, i.e. demanding +a separate checkout from the source code repository. Upstream plans to +merge that with the regular distribution, eventually. We will wait for that +rather than complicating things on our end. diff --git a/boinc-app-seti.dirs b/boinc-app-seti.dirs new file mode 100644 index 0000000..ce55e76 --- /dev/null +++ b/boinc-app-seti.dirs @@ -0,0 +1,3 @@ +usr/lib/boinc-app-seti +usr/share/boinc-app-seti +usr/share/boinc-apps/info diff --git a/boinc-app-seti.docs b/boinc-app-seti.docs new file mode 100644 index 0000000..62deb04 --- /dev/null +++ b/boinc-app-seti.docs @@ -0,0 +1 @@ +AUTHORS diff --git a/boinc-app-seti.install b/boinc-app-seti.install new file mode 100644 index 0000000..6eafbbb --- /dev/null +++ b/boinc-app-seti.install @@ -0,0 +1,3 @@ +nographics/client/setiathome_v7 usr/lib/boinc-app-seti/ +debian/extra/app_info.xml usr/share/boinc-app-seti +debian/extra/seti.cfg usr/share/boinc-apps/info diff --git a/boinc-app-seti.postinst b/boinc-app-seti.postinst new file mode 100644 index 0000000..6df2c0a --- /dev/null +++ b/boinc-app-seti.postinst @@ -0,0 +1,40 @@ +#!/bin/sh +# postinst script for boinc-app-seti + +set -e + +BOINC_DIR=/var/lib/boinc-client +PROJECT=seti + +init_boinc_client() +{ + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d boinc-client $1 + else + /etc/init.d/boinc-client $1 + fi +} + +case "$1" in + configure) + update-boinc-applinks --create --project=$PROJECT --data-dir=$BOINC_DIR + chown -R boinc:boinc $BOINC_DIR/projects 2>/dev/null || true + + # Restart the BOINC core client after update-boinc-applinks has + # created the symlinks for the anonymous application(s) and the + # app_info.xml file. + init_boinc_client restart + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/boinc-app-seti.prerm b/boinc-app-seti.prerm new file mode 100644 index 0000000..4b1c7f0 --- /dev/null +++ b/boinc-app-seti.prerm @@ -0,0 +1,44 @@ +#!/bin/sh +# prerm script for boinc-app-seti + +set -e + +BOINC_DIR=/var/lib/boinc-client +PROJECT=seti + +init_boinc_client() +{ + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d boinc-client $1 + else + /etc/init.d/boinc-client $1 + fi +} + +case "$1" in + remove) + # Stop the core client and wait one second to give it the + # chance to shut down gracefully before removing the S@h + # application. Start the client then again. + init_boinc_client stop + sleep 1 + update-boinc-applinks --remove --project=$PROJECT --data-dir=$BOINC_DIR + init_boinc_client start + ;; + + upgrade) + update-boinc-applinks --remove --project=$PROJECT --data-dir=$BOINC_DIR + ;; + + failed-upgrade|deconfigure) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/changelog b/changelog new file mode 100644 index 0000000..ce026a7 --- /dev/null +++ b/changelog @@ -0,0 +1,493 @@ +boinc-app-seti (7.28~svn2633-3) unstable; urgency=medium + + * Bump std-version to 3.9.6, no changes required. + * Stop depending on old boinc-dev. + * Update copyright, now in machine readable format. + * Add description to patches, reorder them, + use patch name as written in README.patches. + + -- Gianfranco Costamagna Tue, 30 Sep 2014 14:49:40 +0200 + +boinc-app-seti (7.28~svn2633-2) unstable; urgency=medium + + * Rebuild against new boinc. + * Add some missing copyright entries. + + -- Gianfranco Costamagna Sat, 27 Sep 2014 23:46:22 +0200 + +boinc-app-seti (7.28~svn2633-1) unstable; urgency=medium + + * Rebuild against new boinc. + * New upstream release. + + -- Gianfranco Costamagna Thu, 04 Sep 2014 18:15:55 +0200 + +boinc-app-seti (7.28~svn2408-1) unstable; urgency=medium + + * Updated Guo's uid in debian/control. + * New upstream release, build against boinc 7.4.8. + + -- Gianfranco Costamagna Sun, 08 Jun 2014 10:26:17 +0200 + +boinc-app-seti (7.28~svn2385-1) unstable; urgency=medium + + * New upstream release, build against new boinc 7.3.19. + + -- Gianfranco Costamagna Thu, 05 Jun 2014 19:19:23 +0200 + +boinc-app-seti (7.28~svn2203-1) unstable; urgency=medium + + * New upstream release, patch refresh. + * Drop fix-armel.patch and fix-ftbfs-arm64.patch, addressed + upstream. + + -- Gianfranco Costamagna Mon, 14 Apr 2014 00:10:11 +0200 + +boinc-app-seti (7.19~svn2051-2) unstable; urgency=medium + + * Upload to unstable. + * Switch to dh-autoreconf. + * Tweak app-info.xml file after upstream suggestion, + thanks Claggy! + * Moved app name from setiathome_enhanced to setiathome_v7 + for upstream suggestion. + + -- Gianfranco Costamagna Wed, 05 Mar 2014 09:40:55 +0100 + +boinc-app-seti (7.19~svn2051-1) experimental; urgency=low + + * Re-imported the old version with no changes, just for bumping + the version number and allowing the upload of the package + due to the 7.19~svn2050-2.is.7.00~svn1933-2 version, greater + than 7.19~svn2050-3. + + -- Gianfranco Costamagna Tue, 25 Feb 2014 14:05:41 +0100 + +boinc-app-seti (7.19~svn2050-3) UNRELEASED; urgency=low + + * Uploading to experimental, fixing armel and armhf ftbfs. + + -- Gianfranco Costamagna Sat, 15 Feb 2014 17:34:43 +0100 + +boinc-app-seti (7.19~svn2050-2.is.7.00~svn1933-2) unstable; urgency=low + + * Re added autotools-dev as build-dep, fixing arm64 ftbfs + + -- Gianfranco Costamagna Mon, 30 Dec 2013 23:04:20 +0100 + +boinc-app-seti (7.19~svn2050-2.is.7.00~svn1933-1) unstable; urgency=low + + * Tweak debian/rules, forcing 7.00 as version + * Rebuild 1933 against new boinc_7.2.33+dfsg-1 (Closes: #733204) + + -- Gianfranco Costamagna Sun, 29 Dec 2013 17:09:45 +0100 + +boinc-app-seti (7.19~svn2050-1) unstable; urgency=low + + * New upstream snapshot. + * Fixed a ftbfs on ubuntu arm64. + + -- Gianfranco Costamagna Fri, 22 Nov 2013 13:34:26 +0100 + +boinc-app-seti (7.19~svn2022-2) UNRELEASED; urgency=low + + * Bumped std version to 3.9.5, no changes required. + + -- Gianfranco Costamagna Wed, 06 Nov 2013 10:15:31 +0100 + +boinc-app-seti (7.19~svn2022-1) unstable; urgency=low + + * Upload to unstable + * New upstream release, addressing some autosetup warnings + * Added autotools-dev as build-dep (Closes: #727333) + + -- Gianfranco Costamagna Fri, 11 Oct 2013 18:22:23 +0200 + +boinc-app-seti (7.09~svn1982-1) experimental; urgency=low + + * New upstream release, addressing some arm* problems + + -- Gianfranco Costamagna Fri, 06 Sep 2013 12:09:30 +0200 + +boinc-app-seti (7.07~svn1976-1) unstable; urgency=low + + * New upstream release, patch refresh. + * Tweaked debian/rules, now uses _autosetup script. + * Added libtool as build-dep. + + -- Gianfranco Costamagna Wed, 04 Sep 2013 18:43:28 +0200 + +boinc-app-seti (7.00~svn1933-1) unstable; urgency=low + + * New upstream release. + * Removed win_build, mac_build, vector_lib, jpeglib + not used in building and not completely listed in copyright file. + * debian/copyright and README.sources have been updated. + * dropping 101_freebsd_build.patch and separate_build_dir.patch, + accepted upstream. + * Removed debian/watch, unused. + * Little changes in debian/README.source files. + + -- Gianfranco Costamagna Thu, 25 Jul 2013 09:38:04 +0200 + +boinc-app-seti (7.00~svn1883-3) UNRELEASED; urgency=low + + * Remove astropulse in app_info.xml.in. + + -- Guo Yixuan Thu, 18 Jul 2013 09:57:38 +0800 + +boinc-app-seti (7.00~svn1883-2) unstable; urgency=low + + [ Gianfranco Costamagna ] + * Added libxmu-dev, libxi-dev as build-depends + * Added boinc-manager as boinc-app-seti suggests fields + * Tweaked some version checks in control file + * Rebuild against boinc 7.1.21+dfsg-1 + to fix a FTBFS in ubuntu 13.10. + + [ Guo Yixuan ] + * Added a new package: boinc-app-seti-graphics, which provide + a visualizer for seti. + + -- Gianfranco Costamagna Thu, 27 Jun 2013 13:13:29 +0200 + +boinc-app-seti (7.00~svn1883-1) unstable; urgency=low + + * New upstream release. + * New app_info.xml file (Closes: #711734) + + -- Gianfranco Costamagna Fri, 21 Jun 2013 17:51:45 +0200 + +boinc-app-seti (7.00~svn1854-2) UNRELEASED; urgency=low + + * Disabled checkin_notes in dh_install_changelogs + not updated anymore. + + -- Gianfranco Costamagna Tue, 18 Jun 2013 11:23:57 +0200 + +boinc-app-seti (7.00~svn1854-1) unstable; urgency=low + + * New upstream release. + - Makefiles bugs fixed. + * Added libgsl0-dev as build-dep. + * Disabled checkin_notes in dh_install_changelogs + not updated anymore. + + -- Gianfranco Costamagna Fri, 24 May 2013 11:33:48 +0200 + +boinc-app-seti (7.00~svn1828-1) UNRELEASED; urgency=low + + * New upstream release. + * Enabling hardening flags. + * Bumped debian/compat to 9. + * Build-dep updated to boinc 7.0.65+dfsg-2 to avoid FTBFS + * Removed some build-dep version requirement + + -- Gianfranco Costamagna Thu, 02 May 2013 16:59:58 +0200 + +boinc-app-seti (7.00~svn1791-1) UNRELEASED; urgency=low + + * New upstream release. + - Removed Makefile and Makefile.in from splitter_* directories + * Fixed debian/rules clean script + + -- Gianfranco Costamagna Mon, 25 Mar 2013 10:11:53 +0100 + +boinc-app-seti (7.00~svn1772-1) UNRELEASED; urgency=low + + * New upstream release. + * Removed glut from source tree and disabled. + + -- Gianfranco Costamagna Mon, 25 Feb 2013 11:35:32 +0100 + +boinc-app-seti (7.00~svn1708-1) UNRELEASED; urgency=low + + [ Gianfranco Costamagna ] + * New upstream version. + * debian/control + - Bumped policy compliance to 3.9.4, no changes required. + + [ Guo Yixuan ] + * Updated README.source. + + [ Steffen Moeller ] + * Added link time optimisation + - compiler bug demands g++ version >= 4.8 + - only building in experimental until 4.8 is in unstable + + -- Gianfranco Costamagna Mon, 05 Nov 2012 14:48:54 +0100 + +boinc-app-seti (7.00~svn1704-1) UNRELEASED; urgency=low + + * New upstream version. + + -- Guo Yixuan Sat, 03 Nov 2012 00:02:38 +0800 + +boinc-app-seti (7.00~svn1703-1) UNRELEASED; urgency=low + + * New upstream version. + + -- Gianfranco Costamagna Fri, 02 Nov 2012 12:52:08 +0100 + +boinc-app-seti (6.97~svn1409-2) UNRELEASED; urgency=low + + * Reorganize debian/patches. + + -- Guo Yixuan Sun, 23 Sep 2012 22:53:02 +0800 + +boinc-app-seti (6.97~svn1409-1) unstable; urgency=low + + [Eric J. Korpela] + * app_info.xml: setiathome_enhanced replies to version 6 and 7 jobs + + [Guo Yixuan] + * Removed Windows binaries in source tree, and some other files, see + README.source. + * New upstream version: + - sah_v7 branch becomes trunk. + - new feature: autocorrelation. + - re-enabled 003_dont_use_own_jpeglib.patch, and refreshed some patches. + + [Steffen Moeller] + * debian/control: boinc-app-seti suggests boinc-manager + + -- Guo Yixuan Tue, 28 Aug 2012 11:05:07 +0800 + +boinc-app-seti (6.12~svn1385-3) unstable; urgency=low + + * Correcting for previous dependency on libs of BOINC 7.0.33. + + -- Steffen Moeller Mon, 20 Aug 2012 23:11:29 +0200 + +boinc-app-seti (6.12~svn1385-2) UNRELEASED; urgency=low + + [Guo Yixuan] + + * debian/patches/004_disable_altivec_on_ppc_linux.patch: Disable use of + altivec on PPC in the case of LINUX. Fixes FTBFS, thanks to Ben Collins + . + + [Steffen Moeller] + + * Removed Fernando from uploaders. + * SETI DMUA flag for Guo Yixuan. + + -- Guo Yixuan Sun, 19 Aug 2012 14:56:37 +0800 + +boinc-app-seti (6.12~svn1385-1) unstable; urgency=low + + * New upstream version. + * Reduced warnings during compilation. + + -- Steffen Moeller Sat, 18 Aug 2012 19:49:53 +0200 + +boinc-app-seti (6.12~svn1306-3) UNRELEASED; urgency=low + + * Platform-specific optimisations back in + * Disabled AltiVec for PowerPC because of FTBFS otherwise + + -- Steffen Moeller Wed, 15 Aug 2012 13:18:56 +0200 + +boinc-app-seti (6.12~svn1306-2) unstable; urgency=low + + * debian/rules: auto_clean improved. + * increased verbosity of stderr + * someone somewhen changed build-dependency to boinc-dev + (from libboinc-app-dev) (Closes: #679757). + * fixes crash on amd64 as it seems (Closes: #674248) + + -- Steffen Moeller Sun, 12 Aug 2012 00:31:34 +0200 + +boinc-app-seti (6.12~svn1306-1) unstable; urgency=low + + * New upstream version. + * Added inclusion for kfreebsd (Closes: #675839) + + -- Steffen Moeller Tue, 29 May 2012 23:52:47 +0200 + +boinc-app-seti (6.12~svn1305-3) UNRELEASED; urgency=low + + [ Steffen Moeller ] + * Rebuilt against libboinc-app, and libboinc with it, + substituting dependency on boinc-dev. + + [ Guo Yixuan ] + * Try to fix ftbfs on freebsd and powerpc. + * Install checkin_notes as upstream changelog. + + -- Steffen Moeller Mon, 28 May 2012 20:00:10 +0200 + +boinc-app-seti (6.12~svn1305-2) unstable; urgency=low + + * debian/control: + - remove quilt from build-depends. + - add myself in Uploaders. + * debian/rules: + - add dh_install in override target to install app_info.xml and seti.cfg. + - use dpkg-buildflags to add -g and default hardening options. + + -- Guo Yixuan Thu, 24 May 2012 23:16:40 +0800 + +boinc-app-seti (6.12~svn1305-1) unstable; urgency=low + + * New upstream version. + - Removed all patches + - Adjusted debian/rules for dynamic linking + * Updated debian/control + - Steffen's uploader's email address, removed Martin + - Set priority to extra (from optional) + * Bumped policy compliance to 3.9.3 + - Source format 3.0 + - Adjusted clean target to allow repeated builds with git + - added build-arch/-indep debian/rules targets + * README.Debian and README.source get some extra wording + + -- Steffen Moeller Sat, 19 May 2012 15:17:06 +0200 + +boinc-app-seti (5.28~20080105-1) UNRELEASED; urgency=low + + [ Frank S. Thomas ] + * New upstream snapshot from 05 Jan 2008. + * debian/patches/: + - Removed 001_build_fixes.patch and 004_include_new_str_util.h.patch + because they are not required for the new upstream version. + - Updated 002_disable_static_linkage.patch and + 003_dont_use_own_jpeglib.patch for the new release. + * debian/control: + - Bumped Standards-Version from 3.8.0 to 3.8.1, no changes required. + - Removed myself from Uploaders. + + [ Fernando C. Estrada ] + * debian/control: + - Bumped Standards-Version from 3.8.1 to 3.8.4, no changes required. + - Added my self as a Uploader. + + -- Fernando C. Estrada Tue, 23 Mar 2010 21:55:22 -0600 + +boinc-app-seti (5.13+cvs20060510-7.1) unstable; urgency=low + + * Non-maintainer upload. + * Includes Ilya Barygin patchs to fix a FTBFS + coming since the last upgrade of boinc-dev, thanks for the + patches! (Closes: #614443) + + -- Ying-Chun Liu (PaulLiu) Mon, 14 May 2012 23:58:40 +0800 + +boinc-app-seti (5.13+cvs20060510-7) unstable; urgency=low + + * debian/control: + - Add myself to uploaders + - Use Standards-Version 3.8.4 (No changes needed) + - Bump boinc-dev B-D to 6.10.17+dfsg-3 + * Includes Ilya Barygin patchs to fix a FTBFS + coming since the last upgrade of boinc-dev, thanks for the + patches! (Closes: #556817) + * debian/rules: + - Delete configure to prevent ship the modified file + - Use `clean' instead of `distclean', dist-clean fails to clean the package. + - Remove some auto-generated files that are not cleaned on `clean' target + * Switch to dpkg-source 3.0 (quilt) format + - Remove quilt from debian/rules and from B-D + - Remove README.source + + -- Rene Mayorga Thu, 25 Mar 2010 19:50:29 -0600 + +boinc-app-seti (5.13+cvs20060510-6) unstable; urgency=low + + * debian/control: + - Bumped Standards-Version from 3.8.0 to 3.8.1, no changes required. + - Removed myself from Uploaders. + + -- Frank S. Thomas Wed, 18 Mar 2009 15:58:52 +0100 + +boinc-app-seti (5.13+cvs20060510-5) unstable; urgency=low + + [ Frank S. Thomas ] + * Use debhelper V7 instead of CDBS to minimize debian/rules. + * debian/control: + - Fix spelling error in long description. (closes: #501205) + - Updated Vcs-* fields since we are now using Git. + - Wrapped Uploaders field because this is permitted since policy 3.8.0. + - Removed -1 revision from boinc-dev build dependency to satisfy Lintian. + - Bumped Standards-Version from 3.7.3 to 3.8.0. This required to rename + debian/README.Debian-source to debian/README.source and to add a note + that we use quilt for patch management. + * Added a dummy debian/watch file that explains why upstream tarballs cannot + be meaningfully monitored to fix Lintian's debian-watch-file-is-missing + informational tag. + * debian/patches/: + - Added 102_fix_typo_for_gcc4.4.patch to fix a FTBFS with GCC 4.4. Thanks + to Martin Michlmayr for the bug report and the patch. + (closes: #505012) + - Added missing descriptions to some patch files to appease Lintian. + + -- Frank S. Thomas Sun, 08 Feb 2009 11:47:26 +0100 + +boinc-app-seti (5.13+cvs20060510-4) unstable; urgency=low + + [ Steffen Moeller ] + * debian/rules: Wrote get-orig-source target that downloads the latest + nightly tarball. + + [ Frank S. Thomas ] + * debian/control.in: + - Bumped Standards-Version from 3.7.2 to 3.7.3, no changes required. + - Changed my maintainer address to fst@debian.org. + * debian/rules: Remove --disable-dependency-tracking from configure's + arguments, because it breaks some handwritten rules in client/Makefile.am + which require that $(DEPDIR) exists. + * Bumped debhelper compat level from V5 to V6 since this is the current + recommended level and raised the build dependency to "debhelper (>= 6)". + * debian/patches/: Added 201_missing_header_for_gcc4.3.patch in order to + fix a FTBFS with recent GCC 4.3 snapshots. Thanks to Martin Michlmayr + for the bug report. (closes: #462051) + + -- Frank S. Thomas Wed, 23 Jan 2008 21:27:23 +0100 + +boinc-app-seti (5.13+cvs20060510-3) unstable; urgency=low + + * debian/rules: Remove two binary files that are not removed by "make clean" + and use clean instead of distclean as DEB_MAKE_CLEAN_TARGET, because + distclean removes files that are needed to build this package. These + changes fixes the FTBFS if build twice in a row. (closes: #442513) + * debian/control.in: + - Moved Homepage pseudo field in the long description to the source stanza + because this is now a propper debian/control field supported by dpkg. + - fftw3-dev was renamed to libfftw3-dev, adjusted Build-Depends + accordingly. + + -- Frank S. Thomas Thu, 11 Oct 2007 16:21:39 +0200 + +boinc-app-seti (5.13+cvs20060510-2) unstable; urgency=low + + * debian/boinc-app-seti-prerm: Stop the BOINC core client before removing + the SETI@home symlinks from the data directory to prevent the client from + downloading new work units although no application to process these is + present. (related to: #415765) + * debian/control.in: + - Added XS-Vcs fields to the source stanza. + - Improved the description of the package and explicitly stated that this + package is not needed on i386 and amd64 hosts since SETI@home supports + those architectures officially. + * debian/copyright: Added copyright information for glut/Roman.stroke and + glut/stroke.h and added a copyright note about the Debian packaging. + * Changed from dpatch to the quilt patch system. + * debian/patches/: + - 004_include_new_str_util.h.patch added. The strlcpy() and strlcat() + functions that were previously declared in boinc-dev/lib/util.h have + been moved in BOINC 5.10 to the new boinc-dev/lib/str_util.h header + file, so we need to include this new header in some files. Bumped build + dependency to "boinc-dev (>= 5.10.8-1)" accordingly. (closes: #433737) + - 003_dont_use_own_jpeglib.patch modified to prevent that setiathome is + linked against libjpeg. This ensures predictability of the dependecy + list, see http://lists.debian.org/debian-devel/2007/07/msg00588.html for + details. + + -- Frank S. Thomas Thu, 19 Jul 2007 14:21:27 +0200 + +boinc-app-seti (5.13+cvs20060510-1) unstable; urgency=low + + * Initial release based on Steffen Moeller's boinc-client-seti package. + + -- Frank S. Thomas Mon, 22 May 2006 09:09:03 +0200 + diff --git a/clean b/clean new file mode 100644 index 0000000..135eb20 --- /dev/null +++ b/clean @@ -0,0 +1,2 @@ +debian/extra/app_info.xml +debian/extra-graphics/app_info.xml diff --git a/compat b/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 0000000..459da44 --- /dev/null +++ b/control @@ -0,0 +1,98 @@ +Source: boinc-app-seti +Section: science +Priority: extra +Maintainer: Debian BOINC Maintainers +Uploaders: Steffen Moeller , + Guo Yixuan (郭溢譞) , + Gianfranco Costamagna +Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9), dh-autoreconf, + automake, + dpkg-dev (>= 1.16.1.1), + libboinc-app-dev, + autoconf, + libtool, + libfftw3-dev, + libgsl0-dev, + freeglut3-dev, + libjpeg-dev, + libxmu-dev, + libxi-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 +Homepage: http://setiathome.berkeley.edu/ + +Package: boinc-app-seti +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, boinc-client +Suggests: boinc-manager +Conflicts: boinc-app-seti-graphics +Description: SETI@home application for the BOINC client + 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 contains the SETI@home Enhanced application for the BOINC + distributed computing platform. The BOINC client downloads the radio + data which the SETI@home application analyzes looking for signals of + extraterrestrial origin. Results are then send back to the SETI@home + server by the BOINC client. + . + Note that this package has been primarily created for users of + architectures for which SETI@home does not provide its application. + If your architecture is x86 or AMD64 the BOINC client automatically + downloads the latest SETI@home application if you participate in this + project. There is no need to install this package then, except for + it to take all technical hurdles from you to have your very custom + SETI patch or new compiler flags evaluated. The configuration of + BOINC to find the local SETI binary is all performed by the package. + . + This package only provides command line application. + The boinc-app-seti-graphics package provides graphic application. + +Package: boinc-app-seti-graphics +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, boinc-client +Suggests: boinc-manager +Conflicts: boinc-app-seti +Description: SETI@home application for the BOINC client (with graphics) + 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 contains the SETI@home Enhanced application for the BOINC + distributed computing platform. The BOINC client downloads the radio + data which the SETI@home application analyzes looking for signals of + extraterrestrial origin. Results are then send back to the SETI@home + server by the BOINC client. + . + Note that this package has been primarily created for users of + architectures for which SETI@home does not provide its application. + If your architecture is x86 or AMD64 the BOINC client automatically + downloads the latest SETI@home application if you participate in this + project. There is no need to install this package then, except for + it to take all technical hurdles from you to have your very custom + SETI patch or new compiler flags evaluated. The configuration of + BOINC to find the local SETI binary is all performed by the package. + . + 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: ${misc:Depends}, + boinc-app-seti (= ${binary:Version}) | + boinc-app-seti-graphics (= ${binary:Version}) +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 --git a/copyright b/copyright new file mode 100644 index 0000000..4843cd6 --- /dev/null +++ b/copyright @@ -0,0 +1,112 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: setiathome +Source: http://setiweb.ssl.berkeley.edu/sah/seti_source/nightly/ + +Files: * +Copyright: 1998-2013 Regents of the University of California + Dan Werthimer + Mike Lampton + Charles Donnelly + Eric J. Korpela + Jeff Cobb + Matt Lebofsky + David Anderson + Charlie Fenton + Rom Walton + Tetsuji Rai + Eric Heien + Hiram Clawson +License: GPL-2+ + +Files: debian/* +Copyright: 2004 Steffen Moeller + 2005 Frank S. Thomas + 2004-2013 Debian BOINC Maintainers + +License: GPL-2+ + +Files: m4/ax_pthread.m4 +Copyright: 2011 Daniel Richard G. + 2008 Steven G. Johnson +License: GPL-3+ + +Files: client/graphics_main.cpp +Copyright: 2005 University of California +License: LGPL-2.1 + +Files: client/vector/asmlib.h +Copyright: 2004 Agner Fog +License: GPL-2+ + +Files: splitter_fft/fftw.h + gbt_splitter/fftw.h + splitter_pfb/fftw.h +Copyright: 1997-1998 Massachusetts Institute of Technology + Matteo Frigo + Stevenj G. Johnson + Stefan Kral wrote genfft-k7/*.ml* +License: GPL-2+ + +Files: client/fft8g.h + client/fft8g.cpp +Copyright: 1995-2001 Takuya OOURA (Email: ooura@kurims.kyoto-u.ac.jp + or ooura@mmm.t.u-tokyo.ac.jp) + Eric J. Korpela + Jeff Cobb +License: fft8g-custom + You may use, copy, modify and distribute this code for any purpose + (include commercial use) and without fee. Please refer to this package + when you modify this code. + +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-3 file. + +License: LGPL-2.1 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation, + version 2.1 of the License. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU Lesser General Public License + can be found in `/usr/share/common-licenses/LGPL-2.1'. diff --git a/extra-graphics/app_info.xml.in b/extra-graphics/app_info.xml.in new file mode 100644 index 0000000..b5ea5f6 --- /dev/null +++ b/extra-graphics/app_info.xml.in @@ -0,0 +1,25 @@ + + + setiathome_v7 + + + setiathome_v7 + + + + setiathome_graphics + + + + setiathome_v7 + VERSION + + setiathome_v7 + + + + setiathome_graphics + graphics_app + + + \ No newline at end of file diff --git a/extra-graphics/seti-graphics.cfg b/extra-graphics/seti-graphics.cfg new file mode 100644 index 0000000..a16444e --- /dev/null +++ b/extra-graphics/seti-graphics.cfg @@ -0,0 +1,8 @@ +[DEFAULT] +project = seti-graphics +app_info = /usr/share/boinc-app-seti-graphics/app_info.xml +apps = /usr/lib/boinc-app-seti-graphics/setiathome_v7 + /usr/lib/boinc-app-seti-graphics/setiathome_graphics +urls = setiathome.berkeley.edu + setiathome.ssl.berkeley.edu + setiweb.ssl.berkeley.edu diff --git a/extra/app_info.xml.in b/extra/app_info.xml.in new file mode 100644 index 0000000..435fced --- /dev/null +++ b/extra/app_info.xml.in @@ -0,0 +1,17 @@ + + + setiathome_v7 + + + setiathome_v7 + + + + setiathome_v7 + VERSION + + setiathome_v7 + + + + \ No newline at end of file diff --git a/extra/seti.cfg b/extra/seti.cfg new file mode 100644 index 0000000..244afa0 --- /dev/null +++ b/extra/seti.cfg @@ -0,0 +1,7 @@ +[DEFAULT] +project = seti +app_info = /usr/share/boinc-app-seti/app_info.xml +apps = /usr/lib/boinc-app-seti/setiathome_v7 +urls = setiathome.berkeley.edu + setiathome.ssl.berkeley.edu + setiweb.ssl.berkeley.edu diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..45052a1 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,4 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = master +pristine-tar = True diff --git a/patches/001_disable_avx_in_configure.patch b/patches/001_disable_avx_in_configure.patch new file mode 100644 index 0000000..f2a7d89 --- /dev/null +++ b/patches/001_disable_avx_in_configure.patch @@ -0,0 +1,24 @@ +Description: disable avx in build. +--- a/m4/sah_avx.m4 ++++ b/m4/sah_avx.m4 +@@ -2,7 +2,7 @@ + AC_LANG_PUSH(C) + AC_MSG_CHECKING([if compiler supports -mavx]) + save_cflags="${CFLAGS}" +- CFLAGS="-mavx" ++ CFLAGS="${CFLAGS} -mavx" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],[ + have_avx=yes + ],[ +--- a/configure.ac ++++ b/configure.ac +@@ -523,7 +523,8 @@ + AH_TEMPLATE([HAVE_STD_TRANSFORM],[Define to 1 if transform is in namespace std::]) + SAH_FUNCS_IN_NAMESPACE([['min(0,0)'] ['max(0,0)'] ['transform((char *)0,(char *)0,(char *)0,(int(*)(int))malloc)']],std) + +-SAH_AVX ++#SAH_AVX ++have_avx=no + + AM_CONDITIONAL(USE_MY_IMAGELIBS, [false]) + AM_CONDITIONAL(USE_MY_GLUT, [false]) diff --git a/patches/002_disable_static_linkage.patch b/patches/002_disable_static_linkage.patch new file mode 100644 index 0000000..4135141 --- /dev/null +++ b/patches/002_disable_static_linkage.patch @@ -0,0 +1,29 @@ +--- boinc-app-seti.orig/configure.ac ++++ boinc-app-seti/configure.ac +@@ -156,15 +156,18 @@ + AC_SYS_LARGEFILE + ACX_PTHREAD([AC_DEFINE(HAVE_PTHREAD,1, [Have pthread])]) + +-STATIC_LIB_LIST="stdc++ gcc gcc_eh gtk* gdk* gmodule gthread glib wx* tiff jpeg +-png Xi glut socket z fftw3f" ++#STATIC_LIB_LIST="stdc++ gcc gcc_eh gtk* gdk* gmodule gthread glib wx* tiff jpeg ++#png Xi glut socket z fftw3f" ++# ++#case ${target} in ++# *-linux*) STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl ssl crypto" ++# ;; ++# *-solaris*) STATIC_LIB_LIST="${STATIC_LIB_LIST} X* ssl crypto" ++# ;; ++#esac + +-case ${target} in +- *-linux*) STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl ssl crypto" +- ;; +- *-solaris*) STATIC_LIB_LIST="${STATIC_LIB_LIST} X* ssl crypto" +- ;; +-esac ++# This needs at least one word, so I'm using nolib, which isn't a lib. :-) ++STATIC_LIB_LIST="nolib" + + # Checks for libraries. + CHECK_SSL diff --git a/patches/003_dont_use_own_jpeglib_and_glut.patch b/patches/003_dont_use_own_jpeglib_and_glut.patch new file mode 100644 index 0000000..be4e748 --- /dev/null +++ b/patches/003_dont_use_own_jpeglib_and_glut.patch @@ -0,0 +1,30 @@ +Description: use the system available jpeg lib. +--- a/Makefile.am ++++ b/Makefile.am +@@ -27,7 +27,7 @@ + endif + + +-SUBDIRS = $(JPEGDIR) $(IMDIR) $(GLUTDIR) $(CLIENT_SUBDIRS) $(SERVER_SUBDIRS) ++SUBDIRS = $(IMDIR) $(CLIENT_SUBDIRS) $(SERVER_SUBDIRS) + + dist-hook: + rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS` +--- a/configure.ac ++++ b/configure.ac +@@ -526,6 +526,7 @@ + #SAH_AVX + have_avx=no + ++AM_CONDITIONAL(USE_MY_LIBJPEG, [false]) + AM_CONDITIONAL(USE_MY_IMAGELIBS, [false]) + AM_CONDITIONAL(USE_MY_GLUT, [false]) + AM_CONDITIONAL(ENABLE_TESTS, [test "${enable_tests}" = yes]) +@@ -629,7 +630,6 @@ + ]) + + AC_CONFIG_FILES([Makefile +- jpeglib/Makefile + client/Makefile + tools/Makefile + db/Makefile diff --git a/patches/004_disable_altivec_on_ppc_linux.patch b/patches/004_disable_altivec_on_ppc_linux.patch new file mode 100644 index 0000000..60e61c2 --- /dev/null +++ b/patches/004_disable_altivec_on_ppc_linux.patch @@ -0,0 +1,24 @@ +Description: Disable altivec on PPC if !LINUX + Taken from Ubuntu's 6.12~svn1305-2ubuntu1, at Tue, 12 Jun 2012 22:28:38 -0400. +Author: Ben Collins + +--- a/client/Makefile.am ++++ b/client/Makefile.am +@@ -198,7 +198,8 @@ + endif + + if PPC +-# allow use of altivec instructions on PPC ++if !LINUX ++# allow use of altivec instructions on PPC/MacOS + seti_boinc-analyzeFuncs_altivec.o: vector/analyzeFuncs_altivec.cpp + if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \ +@@ -212,6 +213,7 @@ + -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ + else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + endif ++endif + + + if LINUX diff --git a/patches/005_powerpc_altivec.patch b/patches/005_powerpc_altivec.patch new file mode 100644 index 0000000..5ea94be --- /dev/null +++ b/patches/005_powerpc_altivec.patch @@ -0,0 +1,15 @@ +Description: Try to enable altivec on powerpc. + Some compiler flags are not compatible with gcc, which need to fix. + However, we didn't manage to build it, so we disable altivec in + 004_disable_altivec_on_ppc_linux.patch, while keep this patch for future use. +--- a/client/Makefile.am ++++ b/client/Makefile.am +@@ -165,7 +165,7 @@ + seti_boinc-analyzeFuncs_altivec.o: vector/analyzeFuncs_altivec.cpp + if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \ +- -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -faltivec \ ++ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -maltivec \ + -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ + else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + seti_boinc-analyzeFuncs_vector.o: vector/analyzeFuncs_vector.cpp diff --git a/patches/006_omitting_archs.patch b/patches/006_omitting_archs.patch new file mode 100644 index 0000000..5be81ea --- /dev/null +++ b/patches/006_omitting_archs.patch @@ -0,0 +1,49 @@ +Description: omit "march" flag, to ensure more compatibility. +--- a/m4/optimizations.m4 ++++ b/m4/optimizations.m4 +@@ -13,7 +13,7 @@ + [Define to 1 if you want to use SSE3 optimizations]) + # put compiler specific flags here + if test x_$ac_cv_c_compiler_gnu = x_yes ; then +- CFLAGS="-march=prescott -msse3 -mfpmath=sse ${CFLAGS}" ++ CFLAGS="-msse3 -mfpmath=sse ${CFLAGS}" + fi + fi + +@@ -28,9 +28,6 @@ + # put compiler specific flags here + if test x_$ac_cv_c_compiler_gnu = x_yes ; then + CFLAGS="-msse2 -mfpmath=sse ${CFLAGS}" +- if test -z "echo $CFLAGS | grep march=" ; then +- CFLAGS="-march=pentium4 ${CFLAGS}" +- fi + fi + fi + +@@ -44,7 +41,7 @@ + [Define to 1 if you want to use SSE optimizations]) + # put compiler specific flags here + if test x_$ac_cv_c_compiler_gnu = x_yes ; then +- CFLAGS="-march=pentium3 -msse -mfpmath=sse ${CFLAGS}" ++ CFLAGS="-msse -mfpmath=sse ${CFLAGS}" + fi + fi + +@@ -58,7 +55,7 @@ + [Define to 1 if you want to use MMX optimizations]) + # put compiler specific flags here + if test x_$ac_cv_c_compiler_gnu = x_yes ; then +- CFLAGS="-march=pentium2 -mmmx -mfpmath=387 ${CFLAGS}" ++ CFLAGS="-mmmx -mfpmath=387 ${CFLAGS}" + fi + fi + +@@ -73,7 +70,7 @@ + [Define to 1 if you want to use 3D-Now optimizations]) + # put compiler specific flags here + if test x_$ac_cv_c_compiler_gnu = x_yes ; then +- CFLAGS="-march=pentium2 -m3dnow -mfpmath=387 ${CFLAGS}" ++ CFLAGS="-m3dnow -mfpmath=387 ${CFLAGS}" + fi + fi + diff --git a/patches/007_worker_comments.patch b/patches/007_worker_comments.patch new file mode 100644 index 0000000..ad50e76 --- /dev/null +++ b/patches/007_worker_comments.patch @@ -0,0 +1,40 @@ +Description: add some useful output debug. +--- a/client/worker.cpp ++++ b/client/worker.cpp +@@ -130,7 +130,7 @@ + fclose(f); + if (retval) SETIERROR(retval,"from seti_parse_wu() in read_wu_state()"); + } else { +- char msg[1024]; ++ char msg[MAXPATHLEN+50]; + sprintf(msg,"(%s) in read_wu_state() errno=%d\n",path.c_str(),errno); + SETIERROR(FOPEN_FAILED,msg); + } +@@ -174,15 +174,19 @@ + #endif + + try { ++ fprintf(stderr,"I: worker() - common_init\n"); + retval = common_init(); + if (retval) SETIERROR(retval,"from common_init() in worker()"); + ++ fprintf(stderr,"I: worker() - read_wu_state\n"); + retval = read_wu_state(); + if (retval) SETIERROR(retval,"from read_wu_state() in worker()"); + ++ fprintf(stderr,"I: worker() - seti_do_work\n"); + retval = seti_do_work(); + if (retval) SETIERROR(retval,"from seti_do_work() in worker()"); + ++ fprintf(stderr,"I: worker() - boinc_finish\n"); + boinc_finish(retval); + } + catch (seti_error e) { +@@ -200,6 +204,7 @@ + #endif + exit(0); // an overflow is not an app error + } else { ++ fprintf(stderr,"E: printing backtrace\n"); + e.print(); + #ifdef USE_MANUAL_CALLSTACK + call_stack.exit(); diff --git a/patches/210_fix_fgets_warning.patch b/patches/210_fix_fgets_warning.patch new file mode 100644 index 0000000..b410f86 --- /dev/null +++ b/patches/210_fix_fgets_warning.patch @@ -0,0 +1,61 @@ +Description: Fix some warnings on fgets. +--- a/client/seti_header.cpp ++++ b/client/seti_header.cpp +@@ -191,8 +191,9 @@ + static workunit *wu; + + int seti_parse_wu_header(FILE* f) { +- char buf[256]; ++ char buf[2560]; + int found=0; ++ buf[0]=0; + #ifdef USE_MANUAL_CALLSTACK + call_stack.enter("seti_parse_wu_header(FILE *)"); + #endif /* USE_MANUAL_CALLSTACK */ +@@ -207,13 +208,14 @@ + //swi.fft_len=2048; + //swi.ifft_len=8; + ++ char *fgets_return_value; + do { +- fgets(buf, 256, f); +- } while (!feof(f) && !xml_match_tag(buf,"("SETI_WU_INFO"), diff --git a/patches/214_fix_armhf.patch b/patches/214_fix_armhf.patch new file mode 100644 index 0000000..afc37b2 --- /dev/null +++ b/patches/214_fix_armhf.patch @@ -0,0 +1,51 @@ +Author: Jacky Man +Description: (quoting the mail) +Basically, the original assembly code for analyzeFuncs_neon.S and analyzeFuncs_vfp.S is writen for soft-float call convention. Since ARM has changed the way the function call with vfp, you will get a compilation error like the following if you don't modify the code. + +/usr/bin/ld: error: seti_boinc uses VFP register arguments, analyzeFuncs_neon.o does not +/usr/bin/ld: failed to merge target specific data of file analyzeFuncs_neon.o +/usr/bin/ld: error: seti_boinc uses VFP register arguments, analyzeFuncs_vfp.o does not +/usr/bin/ld: failed to merge target specific data of file analyzeFuncs_vfp.o +collect2: error: ld returned 1 exit status +make[2]: *** [seti_boinc] Error 1 + +May be I should talk to Eric about making the changes in the main tree with #ifdef _armhf_ or somthing like that. meanwhile if you come across the compilation error above, you have the solution. + +--- boinc-app-seti-7.19~svn2050.orig/client/vector/analyzeFuncs_neon.S ++++ boinc-app-seti-7.19~svn2050/client/vector/analyzeFuncs_neon.S +@@ -41,8 +41,16 @@ + * Author: Mateusz Szpakowski + */ + ++#if defined(__VFP_FP__) && !defined(__SOFTFP__) ++ .syntax unified ++#endif + .arch armv7-a + .fpu neon ++#if defined(__VFP_FP__) && !defined(__SOFTFP__) ++ .eabi_attribute 27, 3 ++ .eabi_attribute 28, 1 ++#endif ++ + .eabi_attribute 20, 1 + .eabi_attribute 21, 1 + .eabi_attribute 23, 3 +--- boinc-app-seti-7.19~svn2050.orig/client/vector/analyzeFuncs_vfp.S ++++ boinc-app-seti-7.19~svn2050/client/vector/analyzeFuncs_vfp.S +@@ -41,8 +41,16 @@ + * Author: Mateusz Szpakowski + */ + ++#if defined(__VFP_FP__) && !defined(__SOFTFP__) ++ .syntax unified ++#endif + .arch armv6 + .fpu vfp ++#if defined(__VFP_FP__) && !defined(__SOFTFP__) ++ .eabi_attribute 27, 3 ++ .eabi_attribute 28, 1 ++#endif ++ + .eabi_attribute 20, 1 + .eabi_attribute 21, 1 + .eabi_attribute 23, 3 diff --git a/patches/README.patches b/patches/README.patches new file mode 100644 index 0000000..b06bbf3 --- /dev/null +++ b/patches/README.patches @@ -0,0 +1,9 @@ +0xx patches are Debian-specific build patches, that have not and will not be +proposed upstream; they don't need to be. + +If there are any: + +1xx patches have been proposed upstream and accepted; these can safely be +deleted when updating to a new release. + +2xx patches are awaiting the approval of upstream. diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..0e70135 --- /dev/null +++ b/patches/series @@ -0,0 +1,13 @@ +210_fix_fgets_warning.patch +211_give_stderr_some_output.patch +212_increase_buffers.patch +213_const_warning_reduction.patch +214_fix_armhf.patch +# put Debian-specific patches at end +001_disable_avx_in_configure.patch +#002_disable_static_linkage.patch +003_dont_use_own_jpeglib_and_glut.patch +004_disable_altivec_on_ppc_linux.patch +#005_powerpc_altivec.patch +006_omitting_archs.patch +007_worker_comments.patch diff --git a/rules b/rules new file mode 100755 index 0000000..320be7a --- /dev/null +++ b/rules @@ -0,0 +1,173 @@ +#!/usr/bin/make -f + +# Uncomment this to compile with gcc-snapshot. +#export CC=/usr/lib/gcc-snapshot/bin/gcc +#export CXX=/usr/lib/gcc-snapshot/bin/g++ +#export CPP=/usr/lib/gcc-snapshot/bin/cpp + +# Uncomment for particular version of gcc +#export CC := gcc-4.7 +#export CXX := g++-4.7 +#export CPP := cpp-4.7 + +# Uncomment for clang (llvm) +#export CC = clang +#export CXX = clang + +# Set default flags with dpkg-buildflags +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +# PKG = boinc-app-seti + +export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) +export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) +export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) +export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) + +# Uncomment this to enable compilation with UltraSPARC specific compiler +# flags. This will most probably increase setiathome's performance or if +# your are unlucky will break it. +# +#CPUTYPE = $(shell head -1 /proc/cpuinfo | cut -f 2 -d ':' | cut -f 3 -d '\' ) +#ifeq (UltraSparc, $(CPUTYPE)) +# CPUSUBTYPE = $(shell head -1 /proc/cpuinfo | cut -f 2 -d ':' | \ +# cut -f 4 -d '\' | cut -f 1 -d '+') +# CFLAGS += -mcpu=v9 +# CXXFLAGS += -mcpu=v9 +# ifeq (III, $(CPUSUBTYPE)) +# CFLAGS += -mcpu=ultrasparc3 +# CXXFLAGS += -mcpu=ultrasparc3 +# else +# CFLAGS += -mcpu=ultrasparc +# CXXFLAGS += -mcpu=ultrasparc +# endif +# CFLAGS += -m64 +# CXXFLAGS += -m64 +# DEB_CONFIGURE_EXTRA_FLAGS += --enable-bitness=64 +#endif + + +# Append this to CFLAGS and CXXFLAGS. +CFLAGS_APPEND += -I/usr/include/boinc -I/usr/include/boinc/lib -I/usr/include/boinc/api + +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)) +GCCVERSION=$(shell $(CXX) --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+-[0-9]+$$' | cut -f1 -d-) +CFLAGS_APPEND += -O3 +# -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) + +# This is a shame, but there is yet no AltiVec for Linux PowerPC with SETI +SETIEXTRAFLAGS= --disable-altivec + +ifeq ($(DEB_BUILD_GNU_CPU),x86_64) + SETIEXTRAFLAGS += --enable-sse3 +# SETIEXTRAFLAGS += --disable-avx +# SETIEXTRAFLAGS += --enable-sse2 --enable-sse --enable-mmx +endif + +ifeq ($(DEB_BUILD_GNU_CPU),i686) + SETIEXTRAFLAGS += --enable-sse2 --enable-sse --enable-mmx +endif + + +# Get upstream version from debian version. +UPSTREAM_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | \ + cut -d ' ' -f 2 | cut -d '-' -f 1 | cut -d '+' -f 1 | cut -d '~' -f 1 | perl -pe 's/^.*?://') +# Remove dot "." in upstream version for use in app_info.xml +APP_INFO_VERSION = $(subst .,,$(UPSTREAM_VERSION)) + + +%: + dh $@ --parallel --with autoreconf + +CFGFLAGS = \ + --disable-static-client \ + --disable-static \ + --enable-shared \ + --enable-client \ + --disable-server \ + --enable-dependency-tracking \ + --with-gnu-ld $(SETIEXTRAFLAGS) + +override_dh_auto_configure: + #./_autosetup + #if [ ! -r ltmain.sh ]; then libtoolize; fi + #aclocal -I m4 && autoheader && automake && autoconf + # Remember to not configure with --disable-dependency-tracking, because + # it breaks some handwritten rules in client/Makefile.am which require + # that DEPDIR exists. + # + # use two directories for graphics/nographics + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ + BOINCDIR=/usr/include/boinc dh_auto_configure --builddirectory=graphics \ + -- $(CFGFLAGS) --enable-graphics + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ + BOINCDIR=/usr/include/boinc dh_auto_configure --builddirectory=nographics \ + -- $(CFGFLAGS) --disable-graphics + +override_dh_auto_build: + dh_auto_build -O--parallel --builddirectory=graphics + dh_auto_build -O--parallel --builddirectory=nographics + +override_dh_auto_clean: + dh_auto_clean + rm -rf configure Makefile.in aclocal.m4 assimilator/Makefile.in client/Makefile.in sah_config.h.in splitter_fft/Makefile.in splitter_pfb/Makefile.in tools/Makefile.in + rm -rf compile config.guess config.sub depcomp install-sh ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 missing + # separate building dirs + rm -rf graphics/ + rm -rf nographics/ + # may be seen after invoking binary + rm -f boinc_finish_called result.sah state.sah stderr.txt stderrgfx.txt wisdom.sah work_unit.sah boinc_lockfile project_specific_defines.h boinc_setiathome_* + +override_dh_install: + cp -f nographics/client/seti_boinc nographics/client/setiathome_v7 + cp -f graphics/client/seti_boinc graphics/client/setiathome_v7 + cp -f graphics/client/seti_graphics graphics/client/setiathome_graphics + cat debian/extra/app_info.xml.in | perl -ne 'print unless /^#/' | \ + sed -e 's/VERSION/$(APP_INFO_VERSION)/' > debian/extra/app_info.xml + cat debian/extra-graphics/app_info.xml.in | perl -ne 'print unless /^#/' | \ + sed -e 's/VERSION/$(APP_INFO_VERSION)/' > debian/extra-graphics/app_info.xml + dh_install --list-missing + + +override_dh_strip: + dh_strip --dbg-package=boinc-app-seti-dbg + + +origDir ?= . + +get-orig-source: + if [ ! -d "$(origDir)" ]; then \ + echo "Destination directory '$(origDir)' does not exist."; \ + exit; \ + fi; \ + cd $(origDir); \ + EXP=/tmp/download-seti; \ + nice="nice -5"; if [ -x /usr/bin/ionice ]; then nice="$$nice ionice -c 3"; fi ; \ + $$nice wget -O$$EXP "http://git.debian.org/?p=pkg-boinc/scripts.git;a=blob_plain;f=export-seti;hb=HEAD" --quiet && \ + chmod +x $$EXP && $$EXP && rm -f $$EXP + +.PHONY: get-orig-source diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 2.30.2