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

[Guo Yixuan]

The following commit has been merged in the master branch:
commit 5113d3ca84e889bd37d7f7f16db2f2463ac86d8e
Merge: b987af841a06816d9360610e8fa7ab05e9ae96da ccf9221b24fc084cc61d3ffb6a4adbd835426e61
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Fri Aug 31 10:06:18 2012 +0800

    Merge branch 'master' into graphics
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index 2d21a5b,e6df13e..b77b89a
--- a/.gitignore
+++ b/.gitignore
@@@ -13,11 -13,8 +13,10 @@@ sah_config.
  sah_config.h.in
  client/hires_timer_test
  client/seti_boinc
 +client/seti_graphics
- client/setiathome-6.12.x86_64-pc-linux-gnu
- client/setiathome-6.12.x86_64-pc-linux-gnu.debug
+ client/setiathome-*
  client/setiathome_enhanced
 +client/setiathome_graphics
  db/schema_to_class
  tools/fakedata
  tools/workunit_resample
@@@ -30,6 -27,4 +29,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/README.source
index 79489b9,9996853..d61c4df
--- a/debian/README.source
+++ b/debian/README.source
@@@ -1,4 -1,18 +1,18 @@@
- Modifications to the upstream source: none
+ Modifications to the upstream source:
+  Some files are removed for various reasons.
+ 
+  Prebuilt windows binary:
+     client/win_build/jpeg.lib
+     client/win_build/libfftw3f-3-1-1a_upx.dll
+     client/win_build/libfftw3f-3.exp
+     client/win_build/libfftw3f.lib
+ 
+  Duplicate:
+     client/win_build/work_unit.sah: the same as client/test_workunits/reference_work_unit.sah
+ 
+  Not used in building:
+     jpeglib/
+     sah_config.h
  
  Repackaged upstream source:
   The SETI at home project does not distribute source code releases as
@@@ -24,12 -38,3 +38,12 @@@
  
   The latest .orig.tar.gz tarball can always be retrieved, using this
   script, by invoking the get-orig-source target of debian/rules.
 +
 +About graphics:
 + There're 2 flavors now: boinc-app-seti and boinc-app-seti-graphics.
 + Main difference in building process can be summarized as:
 + 1. Build seti with --enable-graphics, which generate 2 binaries.
 + 2. Put both into package boinc-app-seti-graphics, and put the
 +    no-graphics one in boinc-app-seti.
 + 3. Mark boinc-app-seti and boinc-app-seti-graphics as in conflict with
 +    each other.
diff --combined debian/rules
index 88a955f,b5c7649..169eed8
--- a/debian/rules
+++ b/debian/rules
@@@ -80,12 -80,12 +80,12 @@@ override_dh_auto_configure
  	# 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 \
- 	  --enable-static-client \
- 	  --enable-static \
- 	  --disable-shared \
+ 	BOINCDIR=/usr/include/boinc ./configure \
+ 	  --disable-static-client \
+ 	  --disable-static \
+ 	  --enable-shared \
  	  --enable-client \
 -	  --disable-graphics \
 +	  --enable-graphics \
  	  --disable-server \
  	  --enable-dependency-tracking \
  	  --with-gnu-ld $(SETIEXTRAFLAGS)
@@@ -97,8 -97,8 +97,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
  	# 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
@@@ -109,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
  
  

-- 
SETI at home packaging