r746 - in /trunk/boinc-app-seti/debian: changelog patches/005_disable_rule_for_main.cpp.patch patches/series

[fst-guest at users.alioth.debian.org]

Author: fst-guest
Date: Sat Nov 17 17:14:15 2007
New Revision: 746

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=746
Log:
Added 005_disable_rule_for_main.cpp.patch which comments out the Linux 
specific rule for seti_boinc-main.o in client/Makefile.am. This rule
breaks building boinc-app-seti with cdbs.

Added:
    trunk/boinc-app-seti/debian/patches/005_disable_rule_for_main.cpp.patch
Modified:
    trunk/boinc-app-seti/debian/changelog
    trunk/boinc-app-seti/debian/patches/series

Modified: trunk/boinc-app-seti/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/changelog?rev=746&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/changelog (original)
+++ trunk/boinc-app-seti/debian/changelog Sat Nov 17 17:14:15 2007
@@ -1,11 +1,18 @@
-boinc-app-seti (5.28+cvs20071114-1) UNRELEASED; urgency=low
+boinc-app-seti (5.28+cvs20071114-1) unstable; urgency=low
 
   * NOT RELEASED YET
 
   * boinc-app-seti: wrote debian/rules get-orig-source target (Steffen
     Moeller)
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Fri, 16 Nov 2007 23:32:41 +0100
+  [ Frank S. Thomas ]
+  * debian/patches/:
+    - Updated 003_dont_use_own_jpeglib.patch for the new release.
+    - Added 005_disable_rule_for_main.cpp.patch which comments out the Linux
+      specific rule for seti_boinc-main.o in client/Makefile.am. This rule
+      breaks building boinc-app-seti with cdbs.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat, 17 Nov 2007 17:59:33 +0100
 
 boinc-app-seti (5.13+cvs20060510-3) unstable; urgency=low
 

Added: trunk/boinc-app-seti/debian/patches/005_disable_rule_for_main.cpp.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/005_disable_rule_for_main.cpp.patch?rev=746&op=file
==============================================================================
--- trunk/boinc-app-seti/debian/patches/005_disable_rule_for_main.cpp.patch (added)
+++ trunk/boinc-app-seti/debian/patches/005_disable_rule_for_main.cpp.patch Sat Nov 17 17:14:15 2007
@@ -1,0 +1,21 @@
+Index: boinc-app-seti-5.28+cvs20071114/client/Makefile.am
+===================================================================
+--- boinc-app-seti-5.28+cvs20071114.orig/client/Makefile.am
++++ boinc-app-seti-5.28+cvs20071114/client/Makefile.am
+@@ -186,11 +186,11 @@
+ endif
+ 
+ 
+-if LINUX
+-# too much optimization on main.cpp breaks the client for some reason
+-seti_boinc-main.o: main.cpp
+-	if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -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 LINUX
++## too much optimization on main.cpp breaks the client for some reason
++#seti_boinc-main.o: main.cpp
++#	if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -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

Modified: trunk/boinc-app-seti/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/series?rev=746&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/patches/series (original)
+++ trunk/boinc-app-seti/debian/patches/series Sat Nov 17 17:14:15 2007
@@ -2,3 +2,4 @@
 #002_disable_static_linkage.patch
 003_dont_use_own_jpeglib.patch
 #004_include_new_str_util.h.patch
+005_disable_rule_for_main.cpp.patch