[SCM] SETI at home packaging branch, graphics, updated. debian/6.12_svn1305-2-43-g1677e6b
Guo Yixuan
culu.gyx at gmail.com
Fri Aug 17 15:24:07 UTC 2012
The following commit has been merged in the graphics branch:
commit ca44613108b1501fe114f236c54e12e563e6d31a
Merge: 8f62a234ab744955896d27cd6fe51a68984522fd d0bf59377d58f26861e216e3ee56e49d7ce58746
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Fri Aug 17 22:14:40 2012 +0800
Merge branch 'master' into graphics
Conflicts:
debian/control
debian/rules
diff --combined debian/control
index b2970ce,c29f380..5d02cd0
--- a/debian/control
+++ b/debian/control
@@@ -8,19 -8,15 +8,18 @@@ Uploaders: Steffen Moeller <moeller at deb
Standards-Version: 3.9.3
Build-Depends: debhelper (>= 7.0.50~), automake1.9 (>= 1.9.3),
autoconf (>= 2.59),
- libboinc-app-dev|boinc-dev (>= 7),
+ 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)
+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,38 -37,6 +40,38 @@@
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
diff --combined debian/rules
index 3855bd7,3240c72..88a955f
--- a/debian/rules
+++ b/debian/rules
@@@ -51,12 -51,12 +51,12 @@@ CFLAGS += $(CFLAGS_APPEND
CXXFLAGS += $(CFLAGS_APPEND)
- SETIEXTRAFLAGS=
-
+ # 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 += --enable-sse2 --enable-sse --enable-mmx
+ # SETIEXTRAFLAGS += --enable-sse2 --enable-sse --enable-mmx
endif
ifeq ($(DEB_BUILD_GNU_CPU),i686)
@@@ -79,15 -79,16 +79,16 @@@ override_dh_auto_configure
# Remember to not configure with --disable-dependency-tracking, because
# it breaks some handwritten rules in client/Makefile.am which require
# that DEPDIR exists.
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
BOINCDIR=/usr/share/boinc-dev ./configure \
- --disable-static-client \
+ --enable-static-client \
+ --enable-static \
+ --disable-shared \
--enable-client \
- --disable-graphics \
+ --enable-graphics \
--disable-server \
--enable-dependency-tracking \
- --disable-static \
- --enable-shared \
- --with-gnu-ld
+ --with-gnu-ld $(SETIEXTRAFLAGS)
override_dh_auto_clean:
if [ -r Makefile ]; then make clean; fi
@@@ -96,8 -97,10 +97,10 @@@
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
+ # 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
# 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 sah_config.h
@@@ -106,12 -109,9 +109,12 @@@ 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
@@@ -127,16 -127,10 +130,10 @@@ get-orig-source
exit; \
fi; \
cd $(origDir); \
- DLS=/tmp/download-seti; \
+ EXP=/tmp/download-seti; \
TODAY=`date +%Y-%m-%d | tr -d '\n'`; \
- svn export svn://svn.debian.org/pkg-boinc/scripts/download-seti $$DLS; \
- echo "Attempting to retrieve today's ($$TODAY) tarball."; \
- $$DLS $$TODAY || ( \
- YESTERDAY=`date -d yesterday +%Y-%m-%d | tr -d '\n'`; \
- echo "Today's ($$TODAY) tarball could not be downloaded."; \
- echo "Now attempting to retrieve yesterday's ($$YESTERDAY) tarball."; \
- $$DLS $$YESTERDAY; \
- ); \
- rm -f $$DLS
+ 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
--
SETI at home packaging
More information about the pkg-boinc-commits
mailing list