[SCM] SETI at home packaging branch, master, updated. debian/7.00_svn1883-1-36-g265cdfd

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 478032fcf366dcc0ca00122643106f022d6c1b95
Merge: 14f134405f5b384ec3397b409f516e26bb020b09 ae405828f7fe311db87faa95817a7aa427fb9003
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri Jun 28 00:16:02 2013 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-boinc/boinc-app-seti
    
    Conflicts:
    	debian/rules

diff --combined debian/rules
index 9934e8b,b295980..34a4f05
--- a/debian/rules
+++ b/debian/rules
@@@ -103,50 -103,59 +103,63 @@@ 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 ./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.
+ 	#
+ 	# use two directories for graphics/nographics
+ 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ 	BOINCDIR=/usr/include/boinc dh_auto_configure --builddirectory=graphics \
+ 	  -- $(CFGFLAGS) --enable-graphics
+ 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ 	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
- 	find . -name ".deps" -a -type d | xargs -r rm -r
- 	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-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
+ 	# 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 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 Makefile.in aclocal.m4 assimilator/Makefile.in client/Makefile.in config.log config.status configure db/schema_to_class jpeglib/Makefile.in sah_config.h.in tools/Makefile.in splitter_fft/Makefile.in splitter_pfb/Makefile.in
 +	rm -f splitter/Makefile splitter/Makefile.in
 +	rm -f sah_config.h
 +	rm -f time_stats_log boinc_lockfile lockfile gui_rpc_auth.cfg stderr.txt
+ 	# separate building dirs
+ 	rm -rf graphics/
+ 	rm -rf nographics/
  
  override_dh_install: 
- 	cp -f client/seti_boinc client/setiathome_enhanced
+ 	cp -f nographics/client/seti_boinc  nographics/client/setiathome_enhanced
+ 	cp -f graphics/client/seti_boinc    graphics/client/setiathome_enhanced
+ 	cp -f graphics/client/seti_graphics 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 debian/extra/app_info.xml debian/extra-graphics/app_info.xml
+ 
  
  origDir ?= .
  

-- 
SETI at home packaging