[boinc-app-seti] 02/02: Update for new experimental release
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Thu Jan 21 09:45:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch experimental
in repository boinc-app-seti.
commit 5dbb75a738db4039dffe82aadca69df77763e83d
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Thu Jan 21 10:45:23 2016 +0100
Update for new experimental release
---
debian/boinc-app-seti-graphics.install | 2 +-
debian/boinc-app-seti.install | 2 +-
debian/changelog | 6 ++++++
debian/extra-graphics/app_info.xml.in | 10 +++++-----
debian/extra/app_info.xml.in | 10 +++++-----
debian/extra/seti.cfg | 2 +-
debian/patches/001_disable_avx_in_configure.patch | 2 +-
debian/patches/003_dont_use_own_jpeglib_and_glut.patch | 10 ++++++----
debian/patches/004_disable_altivec_on_ppc_linux.patch | 4 ++--
debian/patches/006_omitting_archs.patch | 11 +----------
debian/patches/210_fix_fgets_warning.patch | 8 ++++----
debian/patches/211_give_stderr_some_output.patch | 10 +++++-----
debian/patches/213_const_warning_reduction.patch | 4 ++--
debian/rules | 4 ++--
14 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/debian/boinc-app-seti-graphics.install b/debian/boinc-app-seti-graphics.install
index 4bb58e9..eb49885 100644
--- a/debian/boinc-app-seti-graphics.install
+++ b/debian/boinc-app-seti-graphics.install
@@ -1,4 +1,4 @@
debian/extra-graphics/app_info.xml usr/share/boinc-app-seti-graphics
debian/extra-graphics/seti-graphics.cfg usr/share/boinc-apps/info
graphics/client/setiathome_graphics usr/lib/boinc-app-seti-graphics
-graphics/client/setiathome_v7 usr/lib/boinc-app-seti-graphics
+graphics/client/setiathome_v8 usr/lib/boinc-app-seti-graphics
diff --git a/debian/boinc-app-seti.install b/debian/boinc-app-seti.install
index 1ddee3d..ffe12a7 100644
--- a/debian/boinc-app-seti.install
+++ b/debian/boinc-app-seti.install
@@ -1,3 +1,3 @@
debian/extra/app_info.xml usr/share/boinc-app-seti
debian/extra/seti.cfg usr/share/boinc-apps/info
-nographics/client/setiathome_v7 usr/lib/boinc-app-seti/
+nographics/client/setiathome_v8 usr/lib/boinc-app-seti/
diff --git a/debian/changelog b/debian/changelog
index d8cf3e9..a9d55e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc-app-seti (8.00~svn3352-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 21 Jan 2016 10:01:38 +0100
+
boinc-app-seti (7.28~svn3106-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/extra-graphics/app_info.xml.in b/debian/extra-graphics/app_info.xml.in
index b5ea5f6..ab2c17c 100644
--- a/debian/extra-graphics/app_info.xml.in
+++ b/debian/extra-graphics/app_info.xml.in
@@ -1,9 +1,9 @@
<app_info>
<app>
- <name>setiathome_v7</name>
+ <name>setiathome_v8</name>
</app>
<file_info>
- <name>setiathome_v7</name>
+ <name>setiathome_v8</name>
<executable/>
</file_info>
<file_info>
@@ -11,10 +11,10 @@
<executable/>
</file_info>
<app_version>
- <app_name>setiathome_v7</app_name>
+ <app_name>setiathome_v8</app_name>
<version_num>VERSION</version_num>
<file_ref>
- <file_name>setiathome_v7</file_name>
+ <file_name>setiathome_v8</file_name>
<main_program/>
</file_ref>
<file_ref>
@@ -22,4 +22,4 @@
<open_name>graphics_app</open_name>
</file_ref>
</app_version>
-</app_info>
\ No newline at end of file
+</app_info>
diff --git a/debian/extra/app_info.xml.in b/debian/extra/app_info.xml.in
index 435fced..faed06c 100644
--- a/debian/extra/app_info.xml.in
+++ b/debian/extra/app_info.xml.in
@@ -1,17 +1,17 @@
<app_info>
<app>
- <name>setiathome_v7</name>
+ <name>setiathome_v8</name>
</app>
<file_info>
- <name>setiathome_v7</name>
+ <name>setiathome_v8</name>
<executable/>
</file_info>
<app_version>
- <app_name>setiathome_v7</app_name>
+ <app_name>setiathome_v8</app_name>
<version_num>VERSION</version_num>
<file_ref>
- <file_name>setiathome_v7</file_name>
+ <file_name>setiathome_v8</file_name>
<main_program/>
</file_ref>
</app_version>
-</app_info>
\ No newline at end of file
+</app_info>
diff --git a/debian/extra/seti.cfg b/debian/extra/seti.cfg
index 244afa0..986e480 100644
--- a/debian/extra/seti.cfg
+++ b/debian/extra/seti.cfg
@@ -1,7 +1,7 @@
[DEFAULT]
project = seti
app_info = /usr/share/boinc-app-seti/app_info.xml
-apps = /usr/lib/boinc-app-seti/setiathome_v7
+apps = /usr/lib/boinc-app-seti/setiathome_v8
urls = setiathome.berkeley.edu
setiathome.ssl.berkeley.edu
setiweb.ssl.berkeley.edu
diff --git a/debian/patches/001_disable_avx_in_configure.patch b/debian/patches/001_disable_avx_in_configure.patch
index 15e08d1..bcf9761 100644
--- a/debian/patches/001_disable_avx_in_configure.patch
+++ b/debian/patches/001_disable_avx_in_configure.patch
@@ -12,7 +12,7 @@ Description: disable avx in build.
],[
--- a/configure.ac
+++ b/configure.ac
-@@ -524,7 +524,8 @@
+@@ -562,7 +562,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/003_dont_use_own_jpeglib_and_glut.patch b/debian/patches/003_dont_use_own_jpeglib_and_glut.patch
index 4fa9532..09165fc 100644
--- a/debian/patches/003_dont_use_own_jpeglib_and_glut.patch
+++ b/debian/patches/003_dont_use_own_jpeglib_and_glut.patch
@@ -12,7 +12,7 @@ Description: use the system available jpeg lib.
rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
--- a/configure.ac
+++ b/configure.ac
-@@ -527,6 +527,7 @@
+@@ -565,6 +565,7 @@
#SAH_AVX
have_avx=no
@@ -20,11 +20,13 @@ Description: use the system available jpeg lib.
AM_CONDITIONAL(USE_MY_IMAGELIBS, [false])
AM_CONDITIONAL(USE_MY_GLUT, [false])
AM_CONDITIONAL(ENABLE_TESTS, [test "${enable_tests}" = yes])
-@@ -630,7 +631,6 @@
- ])
+@@ -670,9 +671,7 @@
+ AC_SUBST([CLIENT_EXTRA_LIBS])
AC_CONFIG_FILES([Makefile
+- glut/Makefile
+ image_libs/Makefile
- jpeglib/Makefile
client/Makefile
- tools/Makefile
+ tools/Makefile
db/Makefile
diff --git a/debian/patches/004_disable_altivec_on_ppc_linux.patch b/debian/patches/004_disable_altivec_on_ppc_linux.patch
index 60e61c2..34f5511 100644
--- a/debian/patches/004_disable_altivec_on_ppc_linux.patch
+++ b/debian/patches/004_disable_altivec_on_ppc_linux.patch
@@ -4,7 +4,7 @@ Author: Ben Collins <bcollins at ubuntu.com>
--- a/client/Makefile.am
+++ b/client/Makefile.am
-@@ -198,7 +198,8 @@
+@@ -199,7 +199,8 @@
endif
if PPC
@@ -14,7 +14,7 @@ Author: Ben Collins <bcollins at ubuntu.com>
seti_boinc-analyzeFuncs_altivec.o: vector/analyzeFuncs_altivec.cpp
if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \
-@@ -212,6 +213,7 @@
+@@ -213,6 +214,7 @@
-c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
endif
diff --git a/debian/patches/006_omitting_archs.patch b/debian/patches/006_omitting_archs.patch
index 5be81ea..09707ba 100644
--- a/debian/patches/006_omitting_archs.patch
+++ b/debian/patches/006_omitting_archs.patch
@@ -1,19 +1,10 @@
Description: omit "march" flag, to ensure more compatibility.
--- 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
- if test x_$ac_cv_c_compiler_gnu = x_yes ; then
-- CFLAGS="-march=prescott -msse3 -mfpmath=sse ${CFLAGS}"
-+ CFLAGS="-msse3 -mfpmath=sse ${CFLAGS}"
- fi
- fi
-
@@ -28,9 +28,6 @@
# put compiler specific flags here
if test x_$ac_cv_c_compiler_gnu = x_yes ; then
- CFLAGS="-msse2 -mfpmath=sse ${CFLAGS}"
+ CFLAGS="-msse2 ${CFLAGS}"
- if test -z "echo $CFLAGS | grep march=" ; then
- CFLAGS="-march=pentium4 ${CFLAGS}"
- fi
diff --git a/debian/patches/210_fix_fgets_warning.patch b/debian/patches/210_fix_fgets_warning.patch
index b410f86..ed00a23 100644
--- a/debian/patches/210_fix_fgets_warning.patch
+++ b/debian/patches/210_fix_fgets_warning.patch
@@ -1,7 +1,7 @@
Description: Fix some warnings on fgets.
--- a/client/seti_header.cpp
+++ b/client/seti_header.cpp
-@@ -191,8 +191,9 @@
+@@ -195,8 +195,9 @@
static workunit *wu;
int seti_parse_wu_header(FILE* f) {
@@ -12,7 +12,7 @@ Description: Fix some warnings on fgets.
#ifdef USE_MANUAL_CALLSTACK
call_stack.enter("seti_parse_wu_header(FILE *)");
#endif /* USE_MANUAL_CALLSTACK */
-@@ -207,13 +208,14 @@
+@@ -211,13 +212,14 @@
//swi.fft_len=2048;
//swi.ifft_len=8;
@@ -30,7 +30,7 @@ Description: Fix some warnings on fgets.
buffer+=buf;
}
buffer+=buf;
-@@ -237,8 +239,9 @@
+@@ -241,8 +243,9 @@
#ifdef USE_MANUAL_CALLSTACK
call_stack.enter("seti_parse_wu_header(FILE *, SETI_WU_INFO &)");
#endif /* USE_MANUAL_CALLSTACK */
@@ -41,7 +41,7 @@ Description: Fix some warnings on fgets.
std::string buffer("");
buffer.reserve(10*1024);
-@@ -249,13 +252,14 @@
+@@ -253,13 +256,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 3a06ad2..8fded9c 100644
--- a/debian/patches/211_give_stderr_some_output.patch
+++ b/debian/patches/211_give_stderr_some_output.patch
@@ -1,7 +1,7 @@
Description: add some output useful for debugging.
--- a/client/main.cpp
+++ b/client/main.cpp
-@@ -177,7 +177,7 @@
+@@ -179,7 +179,7 @@
extern APP_INIT_DATA app_init_data;
@@ -10,7 +10,7 @@ Description: add some output useful for debugging.
int retval = 0, i;
FORCE_FRAME_POINTER;
#ifdef USE_MANUAL_CALLSTACK
-@@ -202,7 +202,10 @@
+@@ -204,7 +204,10 @@
bool standalone = false;
g_argv[0]=argv[0];
@@ -21,15 +21,15 @@ Description: add some output useful for debugging.
g_argv[i]=argv[i];
char *p=argv[i];
while (*p=='-') p++;
-@@ -239,6 +242,7 @@
+@@ -245,6 +248,7 @@
#ifdef USE_MANUAL_CALLSTACK
- if (verbose) call_stack.set_verbose(true);
+ if (verbose>1) call_stack.set_verbose(true);
#endif /* USE_MANUAL_CALLSTACK */
+ fprintf(stderr,"--end.\n");
try {
-@@ -271,16 +275,22 @@
+@@ -277,16 +281,22 @@
// Initialize BOINC
//
diff --git a/debian/patches/213_const_warning_reduction.patch b/debian/patches/213_const_warning_reduction.patch
index 9253a56..54dfe3e 100644
--- a/debian/patches/213_const_warning_reduction.patch
+++ b/debian/patches/213_const_warning_reduction.patch
@@ -1,7 +1,7 @@
Description: Reduce missing const build warnings.
--- a/client/main.cpp
+++ b/client/main.cpp
-@@ -111,7 +111,7 @@
+@@ -113,7 +113,7 @@
}
void print_error(int e) {
@@ -12,7 +12,7 @@ Description: Reduce missing const build warnings.
#endif /* USE_MANUAL_CALLSTACK */
--- a/client/s_util.cpp
+++ b/client/s_util.cpp
-@@ -245,11 +245,11 @@
+@@ -283,11 +283,11 @@
return 0;
}
diff --git a/debian/rules b/debian/rules
index 320be7a..a7fc21a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,8 +143,8 @@ override_dh_auto_clean:
rm -f boinc_finish_called result.sah state.sah stderr.txt stderrgfx.txt wisdom.sah work_unit.sah boinc_lockfile project_specific_defines.h boinc_setiathome_*
override_dh_install:
- cp -f nographics/client/seti_boinc nographics/client/setiathome_v7
- cp -f graphics/client/seti_boinc graphics/client/setiathome_v7
+ cp -f nographics/client/seti_boinc nographics/client/setiathome_v8
+ cp -f graphics/client/seti_boinc graphics/client/setiathome_v8
cp -f graphics/client/seti_graphics graphics/client/setiathome_graphics
cat debian/extra/app_info.xml.in | perl -ne 'print unless /^#/' | \
sed -e 's/VERSION/$(APP_INFO_VERSION)/' > debian/extra/app_info.xml
--
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