[SCM] BOINC packaging branch, more-ldadd, updated. debian/7.0.27+dfsg-3-41-gb405e1c

[Guo Yixuan]

The following commit has been merged in the more-ldadd branch:
commit b405e1cc76b9e16a82c9cfc2d3e7e5a1b2eb9084
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Thu Jul 5 20:50:22 2012 +0800

    resolve patch conflict

diff --git a/debian/patches/more-ldadd.patch b/debian/patches/more-ldadd.patch
index ccfbc99..ad99b1e 100644
--- a/debian/patches/more-ldadd.patch
+++ b/debian/patches/more-ldadd.patch
@@ -1,9 +1,7 @@
 Description: Add more -L../lib/.libs, to build successfully
- Note that I removed -static from tools/Makefile.am and vda/Makefile.am.
  boincmgr, boincscr and programs in tools/ installs to boinc-manager,
  (boinc-screensaver), boinc-server-maker, so they need to depend on libboinc.
  (Programs in vda/ is not installed)
- If -static for sched/ is removed, make will fail, so I didn't remove it.
 Author: Guo Yixuan <culu.gyx at gmail.com>
 Index: boinc/sched/Makefile.am
 ===================================================================
@@ -31,32 +29,6 @@ Index: boinc/apps/Makefile.am
  exampledir = $(libexecdir)/examples
  example_PROGRAMS = upper_case concat 1sec
  
-Index: boinc/tools/Makefile.am
-===================================================================
---- boinc.orig/tools/Makefile.am	2012-05-21 22:37:24.000000000 +0800
-+++ boinc/tools/Makefile.am	2012-05-31 10:25:38.000000000 +0800
-@@ -24,7 +24,7 @@
- 		run_in_ops
- 
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
--AM_LDFLAGS += -static
-+AM_LDFLAGS += -L../lib/.libs -L../sched/.libs
- 
- cancel_jobs_SOURCES = cancel_jobs.cpp
- cancel_jobs_LDADD = $(SERVERLIBS)
-Index: boinc/vda/Makefile.am
-===================================================================
---- boinc.orig/vda/Makefile.am	2012-05-21 22:37:24.000000000 +0800
-+++ boinc/vda/Makefile.am	2012-05-31 10:29:41.000000000 +0800
-@@ -3,7 +3,7 @@
- bin_PROGRAMS = vda vdad ssim
- 
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
--AM_LDFLAGS += -static
-+AM_LDFLAGS += -L../lib/.libs -L../sched/.libs
- 
- vda_SOURCES = vda.cpp vda_policy.cpp
- vda_LDADD = $(SERVERLIBS)
 Index: boinc/clientgui/Makefile.am
 ===================================================================
 --- boinc.orig/clientgui/Makefile.am	2012-05-31 08:31:15.000000000 +0800

-- 
BOINC packaging