[SCM] SETI at home packaging branch, master, updated. debian/7.00_svn1883-1-29-g0fc7ce1
Guo Yixuan
culu.gyx at gmail.com
Tue Jun 25 16:39:36 UTC 2013
The following commit has been merged in the master branch:
commit e4bdb1c1b060e5d658c4b4d1e1c528ebb7ee162d
Merge: 32f6070599ca5bd286c3b9319582a15d09590bf0 54fd66952c814ee12a329a812e63f821b12779fa
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Sun May 5 16:08:13 2013 +0800
Merge branch 'master' into graphics
Conflicts:
.gitignore
debian/rules
diff --combined .gitignore
index b77b89a,2b2320a..7feb2c5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,5 +1,5 @@@
+ */Makefile
+ */Makefile.in
*.o
.deps/
aclocal.m4
@@@ -13,10 -15,9 +15,11 @@@ sah_config.
sah_config.h.in
client/hires_timer_test
client/seti_boinc
+client/seti_graphics
client/setiathome-*
client/setiathome_enhanced
+client/setiathome_graphics
+ client/project_specific_defines.h
db/schema_to_class
tools/fakedata
tools/workunit_resample
@@@ -29,6 -30,4 +32,6 @@@ debian/*.substvar
debian/files
debian/boinc-app-seti/
debian/boinc-app-seti-dbg/
+debian/boinc-app-seti-graphics/
debian/extra/app_info.xml
+debian/extra-graphics/app_info.xml
diff --combined debian/README.source
index c5d5bc2,b570214..806150e
--- a/debian/README.source
+++ b/debian/README.source
@@@ -11,7 -11,6 +11,6 @@@ Modifications to the upstream source
client/win_build/work_unit.sah: the same as client/test_workunits/reference_work_unit.sah
Not used in building:
- jpeglib/
sah_config.h
Repackaged upstream source:
@@@ -44,12 -43,3 +43,12 @@@ quilt configuration
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 --combined debian/changelog
index eb28176,648e515..21dcfa1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,38 +1,38 @@@
+ boinc-app-seti (7.00~svn1828-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> 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 <costamagnagianfranco at yahoo.it> 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 <costamagnagianfranco at yahoo.it> Mon, 25 Feb 2013 11:35:32 +0100
+
boinc-app-seti (7.00~svn1708-1) UNRELEASED; urgency=low
- * New upstream version
+ [ 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 <costamagnagianfranco at yahoo.it> Mon, 05 Nov 2012 14:48:54 +0100
@@@ -12,7 -44,7 +44,7 @@@ boinc-app-seti (7.00~svn1704-1) UNRELEA
boinc-app-seti (7.00~svn1703-1) UNRELEASED; urgency=low
- * New upstream version
+ * New upstream version.
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Fri, 02 Nov 2012 12:52:08 +0100
@@@ -34,7 -66,6 +66,7 @@@ boinc-app-seti (6.97~svn1409-1) unstabl
- sah_v7 branch becomes trunk.
- new feature: autocorrelation.
- re-enabled 003_dont_use_own_jpeglib.patch, and refreshed some patches.
+ * New package: boinc-app-seti-graphics provide a visualizer for seti.
[Steffen Moeller]
* debian/control: boinc-app-seti suggests boinc-manager
diff --combined debian/control
index 87c85cb,fbc21a4..a9fcc2c
--- a/debian/control
+++ b/debian/control
@@@ -4,23 -4,19 +4,22 @@@ Priority: extr
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
Uploaders: Steffen Moeller <moeller at debian.org>,
Guo Yixuan <culu.gyx at gmail.com>
- DM-Upload-Allowed: yes
- Standards-Version: 3.9.3
+ Standards-Version: 3.9.4
Build-Depends: debhelper (>= 7.0.50~), automake1.9 (>= 1.9.3),
autoconf (>= 2.59),
boinc-dev (>= 7) | libboinc-app-dev,
- libfftw3-dev
+ libfftw3-dev,
+ freeglut3-dev,
+ libjpeg-dev
Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc-app-seti.git
Vcs-Browser: http://git.debian.org/?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 (>= 5.4.3-1)
+ Depends: ${misc:Depends}, ${shlibs:Depends}, boinc-client (>= 5.4.3-1)
Suggests: boinc-manager
+Conflicts: boinc-app-seti-graphics
Description: SETI at home application for the BOINC client
SETI at home is a distributed computing project using Internet-connected
computers for the Search for Extraterrestrial Intelligence (SETI). It
@@@ -41,44 -37,10 +40,44 @@@
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 (>= 5.4.3-1)
+Conflicts: boinc-app-seti
+Description: SETI at home application for the BOINC client (with graphics)
+ SETI at 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 at home Enhanced application for the BOINC
+ distributed computing platform. The BOINC client downloads the radio
+ data which the SETI at home application analyzes looking for signals of
+ extraterrestrial origin. Results are then send back to the SETI at home
+ server by the BOINC client.
+ .
+ Note that this package has been primarily created for users of
+ architectures for which SETI at home does not provide its application.
+ If your architecture is x86 or AMD64 the BOINC client automatically
+ downloads the latest SETI at 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 at 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})
+Depends: ${misc:Depends},
+ boinc-app-seti (= ${binary:Version}) |
+ boinc-app-seti-graphics (= ${binary:Version})
Section: debug
Description: debug symbols for SETI at home
SETI at home is a distributed computing project using Internet-connected
diff --combined debian/rules
index 169eed8,2fe352d..5e95bbf
--- a/debian/rules
+++ b/debian/rules
@@@ -5,6 -5,15 +5,15 @@@
#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
+
DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@@ -42,20 -51,36 +51,36 @@@ export LDFLAGS := $(shell dpkg-buildfl
# Append this to CFLAGS and CXXFLAGS.
- CFLAGS_APPEND += -O3
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
@@@ -85,10 -110,12 +110,12 @@@ override_dh_auto_configure
--disable-static \
--enable-shared \
--enable-client \
- --disable-graphics \
+ --enable-graphics \
--disable-server \
--enable-dependency-tracking \
--with-gnu-ld $(SETIEXTRAFLAGS)
+ # helping boinc-dev >´ 7.0.42
+ touch client/project_specific_defines.h
override_dh_auto_clean:
if [ -r Makefile ]; then make clean; fi
@@@ -97,24 -124,23 +124,26 @@@
rm -f client/seti_boinc client/hires_timer_test tools/fakedata tools/workunit_resample tools/workunit_to_ascii
dh_clean \
client/setiathome-$(UPSTREAM_VERSION).* \
- client/setiathome_enhanced \
- debian/extra/app_info.xml \
+ client/setiathome_enhanced client/setiathome_graphics \
- debian/extra/app_info.xml debian/extra-graphics/app_info.xml
++ debian/extra/app_info.xml debian/extra-graphics/app_info.xml \
+ client/setiathome-7.0.x86_64-pc-linux-gnu*
# may be seen after invoking binary
- rm -f client/boinc_finish_called client/result.sah client/state.sah client/stderr.txt client/wisdom.sah client/work_unit.sah client/boinc_lockfile
+ rm -f client/boinc_finish_called client/result.sah client/state.sah client/stderr.txt client/wisdom.sah client/work_unit.sah client/boinc_lockfile client/project_specific_defines.h
# generated by autoconf
- rm -f Makefile Makefile.in aclocal.m4 assimilator/Makefile assimilator/Makefile.in client/Makefile client/Makefile.in config.log config.status configure db/Makefile db/schema_to_class db/tools/Makefile jpeglib/Makefile jpeglib/Makefile.in libtool sah_config.h.in splitter/Makefile splitter/Makefile.in stamp-h1 tools/Makefile tools/Makefile.in validate/Makefile
+ rm -f Makefile Makefile.in aclocal.m4 assimilator/Makefile assimilator/Makefile.in client/Makefile client/Makefile.in config.log config.status configure db/Makefile db/schema_to_class db/tools/Makefile jpeglib/Makefile jpeglib/Makefile.in libtool sah_config.h.in stamp-h1 tools/Makefile tools/Makefile.in validate/Makefile splitter_fft/Makefile splitter_fft/Makefile.in splitter_pfb/Makefile splitter_pfb/Makefile.in
rm -f sah_config.h
+ rm -f time_stats_log boinc_lockfile lockfile gui_rpc_auth.cfg stderr.txt
override_dh_installchangelogs:
dh_installchangelogs -k checkin_notes
override_dh_install:
- cp -f client/seti_boinc client/setiathome_enhanced
+ cp -f client/seti_boinc client/setiathome_enhanced
+ cp -f client/seti_graphics client/setiathome_graphics
cat debian/extra/app_info.xml.in | \
sed -e 's/VERSION/$(APP_INFO_VERSION)/' > debian/extra/app_info.xml
+ cat debian/extra-graphics/app_info.xml.in | \
+ sed -e 's/VERSION/$(APP_INFO_VERSION)/' > debian/extra-graphics/app_info.xml
dh_install
--
SETI at home packaging
More information about the pkg-boinc-commits
mailing list