[SCM] SETI at home packaging branch, master, updated. debian/5.13+cvs20060510-4-47-gb249688

[Fernando C. Estrada]

The following commit has been merged in the master branch:
commit b249688c3d8d5af3fe3bc3c52e3c3da6f2291af0
Author: Fernando C. Estrada <fcestrada at fcestrada.com>
Date:   Tue Mar 23 21:05:09 2010 -0600

    Refresh 003_dont_use_own_jpeglib patch

diff --git a/debian/patches/003_dont_use_own_jpeglib.patch b/debian/patches/003_dont_use_own_jpeglib.patch
index 7603b74..2ae3fb6 100644
--- a/debian/patches/003_dont_use_own_jpeglib.patch
+++ b/debian/patches/003_dont_use_own_jpeglib.patch
@@ -1,11 +1,12 @@
+
 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.28+cvs20071114/Makefile.am
 ===================================================================
---- boinc-app-seti-5.28+cvs20071114.orig/Makefile.am
-+++ boinc-app-seti-5.28+cvs20071114/Makefile.am
+--- boinc-app-seti.orig/Makefile.am	2010-03-19 21:37:58.986875878 -0600
++++ boinc-app-seti/Makefile.am	2010-03-19 21:40:56.229893425 -0600
 @@ -28,7 +28,7 @@
  endif
  
@@ -15,20 +16,20 @@ Index: boinc-app-seti-5.28+cvs20071114/Makefile.am
  
  dist-hook:
  	rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
-Index: boinc-app-seti-5.28+cvs20071114/configure.ac
+Index: boinc-app-seti/configure.ac
 ===================================================================
---- boinc-app-seti-5.28+cvs20071114.orig/configure.ac
-+++ boinc-app-seti-5.28+cvs20071114/configure.ac
-@@ -204,7 +204,7 @@
-     AC_DEFINE([HAVE_LIBGCC_S],[1],[Define to 1 if you have the gcc_s library]))
- SAH_CHECK_LIB([stdc++],[sscanf],
-     AC_DEFINE([HAVE_LIBSTDC__],[1],[Define to 1 if you have the stdc++ library]))
--SAH_CHECK_JPEGLIB
-+#SAH_CHECK_JPEGLIB
+--- boinc-app-seti.orig/configure.ac	2010-03-19 21:41:39.886847723 -0600
++++ boinc-app-seti/configure.ac	2010-03-19 21:44:37.270927186 -0600
+@@ -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_LIB([socket], [bind], 
-@@ -361,6 +361,7 @@
+-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)
  
@@ -36,7 +37,7 @@ Index: boinc-app-seti-5.28+cvs20071114/configure.ac
  AM_CONDITIONAL(USE_MY_IMAGELIBS, [false])
  AM_CONDITIONAL(USE_MY_GLUT, [false])
  AM_CONDITIONAL(ENABLE_SERVER, [test "${enable_server}" = yes])
-@@ -413,7 +414,6 @@
+@@ -360,7 +361,6 @@
  ])
  
  AC_CONFIG_FILES([Makefile

-- 
SETI at home packaging