r688 - in /trunk/boinc-app-seti/debian: changelog patches/003_dont_use_own_jpeglib.patch patches/004_include_new_str_util.h.patch

fst-guest at users.alioth.debian.org fst-guest at users.alioth.debian.org
Thu Jul 19 12:26:15 UTC 2007


Author: fst-guest
Date: Thu Jul 19 12:26:14 2007
New Revision: 688

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=688
Log:
* Prevent that setiathome is linked against libjpeg.
* Close FTBFS bug in changelog.

Modified:
    trunk/boinc-app-seti/debian/changelog
    trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch
    trunk/boinc-app-seti/debian/patches/004_include_new_str_util.h.patch

Modified: trunk/boinc-app-seti/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/changelog?rev=688&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/changelog (original)
+++ trunk/boinc-app-seti/debian/changelog Thu Jul 19 12:26:14 2007
@@ -12,13 +12,18 @@
   * 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.
+  * 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. (closes: #433737)
+    - 003_dont_use_own_jpeglib.patch modified to prevent that setiathome is
+      linked against libjpeg. This ensures predictability of the dependecy
+      list, see http://lists.debian.org/debian-devel/2007/07/msg00588.html for
+      details.
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 18 Jul 2007 22:38:44 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Thu, 19 Jul 2007 14:21:27 +0200
 
 boinc-app-seti (5.13+cvs20060510-1) unstable; urgency=low
 

Modified: trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch?rev=688&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch (original)
+++ trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch Thu Jul 19 12:26:14 2007
@@ -1,7 +1,11 @@
+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	2007-03-29 11:05:04.000000000 +0200
-+++ boinc-app-seti-5.13+cvs20060510/Makefile.am	2007-03-29 11:06:05.000000000 +0200
+--- boinc-app-seti-5.13+cvs20060510.orig/Makefile.am	2005-10-26 20:23:03.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/Makefile.am	2007-07-19 14:10:04.000000000 +0200
 @@ -28,7 +28,7 @@
  endif
  
@@ -13,8 +17,17 @@
  	rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
 Index: boinc-app-seti-5.13+cvs20060510/configure.ac
 ===================================================================
---- boinc-app-seti-5.13+cvs20060510.orig/configure.ac	2007-03-29 11:06:02.000000000 +0200
-+++ boinc-app-seti-5.13+cvs20060510/configure.ac	2007-03-29 11:06:05.000000000 +0200
+--- boinc-app-seti-5.13+cvs20060510.orig/configure.ac	2007-07-19 14:10:04.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/configure.ac	2007-07-19 14:10:41.000000000 +0200
+@@ -195,7 +195,7 @@
+     AC_DEFINE([HAVE_LIBSOCKET],[1],[Define to 1 if you have the socket library]))
+ SAH_CHECK_LIB([z], [uncompress], 
+     AC_DEFINE([HAVE_LIBZ],[1],[Define to 1 if you have the z library]))
+-SAH_CHECK_JPEGLIB
++#SAH_CHECK_JPEGLIB
+ SAH_CHECK_LIB([stdc++],[sscanf],
+     AC_DEFINE([HAVE_LIBSTDC__],[1],[Define to 1 if you have the stdc++ library]))
+ SAH_CHECK_LIB([gcc_eh],[_Unwind_Resume], 
 @@ -315,6 +315,7 @@
  AH_TEMPLATE([HAVE_STD_TRANSFORM],[Define to 1 if transform is in namespace std::])
  SAH_FUNCS_IN_NAMESPACE([['min(0,0)'] ['max(0,0)'] ['transform((char *)0,(char *)0,(char *)0,(int(*)(int))malloc)']],std)

Modified: 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=688&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/patches/004_include_new_str_util.h.patch (original)
+++ trunk/boinc-app-seti/debian/patches/004_include_new_str_util.h.patch Thu Jul 19 12:26:14 2007
@@ -7,7 +7,7 @@
 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
++++ boinc-app-seti-5.13+cvs20060510/client/timecvt.cpp	2007-07-19 08:40:24.000000000 +0200
 @@ -49,6 +49,7 @@
  
  #include "util.h"
@@ -19,7 +19,7 @@
 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
++++ boinc-app-seti-5.13+cvs20060510/db/xml_util.cpp	2007-07-19 08:40:24.000000000 +0200
 @@ -88,6 +88,7 @@
  #include <cstdio>
  
@@ -28,3 +28,15 @@
  #include "util.h"
  #include "xml_util.h"
  
+Index: boinc-app-seti-5.13+cvs20060510/client/sah_gfx.cpp
+===================================================================
+--- boinc-app-seti-5.13+cvs20060510.orig/client/sah_gfx.cpp	2007-07-19 08:45:13.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/client/sah_gfx.cpp	2007-07-19 08:45:52.000000000 +0200
+@@ -122,6 +122,7 @@
+ #endif
+ 
+ #include "util.h"
++#include "str_util.h"
+ #include "boinc_api.h"
+ #include "graphics_api.h"
+ #ifdef DYNAMIC_GRAPHICS




More information about the pkg-boinc-commits mailing list