[boinc-app-seti] 02/03: New upstream release, patch refresh
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Mon Apr 14 08:00:14 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc-app-seti.
commit ea0c6ad6ba5f1e16c333faf7aa84e0677131637f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Apr 14 00:10:47 2014 +0200
New upstream release, patch refresh
---
debian/changelog | 6 +++
.../003_dont_use_own_jpeglib_and_glut.patch | 4 +-
debian/patches/007_worker_comments.patch | 12 ++---
debian/patches/210_fix_fgets_warning.patch | 20 ++++----
debian/patches/211_give_stderr_some_output.patch | 16 +++---
debian/patches/212_increase_buffers.patch | 10 ++--
debian/patches/213_const_warning_reduction.patch | 15 +++---
debian/patches/addressing-autosetup-warnings.patch | 58 ----------------------
debian/patches/disable_avx_in_configure.patch | 2 +-
debian/patches/series | 6 +--
10 files changed, 49 insertions(+), 100 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 44de696..040ca12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc-app-seti (7.28~svn2203-1) unstable; urgency=medium
+
+ * New upstream release, patch refresh.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Mon, 14 Apr 2014 00:10:11 +0200
+
boinc-app-seti (7.19~svn2051-2) unstable; urgency=medium
* Upload to unstable.
diff --git a/debian/patches/003_dont_use_own_jpeglib_and_glut.patch b/debian/patches/003_dont_use_own_jpeglib_and_glut.patch
index 027b137..8d4542d 100644
--- a/debian/patches/003_dont_use_own_jpeglib_and_glut.patch
+++ b/debian/patches/003_dont_use_own_jpeglib_and_glut.patch
@@ -16,7 +16,7 @@ will be linked against libjpeg. If the package should be configured with
rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
--- a/configure.ac
+++ b/configure.ac
-@@ -424,6 +424,7 @@
+@@ -526,6 +526,7 @@
#SAH_AVX
have_avx=no
@@ -24,7 +24,7 @@ will be linked against libjpeg. If the package should be configured with
AM_CONDITIONAL(USE_MY_IMAGELIBS, [false])
AM_CONDITIONAL(USE_MY_GLUT, [false])
AM_CONDITIONAL(ENABLE_TESTS, [test "${enable_tests}" = yes])
-@@ -527,7 +528,6 @@
+@@ -629,7 +630,6 @@
])
AC_CONFIG_FILES([Makefile
diff --git a/debian/patches/007_worker_comments.patch b/debian/patches/007_worker_comments.patch
index 69e7f46..05f059a 100644
--- a/debian/patches/007_worker_comments.patch
+++ b/debian/patches/007_worker_comments.patch
@@ -1,6 +1,6 @@
--- a/client/worker.cpp
+++ b/client/worker.cpp
-@@ -118,7 +118,7 @@
+@@ -130,7 +130,7 @@
fclose(f);
if (retval) SETIERROR(retval,"from seti_parse_wu() in read_wu_state()");
} else {
@@ -9,7 +9,7 @@
sprintf(msg,"(%s) in read_wu_state() errno=%d\n",path.c_str(),errno);
SETIERROR(FOPEN_FAILED,msg);
}
-@@ -154,15 +154,19 @@
+@@ -174,15 +174,19 @@
#endif
try {
@@ -29,11 +29,11 @@
boinc_finish(retval);
}
catch (seti_error e) {
-@@ -177,6 +181,7 @@
- boinc_finish(0);
+@@ -200,6 +204,7 @@
+ #endif
exit(0); // an overflow is not an app error
} else {
+ fprintf(stderr,"E: printing backtrace\n");
e.print();
- exit(static_cast<int>(e));
- }
+ #ifdef USE_MANUAL_CALLSTACK
+ call_stack.exit();
diff --git a/debian/patches/210_fix_fgets_warning.patch b/debian/patches/210_fix_fgets_warning.patch
index ff4ba13..3a09a46 100644
--- a/debian/patches/210_fix_fgets_warning.patch
+++ b/debian/patches/210_fix_fgets_warning.patch
@@ -1,6 +1,6 @@
--- a/client/seti_header.cpp
+++ b/client/seti_header.cpp
-@@ -173,8 +173,9 @@
+@@ -191,8 +191,9 @@
static workunit *wu;
int seti_parse_wu_header(FILE* f) {
@@ -8,10 +8,10 @@
+ char buf[2560];
int found=0;
+ buf[0]=0;
-
- std::string buffer("");
- buffer.reserve(10*1024);
-@@ -186,13 +187,14 @@
+ #ifdef USE_MANUAL_CALLSTACK
+ call_stack.enter("seti_parse_wu_header(FILE *)");
+ #endif /* USE_MANUAL_CALLSTACK */
+@@ -207,13 +208,14 @@
//swi.fft_len=2048;
//swi.ifft_len=8;
@@ -29,10 +29,10 @@
buffer+=buf;
}
buffer+=buf;
-@@ -210,8 +212,9 @@
- }
-
- int seti_parse_wu_header(FILE* f, SETI_WU_INFO &swi) {
+@@ -237,8 +239,9 @@
+ #ifdef USE_MANUAL_CALLSTACK
+ call_stack.enter("seti_parse_wu_header(FILE *, SETI_WU_INFO &)");
+ #endif /* USE_MANUAL_CALLSTACK */
- char buf[256];
+ char buf[2560];
int found=0;
@@ -40,7 +40,7 @@
std::string buffer("");
buffer.reserve(10*1024);
-@@ -222,13 +225,14 @@
+@@ -249,13 +252,14 @@
//swi.fft_len=2048;
//swi.ifft_len=8;
diff --git a/debian/patches/211_give_stderr_some_output.patch b/debian/patches/211_give_stderr_some_output.patch
index 7bfe922..ad74bdb 100644
--- a/debian/patches/211_give_stderr_some_output.patch
+++ b/debian/patches/211_give_stderr_some_output.patch
@@ -1,6 +1,6 @@
--- a/client/main.cpp
+++ b/client/main.cpp
-@@ -160,7 +160,7 @@
+@@ -177,7 +177,7 @@
extern APP_INIT_DATA app_init_data;
@@ -8,8 +8,8 @@
+int main(int argc, char* argv[]) {
int retval = 0, i;
FORCE_FRAME_POINTER;
- run_stage=PREGRX;
-@@ -179,7 +179,10 @@
+ #ifdef USE_MANUAL_CALLSTACK
+@@ -202,7 +202,10 @@
bool standalone = false;
g_argv[0]=argv[0];
@@ -20,15 +20,15 @@
g_argv[i]=argv[i];
char *p=argv[i];
while (*p=='-') p++;
-@@ -207,6 +210,7 @@
- exit(1);
- }
- }
+@@ -239,6 +242,7 @@
+ #ifdef USE_MANUAL_CALLSTACK
+ if (verbose) call_stack.set_verbose(true);
+ #endif /* USE_MANUAL_CALLSTACK */
+ fprintf(stderr,"--end.\n");
try {
-@@ -239,16 +243,22 @@
+@@ -271,16 +275,22 @@
// Initialize BOINC
//
diff --git a/debian/patches/212_increase_buffers.patch b/debian/patches/212_increase_buffers.patch
index f9a5a71..b3028a7 100644
--- a/debian/patches/212_increase_buffers.patch
+++ b/debian/patches/212_increase_buffers.patch
@@ -1,6 +1,6 @@
--- a/client/seti.cpp
+++ b/client/seti.cpp
-@@ -951,10 +951,11 @@
+@@ -1024,10 +1024,11 @@
unsigned long nbytes, nsamples,samples_per_byte;
sah_complex *data;
unsigned long i;
@@ -10,10 +10,10 @@
int retval=0;
FORCE_FRAME_POINTER;
+ buf[0]=0;
-
- nsamples = swi.nsamples;
- samples_per_byte=(8/swi.bits_per_sample);
-@@ -966,7 +967,7 @@
+ #ifdef USE_MANUAL_CALLSTACK
+ call_stack.enter("seti_parse_data()");
+ #endif
+@@ -1042,7 +1043,7 @@
switch(swi.data_type) {
case DATA_ASCII:
for (i=0; i<nsamples; i++) {
diff --git a/debian/patches/213_const_warning_reduction.patch b/debian/patches/213_const_warning_reduction.patch
index a3e774e..163d54f 100644
--- a/debian/patches/213_const_warning_reduction.patch
+++ b/debian/patches/213_const_warning_reduction.patch
@@ -1,23 +1,26 @@
--- a/client/main.cpp
+++ b/client/main.cpp
-@@ -105,7 +105,7 @@
+@@ -111,7 +111,7 @@
}
void print_error(int e) {
- char* p;
+ const char* p;
-
- p = error_string(e);
- fprintf(stderr,"%s\n",p);
+ #ifdef USE_MANUAL_CALLSTACK
+ call_stack.enter("print_error()");
+ #endif /* USE_MANUAL_CALLSTACK */
--- a/client/s_util.cpp
+++ b/client/s_util.cpp
-@@ -211,8 +211,8 @@
+@@ -245,11 +245,11 @@
return 0;
}
-char* error_string(int e) {
-- char* p;
+const char* error_string(int e) {
+ #ifdef USE_MANUAL_CALLSTACK
+ call_stack.enter("error_string()");
+ #endif
+- char* p;
+ const char* p;
static char buf[256];
diff --git a/debian/patches/addressing-autosetup-warnings.patch b/debian/patches/addressing-autosetup-warnings.patch
deleted file mode 100644
index ab33728..0000000
--- a/debian/patches/addressing-autosetup-warnings.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Addressing some autosetup warnings
-
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-
---- a/splitter_fft/Makefile.am
-+++ b/splitter_fft/Makefile.am
-@@ -1,11 +1,9 @@
--CC=gcc
- BOINCDIR=@BOINCDIR@
- INFORMIXDIR=@INFORMIXDIR@
- SETILIB_PATH=@SETILIB_PATH@
- SETILIB_LIBS=@SETILIB_LIBS@
- SETIHOME=..
-
--LINKOPTIONS=
-
-
-
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -2,9 +2,6 @@
-
- include $(top_srcdir)/Makefile.incl
-
--LDFLAGS=
--AM_LDFLAGS=
--
- BOINC_LIBS = -L$(BOINCDIR)/api -lboinc_api -L$(BOINCDIR)/lib -lboinc
-
- CLIENT_C_FLAGS = $(CFLAGS) \
---- a/splitter_pfb/Makefile.am
-+++ b/splitter_pfb/Makefile.am
-@@ -1,12 +1,9 @@
--CC=gcc
- BOINCDIR=@BOINCDIR@
- INFORMIXDIR=@INFORMIXDIR@
- SETILIB_PATH=@SETILIB_PATH@
- SETILIB_LIBS=@SETILIB_LIBS@
- SETIHOME=..
-
--LINKOPTIONS=
--
- GSL_LIBS = -lgsl -lgslcblas -lgsl
-
- DBLIBS=@INFORMIX_LIBS@ -lm -lstdc++
---- a/assimilator/Makefile.am
-+++ b/assimilator/Makefile.am
-@@ -1,8 +1,8 @@
- ## $Id: Makefile.am,v 1.2.2.6 2007/08/09 23:37:34 jeffc Exp $
- include $(top_srcdir)/Makefile.incl
-
--AM_CFLAGS = @CFLAGS@ @DEFS@ -DTEXT_UI -DNDEBUG @PTHREAD_CFLAGS@
--AM_CXXFLAGS = $(AM_CFLAGS)
-+AM_CFLAGS += @CFLAGS@ @DEFS@ -DTEXT_UI -DNDEBUG @PTHREAD_CFLAGS@
-+AM_CXXFLAGS += $(AM_CFLAGS)
-
- AM_LDFLAGS += -Xlinker -R -Xlinker $(INFORMIXDIR)/lib:$(INFORMIXDIR)/lib/esql:$(LD_LIBRARY_PATH) @LDFLAGS@ -static
-
diff --git a/debian/patches/disable_avx_in_configure.patch b/debian/patches/disable_avx_in_configure.patch
index b048879..ff92d0c 100644
--- a/debian/patches/disable_avx_in_configure.patch
+++ b/debian/patches/disable_avx_in_configure.patch
@@ -11,7 +11,7 @@
],[
--- a/configure.ac
+++ b/configure.ac
-@@ -421,7 +421,8 @@
+@@ -523,7 +523,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)
diff --git a/debian/patches/series b/debian/patches/series
index d8806e0..9fa3fec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,5 @@ disable_avx_in_configure.patch
#005_powerpc_altivec.patch
006_omitting_archs.patch
007_worker_comments.patch
-#addressing-autosetup-warnings.patch
-fix-ftbfs-arm64.patch
-fix-armel.patch
-fix-armhf.patch
+#fix-armel.patch
+#fix-armhf.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc-app-seti.git
More information about the pkg-boinc-commits
mailing list