r687 - in /trunk/boinc-app-seti/debian: changelog control control.in patches/004_include_new_str_util.h.patch patches/series

fst-guest at users.alioth.debian.org fst-guest at users.alioth.debian.org
Wed Jul 18 21:13:27 UTC 2007


Author: fst-guest
Date: Wed Jul 18 21:13:27 2007
New Revision: 687

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=687
Log:
debian/patches/004_include_new_str_util.h.patch: Added. The strlcpy() and
strlcat() functions that were previously declared in boinc-dev/lib/util.h
have been moved in BOINC 5.10 to the new boinc-dev/lib/str_util.h header
file, so we need to include this new header in some files. Bumped build
dependency to "boinc-dev (>= 5.10.8-1)" accordingly.

Added:
    trunk/boinc-app-seti/debian/patches/004_include_new_str_util.h.patch
Modified:
    trunk/boinc-app-seti/debian/changelog
    trunk/boinc-app-seti/debian/control
    trunk/boinc-app-seti/debian/control.in
    trunk/boinc-app-seti/debian/patches/series

Modified: trunk/boinc-app-seti/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/changelog?rev=687&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/changelog (original)
+++ trunk/boinc-app-seti/debian/changelog Wed Jul 18 21:13:27 2007
@@ -12,8 +12,13 @@
   * debian/copyright: Added copyright information for glut/Roman.stroke and
     glut/stroke.h and added a copyright note about the Debian packaging.
   * Changed from dpatch to the quilt patch system.
+  * debian/patches/004_include_new_str_util.h.patch: Added. The strlcpy() and
+    strlcat() functions that were previously declared in boinc-dev/lib/util.h
+    have been moved in BOINC 5.10 to the new boinc-dev/lib/str_util.h header
+    file, so we need to include this new header in some files. Bumped build
+    dependency to "boinc-dev (>= 5.10.8-1)" accordingly.
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Sun, 01 Jul 2007 01:09:45 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 18 Jul 2007 22:38:44 +0200
 
 boinc-app-seti (5.13+cvs20060510-1) unstable; urgency=low
 

Modified: trunk/boinc-app-seti/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/control?rev=687&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/control (original)
+++ trunk/boinc-app-seti/debian/control Wed Jul 18 21:13:27 2007
@@ -4,7 +4,7 @@
 Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <frank at thomas-alfeld.de>, Christoph Martin <christoph.martin at uni-mainz.de>
 Standards-Version: 3.7.2
-Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 5), quilt, patchutils (>= 0.2.25), automake1.9 (>= 1.9.3), autoconf (>= 2.59), boinc-dev (>= 5.2.15-1), fftw3-dev
+Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 5), quilt, patchutils (>= 0.2.25), automake1.9 (>= 1.9.3), autoconf (>= 2.59), boinc-dev (>= 5.10.8-1), fftw3-dev
 XS-Vcs-Svn: svn://svn.debian.org/pkg-boinc/trunk/boinc-app-seti/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/
 

Modified: trunk/boinc-app-seti/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/control.in?rev=687&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/control.in (original)
+++ trunk/boinc-app-seti/debian/control.in Wed Jul 18 21:13:27 2007
@@ -4,7 +4,7 @@
 Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <frank at thomas-alfeld.de>, Christoph Martin <christoph.martin at uni-mainz.de>
 Standards-Version: 3.7.2
-Build-Depends: @cdbs@, automake1.9 (>= 1.9.3), autoconf (>= 2.59), boinc-dev (>= 5.2.15-1), fftw3-dev
+Build-Depends: @cdbs@, automake1.9 (>= 1.9.3), autoconf (>= 2.59), boinc-dev (>= 5.10.8-1), fftw3-dev
 XS-Vcs-Svn: svn://svn.debian.org/pkg-boinc/trunk/boinc-app-seti/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/
 

Added: trunk/boinc-app-seti/debian/patches/004_include_new_str_util.h.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/004_include_new_str_util.h.patch?rev=687&op=file
==============================================================================
--- trunk/boinc-app-seti/debian/patches/004_include_new_str_util.h.patch (added)
+++ trunk/boinc-app-seti/debian/patches/004_include_new_str_util.h.patch Wed Jul 18 21:13:27 2007
@@ -1,0 +1,30 @@
+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.
+
+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
++++ boinc-app-seti-5.13+cvs20060510/client/timecvt.cpp	2007-07-18 20:41:56.000000000 +0200
+@@ -49,6 +49,7 @@
+ 
+ #include "util.h"
+ #include "s_util.h"
++#include "str_util.h"
+ #include "timecvt.h"
+ 
+ void timecvt_start() {}
+Index: boinc-app-seti-5.13+cvs20060510/db/xml_util.cpp
+===================================================================
+--- boinc-app-seti-5.13+cvs20060510.orig/db/xml_util.cpp	2006-05-04 23:45:46.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/db/xml_util.cpp	2007-07-18 20:42:25.000000000 +0200
+@@ -88,6 +88,7 @@
+ #include <cstdio>
+ 
+ #include "std_fixes.h"
++#include "str_util.h"
+ #include "util.h"
+ #include "xml_util.h"
+ 

Modified: trunk/boinc-app-seti/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/series?rev=687&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/patches/series (original)
+++ trunk/boinc-app-seti/debian/patches/series Wed Jul 18 21:13:27 2007
@@ -1,3 +1,4 @@
 001_build_fixes.patch
 002_disable_static_linkage.patch
 003_dont_use_own_jpeglib.patch
+004_include_new_str_util.h.patch




More information about the pkg-boinc-commits mailing list