[SCM] SETI at home packaging branch, graphics, updated. debian/7.00_svn1883-1-18-g410d391

Mon Jun 24 17:06:08 UTC 2013

The following commit has been merged in the graphics branch:
commit 410d391f8446787dc6d2a73cbfa56d4a51c95829
Merge: 0dc52146de589f087a6486f73fe6fa2bd962f400 3f8c89bdbb4795d39acea76b843ef0e56a580730
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Tue Jun 25 01:05:23 2013 +0800

    Merge branch 'master' into graphics
    
    Conflicts:
    	debian/rules

diff --combined debian/changelog
index 0f91419,dd6b1cb..879147e

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,25 +1,25 @@@
+ boinc-app-seti (7.00~svn1883-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * New app_info.xml file (Closes: 711734)
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  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.
+   * New app_info.xml file (Closes: 711734)
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  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 updatedb anymore.
  
   -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 24 May 2013 11:33:48 +0200
  
@@@ -78,7 -95,6 +95,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 f75e475,b591c0e..f051c14
--- a/debian/control
+++ b/debian/control
@@@ -3,7 -3,8 +3,8 @@@ Section: scienc
  Priority: extra
  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>
+  Guo Yixuan <culu.gyx at gmail.com>,
+  Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
  Standards-Version: 3.9.4
  Build-Depends: debhelper (>= 9),
   automake,
@@@ -11,9 -12,7 +12,9 @@@
   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/
@@@ -22,7 -21,6 +23,7 @@@ Package: boinc-app-set
  Architecture: any
  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
@@@ -43,44 -41,10 +44,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 cc641e1,f83a755..379ce7e
--- a/debian/rules
+++ b/debian/rules
@@@ -103,30 -103,22 +103,30 @@@ APP_INFO_VERSION = $(subst .,,$(UPSTREA
  %:
  	dh $@ --parallel
  
 -override_dh_auto_configure:
 -	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.
 -	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
 -	BOINCDIR=/usr/include/boinc dh_auto_configure -- \
 +CFGFLAGS = \
  	  --disable-static-client \
  	  --disable-static \
  	  --enable-shared \
  	  --enable-client \
 -	  --disable-graphics \
  	  --disable-server \
  	  --enable-dependency-tracking \
  	  --with-gnu-ld $(SETIEXTRAFLAGS)
  
 +override_dh_auto_configure:
 +	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.
 +	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
 +	BOINCDIR=/usr/include/boinc dh_auto_configure --builddirectory=graphics \
 +	  -- $(CFGFLAGS) --enable-graphics
 +	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:
  	if [ -r Makefile ]; then make clean; fi
  	find . -name "*.o" -delete
@@@ -134,8 -126,8 +134,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
@@@ -144,27 -136,16 +144,24 @@@
  	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
  
  
  override_dh_strip:
  	dh_strip --dbg-package=boinc-app-seti-dbg
  
 +override_dh_clean:
 +	dh_clean
 +	rm -rf graphics/
 +	rm -rf nographics/
 +
  
  origDir ?= .
  

-- 
SETI at home packaging

