r610 - in /trunk/boinc-app-seti/debian: ./ patches/
fst-guest at users.alioth.debian.org
fst-guest at users.alioth.debian.org
Thu Mar 29 10:33:53 CET 2007
Author: fst-guest
Date: Thu Mar 29 09:33:52 2007
New Revision: 610
URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=610
Log:
* Stop the core client before removing the application symlinks. This is
related to #415765.
* Changed from dpatch to quilt.
Added:
trunk/boinc-app-seti/debian/patches/001_build_fixes.patch
trunk/boinc-app-seti/debian/patches/002_disable_static_linkage.patch
trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch
trunk/boinc-app-seti/debian/patches/README.patches
trunk/boinc-app-seti/debian/patches/series
Removed:
trunk/boinc-app-seti/debian/patches/00list
trunk/boinc-app-seti/debian/patches/01_build-fixes.dpatch
trunk/boinc-app-seti/debian/patches/02_disable-static-linkage.dpatch
trunk/boinc-app-seti/debian/patches/03_dont-use-own-jpeglib.dpatch
Modified:
trunk/boinc-app-seti/debian/boinc-app-seti.prerm
trunk/boinc-app-seti/debian/changelog
trunk/boinc-app-seti/debian/control
trunk/boinc-app-seti/debian/rules
Modified: trunk/boinc-app-seti/debian/boinc-app-seti.prerm
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/boinc-app-seti.prerm?rev=610&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/boinc-app-seti.prerm (original)
+++ trunk/boinc-app-seti/debian/boinc-app-seti.prerm Thu Mar 29 09:33:52 2007
@@ -5,8 +5,27 @@
BOINC_DIR=/var/lib/boinc-client
+init_boinc_client()
+{
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d boinc-client $1
+ else
+ /etc/init.d/boinc-client $1
+ fi
+}
+
case "$1" in
- remove|upgrade)
+ remove)
+ # Stop the core client and wait one second to give it the
+ # chance to shut down gracefully before removing the S at h
+ # application. Start the client then again.
+ init_boinc_client stop
+ sleep 1
+ update-boinc-applinks --remove --project=seti --data-dir=$BOINC_DIR
+ init_boinc_client start
+ ;;
+
+ upgrade)
update-boinc-applinks --remove --project=seti --data-dir=$BOINC_DIR
;;
Modified: trunk/boinc-app-seti/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/changelog?rev=610&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/changelog (original)
+++ trunk/boinc-app-seti/debian/changelog Thu Mar 29 09:33:52 2007
@@ -1,13 +1,15 @@
-boinc-app-seti (5.13+cvs20060510-2) UNRELEASED; urgency=low
+boinc-app-seti (5.13+cvs20060510-2) unstable; urgency=low
- * NOT RELEASED YET
- * debian/control.in:
- - Added XS-Vcs-Svn field to the source stanza.
- * debian/copyright:
- - Added copyright information for glut/Roman.stroke and glut/stroke.h
- and added a copyright note about the Debian packaging.
+ * debian/boinc-app-seti-prerm: Stop the BOINC core client before removing
+ the SETI at home symlinks from the data directory to prevent the client from
+ downloading new work units although no application to process these is
+ present. (related to: #415765)
+ * debian/control.in: Added XS-Vcs fields to the source stanza.
+ * debian/copyright: Added copyright information for glut/Roman.stroke and
+ glut/stroke.h and added a copyright note about the Debian packaging.
+ * Changed from dpatch to the quilt patch system.
- -- Frank S. Thomas <frank at thomas-alfeld.de> Sat, 23 Sep 2006 08:02:30 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 29 Mar 2007 10:12:21 +0200
boinc-app-seti (5.13+cvs20060510-1) unstable; urgency=low
Modified: trunk/boinc-app-seti/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/control?rev=610&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/control (original)
+++ trunk/boinc-app-seti/debian/control Thu Mar 29 09:33:52 2007
@@ -4,7 +4,7 @@
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <frank at thomas-alfeld.de>, Christoph Martin <christoph.martin at uni-mainz.de>
Standards-Version: 3.7.2
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, automake1.9 (>= 1.9.3), autoconf (>= 2.59), boinc-dev (>= 5.2.15-1), fftw3-dev
+Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 5), quilt, patchutils (>= 0.2.25), automake1.9 (>= 1.9.3), autoconf (>= 2.59), boinc-dev (>= 5.2.15-1), fftw3-dev
XS-Vcs-Svn: svn://svn.debian.org/pkg-boinc/trunk/boinc-app-seti/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/
Added: trunk/boinc-app-seti/debian/patches/001_build_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/001_build_fixes.patch?rev=610&op=file
==============================================================================
--- trunk/boinc-app-seti/debian/patches/001_build_fixes.patch (added)
+++ trunk/boinc-app-seti/debian/patches/001_build_fixes.patch Thu Mar 29 09:33:52 2007
@@ -1,0 +1,50 @@
+Index: boinc-app-seti-5.13+cvs20060510/client/Makefile.am
+===================================================================
+--- boinc-app-seti-5.13+cvs20060510.orig/client/Makefile.am 2007-03-29 11:05:11.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/client/Makefile.am 2007-03-29 11:05:54.000000000 +0200
+@@ -90,11 +90,11 @@
+ seti_boinc_LDADD = $(CLIENT_LD_ADD)
+ seti_boinc_LINK = $(CXX) -o $@
+
+-if LINUX
++#if LINUX
+ # too much optimization on main.cpp breaks the client for some reason
+-seti_boinc-main.o:
+- if $(CXX) --include ../config.h -DDYNAMIC_GRAPHICS=1 $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-endif
++#seti_boinc-main.o:
++# if $(CXX) --include ../config.h -DDYNAMIC_GRAPHICS=1 $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++#endif
+
+
+ if ENABLE_GUI
+Index: boinc-app-seti-5.13+cvs20060510/db/sqlblob.h
+===================================================================
+--- boinc-app-seti-5.13+cvs20060510.orig/db/sqlblob.h 2007-03-29 11:05:11.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/db/sqlblob.h 2007-03-29 11:05:54.000000000 +0200
+@@ -75,7 +75,7 @@
+ fflush(stderr);
+ #endif
+ }
+- b.mem=new std::vector<T>(xml_decode_string(buf.c_str()+start,end-start,enc_string));
++ b.mem=new std::vector<T>(xml_decode_string<T>(buf.c_str()+start,end-start,enc_string));
+ #ifdef DEBUG_ALLOCATIONS
+ fprintf(stderr,"sqlblob: allocated a vector at 0x%p\n",b.mem);
+ fflush(stderr);
+Index: boinc-app-seti-5.13+cvs20060510/db/xml_util.h
+===================================================================
+--- boinc-app-seti-5.13+cvs20060510.orig/db/xml_util.h 2007-03-29 11:05:11.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/db/xml_util.h 2007-03-29 11:05:54.000000000 +0200
+@@ -220,9 +220,9 @@
+
+ // decode an XML character string. Return a the decoded string in a vector
+ // (null not necessarily a terminator).
+-//template <typename T>
+-//vector<T> xml_decode_string(const char *input, size_t length=0,
+-// const char *encoding="x_xml_entity");
++template <typename T>
++std::vector<T> xml_decode_string(const char *input, size_t length=0,
++ const char *encoding="x_xml_entity");
+
+ // do the same thing, but get the length and encoding type from the
+ // xml tag properties.
Added: trunk/boinc-app-seti/debian/patches/002_disable_static_linkage.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/002_disable_static_linkage.patch?rev=610&op=file
==============================================================================
--- trunk/boinc-app-seti/debian/patches/002_disable_static_linkage.patch (added)
+++ trunk/boinc-app-seti/debian/patches/002_disable_static_linkage.patch Thu Mar 29 09:33:52 2007
@@ -1,0 +1,31 @@
+Index: boinc-app-seti-5.13+cvs20060510/configure.ac
+===================================================================
+--- boinc-app-seti-5.13+cvs20060510.orig/configure.ac 2007-03-29 11:05:09.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/configure.ac 2007-03-29 11:06:02.000000000 +0200
+@@ -156,15 +156,18 @@
+ AC_SYS_LARGEFILE
+ ACX_PTHREAD([AC_DEFINE(HAVE_PTHREAD,1, [Have pthread])])
+
+-STATIC_LIB_LIST="stdc++ gcc gcc_eh gtk* gdk* gmodule gthread glib wx* tiff jpeg
+-png Xi glut socket z fftw3f"
++#STATIC_LIB_LIST="stdc++ gcc gcc_eh gtk* gdk* gmodule gthread glib wx* tiff jpeg
++#png Xi glut socket z fftw3f"
++#
++#case ${target} in
++# *-linux*) STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl ssl crypto"
++# ;;
++# *-solaris*) STATIC_LIB_LIST="${STATIC_LIB_LIST} X* ssl crypto"
++# ;;
++#esac
+
+-case ${target} in
+- *-linux*) STATIC_LIB_LIST="${STATIC_LIB_LIST} nsl ssl crypto"
+- ;;
+- *-solaris*) STATIC_LIB_LIST="${STATIC_LIB_LIST} X* ssl crypto"
+- ;;
+-esac
++# This needs at least one word, so I'm using nolib, which isn't a lib. :-)
++STATIC_LIB_LIST="nolib"
+
+ # Checks for libraries.
+ CHECK_SSL
Added: trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch?rev=610&op=file
==============================================================================
--- trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch (added)
+++ trunk/boinc-app-seti/debian/patches/003_dont_use_own_jpeglib.patch Thu Mar 29 09:33:52 2007
@@ -1,0 +1,33 @@
+Index: boinc-app-seti-5.13+cvs20060510/Makefile.am
+===================================================================
+--- boinc-app-seti-5.13+cvs20060510.orig/Makefile.am 2007-03-29 11:05:04.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/Makefile.am 2007-03-29 11:06:05.000000000 +0200
+@@ -28,7 +28,7 @@
+ endif
+
+
+-SUBDIRS = $(JPEGDIR) $(IMDIR) $(GLUTDIR) $(CLIENT_SUBDIRS) $(SERVER_SUBDIRS)
++SUBDIRS = $(IMDIR) $(GLUTDIR) $(CLIENT_SUBDIRS) $(SERVER_SUBDIRS)
+
+ dist-hook:
+ rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
+Index: boinc-app-seti-5.13+cvs20060510/configure.ac
+===================================================================
+--- boinc-app-seti-5.13+cvs20060510.orig/configure.ac 2007-03-29 11:06:02.000000000 +0200
++++ boinc-app-seti-5.13+cvs20060510/configure.ac 2007-03-29 11:06:05.000000000 +0200
+@@ -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)
+
++AM_CONDITIONAL(USE_MY_LIBJPEG, [false])
+ AM_CONDITIONAL(USE_MY_IMAGELIBS, [false])
+ AM_CONDITIONAL(USE_MY_GLUT, [false])
+ AM_CONDITIONAL(ENABLE_SERVER, [test "${enable_server}" = yes])
+@@ -360,7 +361,6 @@
+ ])
+
+ AC_CONFIG_FILES([Makefile
+- jpeglib/Makefile
+ client/Makefile
+ tools/Makefile
+ db/Makefile
Added: trunk/boinc-app-seti/debian/patches/README.patches
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/README.patches?rev=610&op=file
==============================================================================
--- trunk/boinc-app-seti/debian/patches/README.patches (added)
+++ trunk/boinc-app-seti/debian/patches/README.patches Thu Mar 29 09:33:52 2007
@@ -1,0 +1,9 @@
+0xx patches are Debian-specific build patches, that have not and will not be
+proposed upstream; they don't need to be.
+
+If there are any:
+
+1xx patches have been proposed upstream and accepted; these can safely be
+deleted when updating to a new release.
+
+2xx patches are awaiting the approval of upstream.
Added: trunk/boinc-app-seti/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/series?rev=610&op=file
==============================================================================
--- trunk/boinc-app-seti/debian/patches/series (added)
+++ trunk/boinc-app-seti/debian/patches/series Thu Mar 29 09:33:52 2007
@@ -1,0 +1,3 @@
+001_build_fixes.patch
+002_disable_static_linkage.patch
+003_dont_use_own_jpeglib.patch
Modified: trunk/boinc-app-seti/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/rules?rev=610&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/rules (original)
+++ trunk/boinc-app-seti/debian/rules Thu Mar 29 09:33:52 2007
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
PKG=boinc-app-seti
More information about the pkg-boinc-commits
mailing list