[SCM] SETI at home packaging branch, graphics, updated. debian/6.97_svn1409-1-78-g0dc5214

[Guo Yixuan]

The following commit has been merged in the graphics branch:
commit 0dc52146de589f087a6486f73fe6fa2bd962f400
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Tue May 7 18:26:08 2013 +0800

    try to build twice: graphics/nographics

diff --git a/debian/patches/separate_build_dir.patch b/debian/patches/separate_build_dir.patch
new file mode 100644
index 0000000..110e506
--- /dev/null
+++ b/debian/patches/separate_build_dir.patch
@@ -0,0 +1,22 @@
+--- a/client/Makefile.am
++++ b/client/Makefile.am
+@@ -216,7 +216,7 @@ endif
+ if LINUX
+ # too much optimization on main.cpp breaks the client for some reason
+ seti_boinc-main.o: main.cpp
+-	if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++	if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -I$(top_srcdir)/db -I$(top_srcdir) $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ endif
+ 
+ 
+--- a/Makefile.incl
++++ b/Makefile.incl
+@@ -6,7 +6,7 @@
+ 
+ AM_LIBS = @LIBS@
+ AM_LDFLAGS = @LDFLAGS@
+-AM_CPPFLAGS = @CFLAGS@ @PICFLAGS@ @DEFS@
++AM_CPPFLAGS = @CFLAGS@ @PICFLAGS@ @DEFS@ -I$(top_srcdir)
+ AM_CFLAGS = $(AM_CPPFLAGS)
+ AM_CXXFLAGS = $(AM_CPPFLAGS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 68e22c7..e96eedd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ disable_avx_in_configure.patch
 #005_powerpc_altivec.patch
 006_omitting_archs.patch
 007_worker_comments.patch
+separate_build_dir.patch
diff --git a/debian/rules b/debian/rules
index 4c933d4..cc641e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,22 +103,30 @@ APP_INFO_VERSION = $(subst .,,$(UPSTREAM_VERSION))
 %:
 	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 \
-	  --enable-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
@@ -152,6 +160,11 @@ override_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