[SCM] SETI at home packaging branch, debian/topic/5.13+cvs20060510, updated. upstream/5.13+cvs20060510-11-gccb3390

Frank S. Thomas fst at debian.org
Sun Feb 8 10:49:43 UTC 2009 

The following commit has been merged in the debian/topic/5.13+cvs20060510 branch:
commit ccb3390b706a6830748fcc6d28fac5d206ab88fc
Author: Frank S. Thomas <fst at debian.org>
Date:   Sun Feb 8 11:48:16 2009 +0100

    Added patch to fix FTBFS with GCC 4.4.
    
    debian/patches/:
    - Added 102_fix_typo_for_gcc4.4.patch to fix a FTBFS with GCC 4.4. Thanks
      to Martin Michlmayr <tbm at cyrius.com> for the bug report and the patch.
      (closes: #505012)
    - Added missing descriptions to some patch files to appease Lintian.

diff --git a/debian/changelog b/debian/changelog
index 901d1ac..1287fe5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-boinc-app-seti (5.13+cvs20060510-5) UNRELEASED; urgency=low
+boinc-app-seti (5.13+cvs20060510-5) unstable; urgency=low
 
-  * NOT RELEASED YET
+  [ Frank S. Thomas ]
   * Use debhelper V7 instead of CDBS to minimize debian/rules.
   * debian/control:
     - Fix spelling error in long description. (closes: #501205)
@@ -13,8 +13,13 @@ boinc-app-seti (5.13+cvs20060510-5) UNRELEASED; urgency=low
   * Added a dummy debian/watch file that explains why upstream tarballs cannot
     be meaningfully monitored to fix Lintian's debian-watch-file-is-missing
     informational tag.
+  * debian/patches/:
+    - Added 102_fix_typo_for_gcc4.4.patch to fix a FTBFS with GCC 4.4. Thanks
+      to Martin Michlmayr <tbm at cyrius.com> for the bug report and the patch.
+      (closes: #505012)
+    - Added missing descriptions to some patch files to appease Lintian.
 
- -- Frank S. Thomas <fst at debian.org>  Thu, 31 Jan 2008 15:13:46 +0100
+ -- Frank S. Thomas <fst at debian.org>  Sun, 08 Feb 2009 11:47:26 +0100
 
 boinc-app-seti (5.13+cvs20060510-4) unstable; urgency=low
 
diff --git a/debian/patches/001_build_fixes.patch b/debian/patches/001_build_fixes.patch
index 1e9be5c..50e6f6c 100644
--- a/debian/patches/001_build_fixes.patch
+++ b/debian/patches/001_build_fixes.patch
@@ -1,3 +1,5 @@
+Author: Frank S. Thomas <fst at debian.org>
+Description: Miscellaneous fixes to prevent FTBFS errors.
 Index: boinc-app-seti-5.13+cvs20060510/client/Makefile.am
 ===================================================================
 --- boinc-app-seti-5.13+cvs20060510.orig/client/Makefile.am	2007-03-29 11:05:11.000000000 +0200
diff --git a/debian/patches/002_disable_static_linkage.patch b/debian/patches/002_disable_static_linkage.patch
index b814d3a..6b41f9e 100644
--- a/debian/patches/002_disable_static_linkage.patch
+++ b/debian/patches/002_disable_static_linkage.patch
@@ -1,3 +1,5 @@
+Author: Frank S. Thomas <fst at debian.org>
+Description: Do not link libraries statically.
 Index: boinc-app-seti-5.13+cvs20060510/configure.ac
 ===================================================================
 --- boinc-app-seti-5.13+cvs20060510.orig/configure.ac	2007-03-29 11:05:09.000000000 +0200
diff --git a/debian/patches/003_dont_use_own_jpeglib.patch b/debian/patches/003_dont_use_own_jpeglib.patch
index 0e93921..2b0b3dc 100644
--- a/debian/patches/003_dont_use_own_jpeglib.patch
+++ b/debian/patches/003_dont_use_own_jpeglib.patch
@@ -1,7 +1,7 @@
-The commented SAH_CHECK_JPEGLIB in configure.ac prevents that setiathome
-will be linked against libjpeg. If the package should be configured with
-"--enable-graphics" this needs to be uncommented.
-
+Author: Frank S. Thomas <fst at debian.org>
+Description: The commented SAH_CHECK_JPEGLIB in configure.ac prevents that
+ setiathome will be linked against libjpeg. If the package should be
+ configured with "--enable-graphics" this needs to be uncommented.
 Index: boinc-app-seti-5.13+cvs20060510/Makefile.am
 ===================================================================
 --- boinc-app-seti-5.13+cvs20060510.orig/Makefile.am	2005-10-26 20:23:03.000000000 +0200
diff --git a/debian/patches/004_include_new_str_util.h.patch b/debian/patches/004_include_new_str_util.h.patch
index b11e954..9efdf0b 100644
--- a/debian/patches/004_include_new_str_util.h.patch
+++ b/debian/patches/004_include_new_str_util.h.patch
@@ -1,9 +1,9 @@
-In BOINC 5.10 the functions strlcpy() and strlcat() that were previously
-declared in lib/util.h have been moved to the new lib/str_util.h header.
-Therefore we need to include this header in the following source files.
-Note that boinc-dev (>= 5.10.8-1) is needed to build boinc-app-seti with
-this patch applied.
-
+Author: Frank S. Thomas <fst at debian.org>
+Description: In BOINC 5.10 the functions strlcpy() and strlcat() that were
+ previously declared in lib/util.h have been moved to the new lib/str_util.h
+ header. Therefore we need to include this header in the following source
+ files. Note that boinc-dev (>= 5.10.8) is needed to build boinc-app-seti
+ with this patch applied.
 Index: boinc-app-seti-5.13+cvs20060510/client/timecvt.cpp
 ===================================================================
 --- boinc-app-seti-5.13+cvs20060510.orig/client/timecvt.cpp	2006-01-12 02:51:17.000000000 +0100
diff --git a/debian/patches/101_missing_header_for_gcc4.3.patch b/debian/patches/101_missing_header_for_gcc4.3.patch
index b731971..eabe702 100644
--- a/debian/patches/101_missing_header_for_gcc4.3.patch
+++ b/debian/patches/101_missing_header_for_gcc4.3.patch
@@ -1,3 +1,6 @@
+Author: Frank S. Thomas <fst at debian.org>
+Description: Add missing #include to fix FTBFS with GCC 4.3.
+Bug: #462051
 Index: b/db/xml_util.h
 ===================================================================
 --- a/db/xml_util.h
diff --git a/debian/patches/102_fix_typo_for_gcc4.4.patch b/debian/patches/102_fix_typo_for_gcc4.4.patch
new file mode 100644
index 0000000..2b73b24
--- /dev/null
+++ b/debian/patches/102_fix_typo_for_gcc4.4.patch
@@ -0,0 +1,16 @@
+Author: Martin Michlmayr <tbm at cyrius.com>
+Description: Fix typo that causes FTBFS with GCC 4.4.
+Bug: #505012
+Index: b/client/seti.h
+===================================================================
+--- a/client/seti.h
++++ b/client/seti.h
+@@ -97,7 +97,7 @@
+ #define UINT8_FMT_CAST(x) static_cast<double>(x)
+ #endif
+ 
+-#elif define(HAVE_LONG_DOUBLE)
++#elif defined(HAVE_LONG_DOUBLE)
+ typedef long double sh_sint8_t;
+ typedef long double sh_uint8_t;
+ #define SINT8_FMT "%20.0lf"
diff --git a/debian/patches/series b/debian/patches/series
index 5b93bc4..4eabf87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@
 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
+101_missing_header_for_gcc4.3.patch
+102_fix_typo_for_gcc4.4.patch

-- 
SETI at home packaging

More information about the pkg-boinc-commits mailing list