[SCM] SETI at home packaging branch, master, updated. debian/6.12_svn1306-2-14-g1612c6d
Steffen Moeller
steffen_moeller at gmx.de
Mon Aug 20 13:29:14 UTC 2012
The following commit has been merged in the master branch:
commit 1612c6dcb5c435f24b59bf024ee640daecb94954
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Mon Aug 20 15:21:28 2012 +0200
Preparation for PowerPC compatibilty
Also set of DMUA flag, removal of Fernando.
diff --git a/debian/changelog b/debian/changelog
index 4ac416f..998d4f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,24 @@
-boinc-app-seti (6.12~svn1385-2) UNRELEASED; urgency=low
+boinc-app-seti (6.12~svn1385-2) unstable; urgency=low
+
+ [Guo Yixuan]
* debian/patches/004_disable_altivec_on_ppc_linux.patch: Disable use of
altivec on PPC in the case of LINUX. Fixes FTBFS, thanks to Ben Collins
<bcollins at ubuntu.com>.
+ [Steffen Moeller]
+
+ * Removed Fernando from uploaders.
+ * SETI DMUA flag for Guo Yixuan.
+
-- Guo Yixuan <culu.gyx at gmail.com> Sun, 19 Aug 2012 14:56:37 +0800
boinc-app-seti (6.12~svn1385-1) unstable; urgency=low
* New upstream version.
+ * Reduced warnings during compilation.
- -- Steffen Moeller <moeller at debian.org> Wed, 15 Aug 2012 14:35:44 +0200
+ -- Steffen Moeller <moeller at debian.org> Sat, 18 Aug 2012 19:49:53 +0200
boinc-app-seti (6.12~svn1306-3) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index c29f380..c087f09 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
Priority: extra
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
Uploaders: Steffen Moeller <moeller at debian.org>,
- Fernando C. Estrada <fcestrada at fcestrada.com>,
Guo Yixuan <culu.gyx at gmail.com>
+DM-Upload-Allowed: yes
Standards-Version: 3.9.3
Build-Depends: debhelper (>= 7.0.50~), automake1.9 (>= 1.9.3),
autoconf (>= 2.59),
diff --git a/debian/patches/const_warning_reduction.patch b/debian/patches/const_warning_reduction.patch
new file mode 100644
index 0000000..2f05cbe
--- /dev/null
+++ b/debian/patches/const_warning_reduction.patch
@@ -0,0 +1,55 @@
+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
+@@ -105,7 +105,7 @@
+ }
+
+ void print_error(int e) {
+- char* p;
++ const char* p;
+
+ 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
+@@ -211,8 +211,8 @@
+ return 0;
+ }
+
+-char* error_string(int e) {
+- char* p;
++const char* error_string(int e) {
++ const char* p;
+ 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
+@@ -150,6 +150,6 @@
+ float float_element[], unsigned char char_element[],
+ long num_elements, float scale_factor
+ );
+-extern char* error_string(int);
++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
+@@ -63,8 +63,8 @@
+
+ // Write a SETI work unit header to a file
+
+-char *receivers[]={"invalid","synthetic","ao1420"};
+-char *datatypes[]={"invalid","ascii","encoded","sun_binary"};
++const char *const receivers[]={"invalid","synthetic","ao1420"};
++const char *const datatypes[]={"invalid","ascii","encoded","sun_binary"};
+
+ SETI_WU_INFO::SETI_WU_INFO(const workunit &w) :
+ track_mem<SETI_WU_INFO>("SETI_WU_INFO"),
diff --git a/debian/patches/series b/debian/patches/series
index c8e29ad..d922c46 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@
212_increase_buffers.patch
omitting_archs.patch
004_disable_altivec_on_ppc_linux.patch
+const_warning_reduction.patch
+worker_comments.patch
diff --git a/debian/patches/worker_comments.patch b/debian/patches/worker_comments.patch
new file mode 100644
index 0000000..5e49cf4
--- /dev/null
+++ b/debian/patches/worker_comments.patch
@@ -0,0 +1,43 @@
+Index: boinc-app-seti/client/worker.cpp
+===================================================================
+--- boinc-app-seti.orig/client/worker.cpp 2012-08-18 19:52:00.485071823 +0200
++++ boinc-app-seti/client/worker.cpp 2012-08-18 19:52:13.000000000 +0200
+@@ -114,7 +114,7 @@
+ fclose(f);
+ if (retval) SETIERROR(retval,"from seti_parse_wu() in read_wu_state()");
+ } else {
+- char msg[1024];
++ char msg[MAXPATHLEN+50];
+ sprintf(msg,"(%s) in read_wu_state() errno=%d\n",path.c_str(),errno);
+ SETIERROR(FOPEN_FAILED,msg);
+ }
+@@ -144,16 +144,21 @@
+ __asm__ __volatile__ ("andl $-16, %esp");
+ #endif
+ try {
++ fprintf(stderr,"I: worker() - common_init\n");
+ retval = common_init();
+ if (retval) SETIERROR(retval,"from common_init() in worker()");
+
++ fprintf(stderr,"I: worker() - read_wu_state\n");
+ retval = read_wu_state();
+ if (retval) SETIERROR(retval,"from read_wu_state() in worker()");
+
++ fprintf(stderr,"I: worker() - seti_do_work\n");
+ retval = seti_do_work();
+ if (retval) SETIERROR(retval,"from seti_do_work() in worker()");
+
++ fprintf(stderr,"I: worker() - boinc_fpops_cumulative\n");
+ boinc_fpops_cumulative((SETUP_FLOPS+analysis_state.FLOP_counter)*LOAD_STORE_ADJUSTMENT);
++ fprintf(stderr,"I: worker() - boinc_finish\n");
+ boinc_finish(retval);
+ }
+ catch (seti_error e) {
+@@ -169,6 +174,7 @@
+ boinc_finish(0);
+ exit(0); // an overflow is not an app error
+ } else {
++ fprintf(stderr,"E: printing backtrace\n");
+ e.print();
+ exit(static_cast<int>(e));
+ }
--
SETI at home packaging
More information about the pkg-boinc-commits
mailing list