[SCM] SETI at home packaging branch, master, updated. debian/6.97_svn1409-1-31-g0067839

Gianfranco Costamagna costamagnagianfranco at yahoo.it
Mon Dec 24 11:09:37 UTC 2012 

The following commit has been merged in the master branch:
commit 006783971bcc3d576ae7aa4726f85b6bcc0578ce
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Dec 24 12:09:22 2012 +0100

    general patch refresh

diff --git a/debian/patches/003_dont_use_own_jpeglib.patch b/debian/patches/003_dont_use_own_jpeglib.patch
index 86fd30b..7b1dc27 100644
--- a/debian/patches/003_dont_use_own_jpeglib.patch
+++ b/debian/patches/003_dont_use_own_jpeglib.patch
@@ -3,10 +3,8 @@ 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/Makefile.am
-===================================================================
---- boinc-app-seti.orig/Makefile.am	2012-08-30 11:16:30.436114900 +0800
-+++ boinc-app-seti/Makefile.am	2012-08-30 11:24:16.796133060 +0800
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -27,7 +27,7 @@
  endif
  
@@ -16,19 +14,17 @@ Index: boinc-app-seti/Makefile.am
  
  dist-hook:
  	rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
-Index: boinc-app-seti/configure.ac
-===================================================================
---- boinc-app-seti.orig/configure.ac	2012-08-30 11:17:17.416116730 +0800
-+++ boinc-app-seti/configure.ac	2012-08-30 11:24:16.796133060 +0800
-@@ -420,6 +420,7 @@
- 
- SAH_AVX
+--- a/configure.ac
++++ b/configure.ac
+@@ -421,6 +421,7 @@
+ #SAH_AVX
+ have_avx=no
  
 +AM_CONDITIONAL(USE_MY_LIBJPEG, [false])
  AM_CONDITIONAL(USE_MY_IMAGELIBS, [false])
  AM_CONDITIONAL(USE_MY_GLUT, [false])
  AM_CONDITIONAL(ENABLE_TESTS, [test "${enable_tests}" = yes])
-@@ -484,7 +485,6 @@
+@@ -485,7 +486,6 @@
  ])
  
  AC_CONFIG_FILES([Makefile
diff --git a/debian/patches/004_disable_altivec_on_ppc_linux.patch b/debian/patches/004_disable_altivec_on_ppc_linux.patch
index 7f2ac9f..32087e9 100644
--- a/debian/patches/004_disable_altivec_on_ppc_linux.patch
+++ b/debian/patches/004_disable_altivec_on_ppc_linux.patch
@@ -2,10 +2,8 @@ Description: Disable altivec on PPC if !LINUX
  Taken from Ubuntu's 6.12~svn1305-2ubuntu1, at Tue, 12 Jun 2012 22:28:38 -0400.
 Author: Ben Collins <bcollins at ubuntu.com>
 
-Index: boinc-app-seti/client/Makefile.am
-===================================================================
---- boinc-app-seti.orig/client/Makefile.am	2012-08-28 11:10:30.540414584 +0800
-+++ boinc-app-seti/client/Makefile.am	2012-08-28 11:20:56.320438950 +0800
+--- a/client/Makefile.am
++++ b/client/Makefile.am
 @@ -195,7 +195,8 @@
  endif
  
diff --git a/debian/patches/006_omitting_archs.patch b/debian/patches/006_omitting_archs.patch
index 31b1fbc..06738d6 100644
--- a/debian/patches/006_omitting_archs.patch
+++ b/debian/patches/006_omitting_archs.patch
@@ -1,7 +1,5 @@
-Index: boinc-app-seti/m4/optimizations.m4
-===================================================================
---- boinc-app-seti.orig/m4/optimizations.m4	2012-08-12 11:22:39.746042577 +0200
-+++ boinc-app-seti/m4/optimizations.m4	2012-08-15 14:17:23.807993057 +0200
+--- a/m4/optimizations.m4
++++ b/m4/optimizations.m4
 @@ -13,7 +13,7 @@
      [Define to 1 if you want to use SSE3 optimizations])
  # put compiler specific flags here
diff --git a/debian/patches/007_worker_comments.patch b/debian/patches/007_worker_comments.patch
index e57ca67..ec6ee28 100644
--- a/debian/patches/007_worker_comments.patch
+++ b/debian/patches/007_worker_comments.patch
@@ -1,7 +1,5 @@
-Index: boinc-app-seti/client/worker.cpp
-===================================================================
---- boinc-app-seti.orig/client/worker.cpp	2012-08-28 11:10:30.000000000 +0800
-+++ boinc-app-seti/client/worker.cpp	2012-08-28 11:25:05.888448668 +0800
+--- a/client/worker.cpp
++++ b/client/worker.cpp
 @@ -114,7 +114,7 @@
          fclose(f);
          if (retval) SETIERROR(retval,"from seti_parse_wu() in read_wu_state()");
diff --git a/debian/patches/101_freebsd_build.patch b/debian/patches/101_freebsd_build.patch
index 5fbbbf6..47f93be 100644
--- a/debian/patches/101_freebsd_build.patch
+++ b/debian/patches/101_freebsd_build.patch
@@ -1,7 +1,5 @@
-Index: boinc-app-seti/client/vector/analyzeFuncs_sse.cpp
-===================================================================
---- boinc-app-seti.orig/client/vector/analyzeFuncs_sse.cpp	2012-08-28 11:10:30.000000000 +0800
-+++ boinc-app-seti/client/vector/analyzeFuncs_sse.cpp	2012-08-28 11:17:21.156430572 +0800
+--- a/client/vector/analyzeFuncs_sse.cpp
++++ b/client/vector/analyzeFuncs_sse.cpp
 @@ -32,6 +32,7 @@
  // This file is empty is __i386__ is not defined
  #include "sah_config.h"
diff --git a/debian/patches/210_fix_fgets_warning.patch b/debian/patches/210_fix_fgets_warning.patch
index 058fc7a..13f61cd 100644
--- a/debian/patches/210_fix_fgets_warning.patch
+++ b/debian/patches/210_fix_fgets_warning.patch
@@ -1,7 +1,5 @@
-Index: boinc-app-seti/client/seti_header.cpp
-===================================================================
---- boinc-app-seti.orig/client/seti_header.cpp	2012-08-12 11:22:38.866054523 +0200
-+++ boinc-app-seti/client/seti_header.cpp	2012-08-12 11:45:01.923825804 +0200
+--- a/client/seti_header.cpp
++++ b/client/seti_header.cpp
 @@ -170,8 +170,9 @@
  static workunit *wu;
  
diff --git a/debian/patches/211_give_stderr_some_output.patch b/debian/patches/211_give_stderr_some_output.patch
index e55759d..3a9e4fd 100644
--- a/debian/patches/211_give_stderr_some_output.patch
+++ b/debian/patches/211_give_stderr_some_output.patch
@@ -1,7 +1,5 @@
-Index: boinc-app-seti/client/main.cpp
-===================================================================
---- boinc-app-seti.orig/client/main.cpp	2012-08-12 11:22:38.806055337 +0200
-+++ boinc-app-seti/client/main.cpp	2012-08-12 14:26:58.348202488 +0200
+--- a/client/main.cpp
++++ b/client/main.cpp
 @@ -160,7 +160,7 @@
  
  extern APP_INIT_DATA app_init_data;
diff --git a/debian/patches/212_increase_buffers.patch b/debian/patches/212_increase_buffers.patch
index db880b3..c8aad10 100644
--- a/debian/patches/212_increase_buffers.patch
+++ b/debian/patches/212_increase_buffers.patch
@@ -1,7 +1,5 @@
-Index: boinc-app-seti/client/seti.cpp
-===================================================================
---- boinc-app-seti.orig/client/seti.cpp	2012-08-28 11:10:30.000000000 +0800
-+++ boinc-app-seti/client/seti.cpp	2012-08-28 11:20:31.904438000 +0800
+--- a/client/seti.cpp
++++ b/client/seti.cpp
 @@ -844,10 +844,11 @@
    unsigned long nbytes, nsamples,samples_per_byte;
    sah_complex *data;
@@ -24,10 +22,8 @@ Index: boinc-app-seti/client/seti.cpp
          if (!p) {
            SETIERROR(READ_FAILED,"in seti_parse_data");
          }
-Index: boinc-app-seti/tools/workunit_resample.cpp
-===================================================================
---- boinc-app-seti.orig/tools/workunit_resample.cpp	2012-08-24 13:34:04.000000000 +0800
-+++ boinc-app-seti/tools/workunit_resample.cpp	2012-08-28 11:20:31.904438000 +0800
+--- a/tools/workunit_resample.cpp
++++ b/tools/workunit_resample.cpp
 @@ -62,7 +62,7 @@
  workunit_header header;
  
diff --git a/debian/patches/213_const_warning_reduction.patch b/debian/patches/213_const_warning_reduction.patch
index 2f05cbe..e1ffe6d 100644
--- a/debian/patches/213_const_warning_reduction.patch
+++ b/debian/patches/213_const_warning_reduction.patch
@@ -1,7 +1,5 @@
-Index: boinc-app-seti/client/main.cpp
-===================================================================
---- boinc-app-seti.orig/client/main.cpp	2012-08-15 14:36:17.964705315 +0200
-+++ boinc-app-seti/client/main.cpp	2012-08-15 23:36:18.529901259 +0200
+--- a/client/main.cpp
++++ b/client/main.cpp
 @@ -105,7 +105,7 @@
  }
  
@@ -11,10 +9,8 @@ Index: boinc-app-seti/client/main.cpp
  
    p = error_string(e);
    fprintf(stderr,"%s\n",p);
-Index: boinc-app-seti/client/s_util.cpp
-===================================================================
---- boinc-app-seti.orig/client/s_util.cpp	2012-08-12 11:22:38.826055066 +0200
-+++ boinc-app-seti/client/s_util.cpp	2012-08-15 23:35:17.086787513 +0200
+--- a/client/s_util.cpp
++++ b/client/s_util.cpp
 @@ -211,8 +211,8 @@
    return 0;
  }
@@ -26,10 +22,8 @@ Index: boinc-app-seti/client/s_util.cpp
    static char buf[256];
  
    switch(e) {
-Index: boinc-app-seti/client/s_util.h
-===================================================================
---- boinc-app-seti.orig/client/s_util.h	2012-08-15 23:18:15.760862431 +0200
-+++ boinc-app-seti/client/s_util.h	2012-08-15 23:35:55.886227805 +0200
+--- a/client/s_util.h
++++ b/client/s_util.h
 @@ -150,6 +150,6 @@
      float float_element[], unsigned char char_element[],
      long num_elements, float scale_factor
@@ -38,10 +32,8 @@ Index: boinc-app-seti/client/s_util.h
 +extern const char* error_string(int);
  
  #endif
-Index: boinc-app-seti/client/seti_header.cpp
-===================================================================
---- boinc-app-seti.orig/client/seti_header.cpp	2012-08-15 14:36:18.344700191 +0200
-+++ boinc-app-seti/client/seti_header.cpp	2012-08-15 23:37:53.128537837 +0200
+--- a/client/seti_header.cpp
++++ b/client/seti_header.cpp
 @@ -63,8 +63,8 @@
  
  // Write a SETI work unit header to a file
diff --git a/debian/patches/disable_avx_in_configure.patch b/debian/patches/disable_avx_in_configure.patch
index 83a407d..24e22bc 100644
--- a/debian/patches/disable_avx_in_configure.patch
+++ b/debian/patches/disable_avx_in_configure.patch
@@ -1,7 +1,5 @@
-Index: boinc-app-seti/m4/sah_avx.m4
-===================================================================
---- boinc-app-seti.orig/m4/sah_avx.m4
-+++ boinc-app-seti/m4/sah_avx.m4
+--- a/m4/sah_avx.m4
++++ b/m4/sah_avx.m4
 @@ -2,7 +2,7 @@
    AC_LANG_PUSH(C)
    AC_MSG_CHECKING([if compiler supports -mavx])
@@ -11,10 +9,8 @@ Index: boinc-app-seti/m4/sah_avx.m4
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],[
    have_avx=yes
    ],[
-Index: boinc-app-seti/configure.ac
-===================================================================
---- boinc-app-seti.orig/configure.ac
-+++ boinc-app-seti/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -418,7 +418,8 @@
  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)

-- 
SETI at home packaging

More information about the pkg-boinc-commits mailing list