[SCM] SETI at home packaging branch, master, updated. debian/6.12_svn1305-2-10-g86a9bc5

Tue May 29 20:19:37 UTC 2012

The following commit has been merged in the master branch:
commit 86a9bc55a17945ad2a33467427b5ad3d47a5374e
Merge: 7faa8169a12e146d1d554a7aa150677ee7eb9e3b f108d0fa7f16ca1fa7472f7b0d28b1995428753b
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue May 29 22:08:59 2012 +0200

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

diff --combined debian/control
index 0e122cc,e547f7e..0cfaed7

--- a/debian/control
+++ b/debian/control
@@@ -7,8 -7,7 +7,8 @@@ Uploaders: Steffen Moeller <moeller at deb
   Guo Yixuan <culu.gyx at gmail.com>
  Standards-Version: 3.9.3
  Build-Depends: debhelper (>= 7.0.50~), automake1.9 (>= 1.9.3),
 - autoconf (>= 2.59), libboinc-app-dev|boinc-dev (>= 7),
 + autoconf (>= 2.59),
-  libboinc-app-dev|boinc-dev (>= 7.0.1),
++ libboinc-app-dev|boinc-dev (>= 7),
   libfftw3-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
@@@ -16,8 -15,8 +16,9 @@@ Homepage: http://setiathome.berkeley.ed
  
  Package: boinc-app-seti
  Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, libboinc-app|boinc-dev (>= 7.0.1)
- Recommends: boinc-client (>= 5.4.3-1)
 -Depends: ${shlibs:Depends}, ${misc:Depends}, libboinc-app|boinc-dev (>= 7),
++Depends: ${misc:Depends},
++ libboinc-app|boinc-dev (>= 7),
+  boinc-client (>= 5.4.3-1)
  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
@@@ -38,18 -37,3 +39,18 @@@
   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.
 +
 +Package: boinc-app-seti-dbg
 +Architecture: any
 +Depends: ${misc:Depends}, boinc-app-seti (= ${binary:Version})
 +Section: debug
 +Description: debug symbols for SETI at home
 + 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 provide debug information. It comes handy when you have
 + optimised the code of SETI yourself and find it crash or be stuck in
 + an infinite loop or you may be asked to install the package for some
 + joint investigation with the SETI core developers.
diff --combined debian/rules
index 5d3cdb6,d48271a..e47b8d4
--- a/debian/rules
+++ b/debian/rules
@@@ -41,12 -41,14 +41,14 @@@ export LDFLAGS  := $(shell dpkg-buildfl
  #endif
  
  
- CXXFLAGS += -O3
- CXXFLAGS += -I/usr/include/boinc -I/usr/include/boinc/lib -I/usr/include/boinc/api
- # some handwritten rules in client/Makefile.am seems to use CFLAGS only
- # [FIXME] remove duplicates
- CFLAGS += -O3
- CFLAGS += -I/usr/include/boinc -I/usr/include/boinc/lib -I/usr/include/boinc/api
+ # 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
+ 
+ # Although all source file are C++, some handwritten rules in
+ # client/Makefile.am seem to use CFLAGS only.
+ CFLAGS   += $(CFLAGS_APPEND)
+ CXXFLAGS += $(CFLAGS_APPEND)
  
  
  SETIEXTRAFLAGS=
@@@ -99,6 -101,8 +101,8 @@@ override_dh_auto_clean
  	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 splitter/Makefile splitter/Makefile.in stamp-h1 tools/Makefile tools/Makefile.in validate/Makefile
  	rm -f sah_config.h
  
+ override_dh_installchangelogs:
+ 	dh_installchangelogs -k checkin_notes
  
  override_dh_install: 
  	cp client/seti_boinc debian/$(PKG)/usr/lib/$(PKG)/setiathome_enhanced
@@@ -107,10 -111,6 +111,10 @@@
  	dh_install
  
  
 +override_dh_strip:
 +	dh_strip --dbg-package=boinc-app-seti-dbg
 +
 +
  origDir ?= .
  
  get-orig-source:
diff --combined sah_config.h
index 6953d7d,6953d7d..d4aa209
--- a/sah_config.h
+++ b/sah_config.h
@@@ -17,7 -17,7 +17,7 @@@
  /* #undef BOINC_APP_GRAPHICS */
  
  /* Define to a string identifying your compiler */
--#define COMPILER_STRING "g++ (GCC) 4.4.1 20090725 (Red Hat 4.4.1-2)"
++#define COMPILER_STRING "g++ (Debian 4.7.0-9) 4.7.0"
  
  /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
     systems. This function is required for `alloca.c' support on those systems.
@@@ -156,7 -156,7 +156,7 @@@
  #define HAVE_ISNANF 1
  
  /* Define to 1 if you have the fftw3f library */
--/* #undef HAVE_LIBFFTW3F */
++#define HAVE_LIBFFTW3F 1
  
  /* Define to 1 if you have the math library */
  #define HAVE_LIBM 1
@@@ -316,7 -316,7 +316,7 @@@
  /* Define to 1 if you have the `strstr' function. */
  #define HAVE_STRSTR 1
  
--/* Define to 1 if `st_blocks' is member of `struct stat'. */
++/* Define to 1 if `st_blocks' is a member of `struct stat'. */
  #define HAVE_STRUCT_STAT_ST_BLOCKS 1
  
  /* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
@@@ -454,11 -454,11 +454,14 @@@
  /* Define to the one symbol short name of this package. */
  #define PACKAGE_TARNAME "setiathome_enhanced"
  
++/* Define to the home page for this package. */
++#define PACKAGE_URL ""
++
  /* Define to the version of this package. */
  #define PACKAGE_VERSION "6.12"
  
  /* Define as directory containing the project config.xml */
--#define PROJECTDIR "/home/boincadm/projects/ap"
++#define PROJECTDIR "~boincadm/projects/ap"
  
  /* Define to the necessary symbol if this constant uses a non-standard name on
     your system. */
@@@ -485,7 -485,7 +488,7 @@@
  #define STDC_HEADERS 1
  
  /* Define to be the subversion revision number */
--#define SVN_REV "Revision: 928"
++#define SVN_REV "$Revision: 316 $"
  
  /* Define to 1 if your <sys/time.h> declares `struct tm'. */
  /* #undef TM_IN_SYS_TIME */
@@@ -503,7 -503,7 +506,7 @@@
  /* #undef USE_FAST_MATH */
  
  /* Define to 1 if informix is installed */
--#define USE_INFORMIX 1
++/* #undef USE_INFORMIX */
  
  /* Define to 1 to use SIMD intrinsics rather than inline assembly */
  #define USE_INTRINSICS 1
@@@ -515,7 -515,7 +518,7 @@@
  /* #undef USE_MMX */
  
  /* Define if MYSQL is installed */
--#define USE_MYSQL 1
++/* #undef USE_MYSQL */
  
  /* "Define to 1 if you want to use the openssl crypto library" */
  #define USE_OPENSSL 1
@@@ -553,6 -553,6 +556,11 @@@
  /* Define to 1 if the X Window System is missing or not being used. */
  /* #undef X_DISPLAY_MISSING */
  
++/* Enable large inode numbers on Mac OS X 10.5.  */
++#ifndef _DARWIN_USE_64_BIT_INODE
++# define _DARWIN_USE_64_BIT_INODE 1
++#endif
++
  /* Number of bits in a file offset, on hosts where this is settable. */
  /* #undef _FILE_OFFSET_BITS */
  

-- 
SETI at home packaging

