[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:33 UTC 2013
The following commit has been merged in the master branch:
commit 8f62a234ab744955896d27cd6fe51a68984522fd
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Mon Jun 4 17:36:39 2012 +0800
Prepare for a graphics package: boinc-app-seti-graphics
TODO:
1. More test and documents.
2. Remove some obvious duplicates (README.Debian, postinst/prerm, ...).
3. Use dpkg-divert so boinc-app-seti-graphics can depend on boinc-app-seti
for the command line program.
diff --git a/debian/boinc-app-seti.README.Debian b/debian/boinc-app-seti-graphics.README.Debian
similarity index 100%
copy from debian/boinc-app-seti.README.Debian
copy to debian/boinc-app-seti-graphics.README.Debian
diff --git a/debian/boinc-app-seti-graphics.dirs b/debian/boinc-app-seti-graphics.dirs
new file mode 100644
index 0000000..0bc1c91
--- /dev/null
+++ b/debian/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/debian/boinc-app-seti.docs b/debian/boinc-app-seti-graphics.docs
similarity index 100%
copy from debian/boinc-app-seti.docs
copy to debian/boinc-app-seti-graphics.docs
diff --git a/debian/boinc-app-seti-graphics.install b/debian/boinc-app-seti-graphics.install
new file mode 100644
index 0000000..f28a82a
--- /dev/null
+++ b/debian/boinc-app-seti-graphics.install
@@ -0,0 +1,4 @@
+client/setiathome_enhanced usr/lib/boinc-app-seti-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/debian/boinc-app-seti.postinst b/debian/boinc-app-seti-graphics.postinst
similarity index 82%
copy from debian/boinc-app-seti.postinst
copy to debian/boinc-app-seti-graphics.postinst
index 4b37f74..14adda9 100644
--- a/debian/boinc-app-seti.postinst
+++ b/debian/boinc-app-seti-graphics.postinst
@@ -1,9 +1,10 @@
#!/bin/sh
-# postinst script for boinc-app-seti
+# postinst script for boinc-app-seti-graphics
set -e
BOINC_DIR=/var/lib/boinc-client
+PROJECT=seti-graphics
init_boinc_client()
{
@@ -16,7 +17,7 @@ init_boinc_client()
case "$1" in
configure)
- update-boinc-applinks --create --project=seti --data-dir=$BOINC_DIR
+ 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
diff --git a/debian/boinc-app-seti.prerm b/debian/boinc-app-seti-graphics.prerm
similarity index 75%
copy from debian/boinc-app-seti.prerm
copy to debian/boinc-app-seti-graphics.prerm
index 83f1920..b91b2a3 100644
--- a/debian/boinc-app-seti.prerm
+++ b/debian/boinc-app-seti-graphics.prerm
@@ -1,9 +1,10 @@
#!/bin/sh
-# prerm script for boinc-app-seti
+# prerm script for boinc-app-seti-graphics
set -e
BOINC_DIR=/var/lib/boinc-client
+PROJECT=seti-graphics
init_boinc_client()
{
@@ -21,12 +22,12 @@ case "$1" in
# application. Start the client then again.
init_boinc_client stop
sleep 1
- update-boinc-applinks --remove --project=seti --data-dir=$BOINC_DIR
+ update-boinc-applinks --remove --project=$PROJECT --data-dir=$BOINC_DIR
init_boinc_client start
;;
upgrade)
- update-boinc-applinks --remove --project=seti --data-dir=$BOINC_DIR
+ update-boinc-applinks --remove --project=$PROJECT --data-dir=$BOINC_DIR
;;
failed-upgrade|deconfigure)
diff --git a/debian/boinc-app-seti.postinst b/debian/boinc-app-seti.postinst
index 4b37f74..6df2c0a 100644
--- a/debian/boinc-app-seti.postinst
+++ b/debian/boinc-app-seti.postinst
@@ -4,6 +4,7 @@
set -e
BOINC_DIR=/var/lib/boinc-client
+PROJECT=seti
init_boinc_client()
{
@@ -16,7 +17,7 @@ init_boinc_client()
case "$1" in
configure)
- update-boinc-applinks --create --project=seti --data-dir=$BOINC_DIR
+ 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
diff --git a/debian/boinc-app-seti.prerm b/debian/boinc-app-seti.prerm
index 83f1920..4b1c7f0 100644
--- a/debian/boinc-app-seti.prerm
+++ b/debian/boinc-app-seti.prerm
@@ -4,6 +4,7 @@
set -e
BOINC_DIR=/var/lib/boinc-client
+PROJECT=seti
init_boinc_client()
{
@@ -21,12 +22,12 @@ case "$1" in
# application. Start the client then again.
init_boinc_client stop
sleep 1
- update-boinc-applinks --remove --project=seti --data-dir=$BOINC_DIR
+ update-boinc-applinks --remove --project=$PROJECT --data-dir=$BOINC_DIR
init_boinc_client start
;;
upgrade)
- update-boinc-applinks --remove --project=seti --data-dir=$BOINC_DIR
+ update-boinc-applinks --remove --project=$PROJECT --data-dir=$BOINC_DIR
;;
failed-upgrade|deconfigure)
diff --git a/debian/control b/debian/control
index ad79b95..b2970ce 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,9 @@ 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),
- 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/
@@ -18,6 +20,7 @@ Package: boinc-app-seti
Architecture: any
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
@@ -38,6 +41,38 @@ Description: SETI at home application for the BOINC client
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 --git a/debian/extra/app_info.xml.in b/debian/extra-graphics/app_info.xml.in
similarity index 68%
copy from debian/extra/app_info.xml.in
copy to debian/extra-graphics/app_info.xml.in
index 9146916..ae7047f 100644
--- a/debian/extra/app_info.xml.in
+++ b/debian/extra-graphics/app_info.xml.in
@@ -6,6 +6,10 @@
<name>setiathome_enhanced</name>
<executable/>
</file_info>
+ <file_info>
+ <name>setiathome_graphics</name>
+ <executable/>
+ </file_info>
<app_version>
<app_name>setiathome_enhanced</app_name>
<version_num>VERSION</version_num>
@@ -13,5 +17,9 @@
<file_name>setiathome_enhanced</file_name>
<main_program/>
</file_ref>
+ <file_ref>
+ <file_name>setiathome_graphics</file_name>
+ <open_name>graphics_app</open_name>
+ </file_ref>
</app_version>
</app_info>
diff --git a/debian/extra-graphics/seti-graphics.cfg b/debian/extra-graphics/seti-graphics.cfg
new file mode 100644
index 0000000..865794d
--- /dev/null
+++ b/debian/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_enhanced
+ /usr/lib/boinc-app-seti-graphics/setiathome_graphics
+urls = setiathome.berkeley.edu
+ setiathome.ssl.berkeley.edu
+ setiweb.ssl.berkeley.edu
diff --git a/debian/rules b/debian/rules
index 9fc12a5..3855bd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ override_dh_auto_configure:
BOINCDIR=/usr/share/boinc-dev ./configure \
--disable-static-client \
--enable-client \
- --disable-graphics \
+ --enable-graphics \
--disable-server \
--enable-dependency-tracking \
--disable-static \
@@ -96,8 +96,8 @@ override_dh_auto_clean:
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
# 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,9 +106,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