r835 - in /branches/boinc-app-seti/5.13+cvs20060510/debian: README.Debian-source changelog patches/201_missing_header_for_gcc4.3.patch patches/series rules

fst at users.alioth.debian.org fst at users.alioth.debian.org
Wed Jan 23 20:39:26 UTC 2008 

Author: fst
Date: Wed Jan 23 20:39:25 2008
New Revision: 835

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=835
Log:
debian/patches/: Added 201_missing_header_for_gcc4.3.patch in order to
fix a FTBFS with recent GCC 4.3 snapshots. Thanks to Martin Michlmayr
<tbm at cyrius.com> for the bug report. (closes: #462051)

Added:
    branches/boinc-app-seti/5.13+cvs20060510/debian/patches/201_missing_header_for_gcc4.3.patch
Modified:
    branches/boinc-app-seti/5.13+cvs20060510/debian/README.Debian-source
    branches/boinc-app-seti/5.13+cvs20060510/debian/changelog
    branches/boinc-app-seti/5.13+cvs20060510/debian/patches/series
    branches/boinc-app-seti/5.13+cvs20060510/debian/rules

Modified: branches/boinc-app-seti/5.13+cvs20060510/debian/README.Debian-source
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/README.Debian-source?rev=835&op=diff
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/README.Debian-source (original)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/README.Debian-source Wed Jan 23 20:39:25 2008
@@ -2,8 +2,8 @@
 =============================================================
 
 The SETI at home project does not distribute source code releases as tarballs,
-only tarballs of nightly CVS snapshots are available. These can be downloaded
-from this location:
+only tarballs of nightly Subversion snapshots are available. These can be
+downloaded from this location:
 
   http://setiweb.ssl.berkeley.edu/sah/seti_source/nightly/
 
@@ -17,5 +17,10 @@
 
   http://svn.debian.org/wsvn/pkg-boinc/scripts/download-seti?op=file
 
-For exmaple, to download the SETI at home tarball from the 16 May 2006 the
-'download-seti' script is invoked as: $ download-seti 2006-05-16
+For example, to download the SETI at home .orig.tar.gz tarball from the 16th May
+2006 this script is invoked as:
+
+  $ download-seti 2006-05-16
+
+The latest .orig.tar.gz tarball can always be retrieved, using this script,
+by invoking the get-orig-source target of debian/rules.

Modified: branches/boinc-app-seti/5.13+cvs20060510/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/changelog?rev=835&op=diff
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/changelog (original)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/changelog Wed Jan 23 20:39:25 2008
@@ -5,13 +5,19 @@
     nightly tarball.
 
   [ Frank S. Thomas ]
-  * Bumped debhelper compat level from V5 to V6 since this is the current
-    recommended level and raised the build dependency to "debhelper (>= 6)".
   * debian/control.in:
     - Bumped Standards-Version from 3.7.2 to 3.7.3, no changes required.
     - Changed my maintainer address to fst at debian.org.
+  * debian/rules: Remove --disable-dependency-tracking from configure's
+    arguments, because it breaks some handwritten rules in client/Makefile.am
+    which require that $(DEPDIR) exists.
+  * Bumped debhelper compat level from V5 to V6 since this is the current
+    recommended level and raised the build dependency to "debhelper (>= 6)".
+  * debian/patches/: Added 201_missing_header_for_gcc4.3.patch in order to
+    fix a FTBFS with recent GCC 4.3 snapshots. Thanks to Martin Michlmayr
+    <tbm at cyrius.com> for the bug report. (closes: #462051)
 
- -- Frank S. Thomas <fst at debian.org>  Mon, 21 Jan 2008 15:44:01 +0100
+ -- Frank S. Thomas <fst at debian.org>  Wed, 23 Jan 2008 21:27:23 +0100
 
 boinc-app-seti (5.13+cvs20060510-3) unstable; urgency=low
 

Added: branches/boinc-app-seti/5.13+cvs20060510/debian/patches/201_missing_header_for_gcc4.3.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/patches/201_missing_header_for_gcc4.3.patch?rev=835&op=file
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/patches/201_missing_header_for_gcc4.3.patch (added)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/patches/201_missing_header_for_gcc4.3.patch Wed Jan 23 20:39:25 2008
@@ -1,0 +1,12 @@
+Index: b/db/xml_util.h
+===================================================================
+--- a/db/xml_util.h
++++ b/db/xml_util.h
+@@ -68,6 +68,7 @@
+ #include <sstream>
+ #include <vector>
+ #include <algorithm>
++#include <cstring>
+ 
+ #include "error_numbers.h"
+ 

Modified: branches/boinc-app-seti/5.13+cvs20060510/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/patches/series?rev=835&op=diff
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/patches/series (original)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/patches/series Wed Jan 23 20:39:25 2008
@@ -2,3 +2,4 @@
 002_disable_static_linkage.patch
 003_dont_use_own_jpeglib.patch
 004_include_new_str_util.h.patch
+201_missing_header_for_gcc4.3.patch

Modified: branches/boinc-app-seti/5.13+cvs20060510/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/rules?rev=835&op=diff
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/rules (original)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/rules Wed Jan 23 20:39:25 2008
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
 # Uncomment this to compile with gcc-snapshot.
-export  CC=/usr/lib/gcc-snapshot/bin/gcc
-export CXX=/usr/lib/gcc-snapshot/bin/g++
-export CPP=/usr/lib/gcc-snapshot/bin/cpp
+#export  CC=/usr/lib/gcc-snapshot/bin/gcc
+#export CXX=/usr/lib/gcc-snapshot/bin/g++
+#export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
 # Remember to comment this before tagging for a release.
 #DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes
@@ -15,6 +15,13 @@
 PKG = boinc-app-seti
 
 DEB_CONFIGURE_SCRIPT_ENV += BOINCDIR="/usr/share/boinc-dev"
+
+# Remove --disable-dependency-tracking from configure's arguments,
+# because it breaks some handwritten rules in client/Makefile.am which
+# require that $(DEPDIR) exists.
+DEB_CONFIGURE_NORMAL_ARGS := \
+  $(DEB_CONFIGURE_NORMAL_ARGS:--disable-dependency-tracking=)
+
 DEB_CONFIGURE_EXTRA_FLAGS := \
   --enable-client \
   --disable-graphics \
@@ -25,7 +32,7 @@
 DEB_MAKE_CLEAN_TARGET = clean
 
 UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f 1 -d '+')
-APP_INFO_VERSION = $(shell echo $(UPSTREAM_VERSION) | sed -e 's/\.//g')
+APP_INFO_VERSION = $(subst .,,$(UPSTREAM_VERSION))
 
 post-patches::
 	aclocal-1.9 -I m4 && autoheader && automake-1.9 && autoconf

More information about the pkg-boinc-commits mailing list