[SCM] SETI at home packaging branch, master, updated. debian/6.97_svn1409-1-25-ged52133

[Steffen Moeller]

The following commit has been merged in the master branch:
commit ed52133998bffa1d9b9990ef22a930daec87653d
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Mon Dec 10 15:43:40 2012 +0100

    Compiling with g++ 4.8, experimental only.
    
    Because of the freeze and the broken SETI server, this is not too much
    of a problem.

diff --git a/debian/changelog b/debian/changelog
index e84d47e..caa7494 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ boinc-app-seti (7.00~svn1708-1) UNRELEASED; urgency=low
 
   [ Steffen Moeller ]
   * Added link time optimisation
+    - compiler bug demands g++ version >= 4.8
+    - only building in experimental until 4.8 is in unstable
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 05 Nov 2012 14:48:54 +0100
 
diff --git a/debian/control b/debian/control
index 6290bea..7d70d92 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Standards-Version: 3.9.4
 Build-Depends: debhelper (>= 7.0.50~), automake1.9 (>= 1.9.3),
  autoconf (>= 2.59),
  boinc-dev (>= 7) | libboinc-app-dev,
- libfftw3-dev
+ libfftw3-dev,
+ g++-4.8
 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/
diff --git a/debian/patches/series b/debian/patches/series
index 0a3fe32..b640db2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 #005_powerpc_altivec.patch
 006_omitting_archs.patch
 007_worker_comments.patch
+db_has_no_avx.patch
diff --git a/debian/rules b/debian/rules
index 1958465..f7f6259 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,11 @@
 #export CXX=/usr/lib/gcc-snapshot/bin/g++
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
+# Uncomment for particular version of gcc
+export  CC := gcc-4.8
+export CXX := g++-4.8
+export CPP := cpp-4.8
+
 
 DEB_BUILD_GNU_CPU  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -44,7 +49,7 @@ export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 # Append this to CFLAGS and CXXFLAGS.
 CFLAGS_APPEND += -O3
 CFLAGS_APPEND += -I/usr/include/boinc -I/usr/include/boinc/lib -I/usr/include/boinc/api
-GCCVERSION=$(shell gcc --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.)
+GCCVERSION=$(shell $(CXX) --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.)
 # gcc 4.6 on precise has issues while gcc 4.7 on sid is just fine
 ifneq (4.6,$(GCCVERSION))
 ifneq (4.5,$(GCCVERSION))

-- 
SETI at home packaging