[SCM] SETI at home packaging branch, graphics, updated. debian/6.97_svn1409-1-77-g3a993ef
Guo Yixuan
culu.gyx at gmail.com
Sun Jun 16 08:55:18 UTC 2013
The following commit has been merged in the graphics branch:
commit 3a993efa2c9afd5967a999a0c67931eab3909845
Merge: e4bdb1c1b060e5d658c4b4d1e1c528ebb7ee162d afaf0acb1fd8a714620c0d7759f47c94c5aaea2c
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Sun Jun 16 16:51:12 2013 +0800
Merge branch 'master' into graphics
Conflicts:
.gitignore
debian/control
diff --combined .gitignore
index 7feb2c5,0b64454..cfff091
--- a/.gitignore
+++ b/.gitignore
@@@ -15,11 -15,8 +15,10 @@@ 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
@@@ -32,6 -29,4 +31,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/changelog
index 21dcfa1,e3d5733..0f91419
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,18 +1,18 @@@
+ boinc-app-seti (7.00~svn1854-1) unstable; urgency=low
+
+ * New upstream release.
+ - Makefiles bugs fixed.
+ * Added libgsl0-dev as build-dep.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> 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 <costamagnagianfranco at yahoo.it> Thu, 02 May 2013 16:59:58 +0200
@@@ -66,7 -78,6 +78,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 a9fcc2c,d01557e..f75e475
--- a/debian/control
+++ b/debian/control
@@@ -5,21 -5,21 +5,24 @@@ Maintainer: Debian BOINC Maintainers <p
Uploaders: Steffen Moeller <moeller at debian.org>,
Guo Yixuan <culu.gyx at gmail.com>
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,
+ Build-Depends: debhelper (>= 9),
+ automake,
+ dpkg-dev (>= 1.16.1.1),
+ boinc-dev (>> 7.0.65+dfsg-1) | libboinc-app-dev (>> 7.0.65+dfsg-1),
+ autoconf,
libfftw3-dev,
- libgsl0-dev
++ libgsl0-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
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
@@@ -40,44 -40,10 +43,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 5e95bbf,9073078..4c933d4
--- a/debian/rules
+++ b/debian/rules
@@@ -14,6 -14,10 +14,10 @@@
#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)
@@@ -100,7 -104,7 +104,7 @@@ APP_INFO_VERSION = $(subst .,,$(UPSTREA
dh $@ --parallel
override_dh_auto_configure:
- aclocal-1.9 -I m4 && autoheader && automake-1.9 && autoconf
+ 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.
@@@ -110,12 -114,10 +114,10 @@@
--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
@@@ -124,8 -126,8 +126,8 @@@
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 \
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 client/project_specific_defines.h
@@@ -138,12 -140,9 +140,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
--
SETI at home packaging
More information about the pkg-boinc-commits
mailing list