[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-51-g4caed46

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 4caed46fb8c29fa9ba14e568151611976c39ccc7
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sun Jul 8 20:43:33 2012 +0200

    Adjusted -L settings to find ../lib/.libs

diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 23d5900..5972f37 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -1,26 +1,74 @@
 Index: boinc/tools/Makefile.am
 ===================================================================
---- boinc.orig/tools/Makefile.am	2012-03-31 13:44:27.091110561 +0200
-+++ boinc/tools/Makefile.am	2012-06-30 22:50:33.519053725 +0200
+--- boinc.orig/tools/Makefile.am	2012-07-08 20:36:42.483643292 +0200
++++ boinc/tools/Makefile.am	2012-07-08 20:36:51.027526800 +0200
 @@ -24,7 +24,7 @@
  		run_in_ops
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
 -AM_LDFLAGS += -static
-+AM_LDFLAGS += -static -L../sched
++AM_LDFLAGS += -static -L../sched -L../lib/.libs
  
  cancel_jobs_SOURCES = cancel_jobs.cpp
  cancel_jobs_LDADD = $(SERVERLIBS)
 Index: boinc/vda/Makefile.am
 ===================================================================
---- boinc.orig/vda/Makefile.am	2012-03-31 13:44:27.175109414 +0200
-+++ boinc/vda/Makefile.am	2012-06-30 22:52:03.037837461 +0200
+--- boinc.orig/vda/Makefile.am	2012-07-08 20:36:42.483643292 +0200
++++ boinc/vda/Makefile.am	2012-07-08 20:36:51.035526690 +0200
 @@ -3,7 +3,7 @@
  bin_PROGRAMS = vda vdad ssim
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
 -AM_LDFLAGS += -static
-+AM_LDFLAGS += -static -L../sched
++AM_LDFLAGS += -static -L../lib/.libs -L../sched
  
  vda_SOURCES = vda.cpp vda_policy.cpp
  vda_LDADD = $(SERVERLIBS)
+Index: boinc/sched/Makefile.am
+===================================================================
+--- boinc.orig/sched/Makefile.am	2012-07-08 20:36:42.483643292 +0200
++++ boinc/sched/Makefile.am	2012-07-08 20:36:51.039526636 +0200
+@@ -4,7 +4,7 @@
+ include $(top_srcdir)/Makefile.incl
+ 
+ AM_CPPFLAGS += $(MYSQL_CFLAGS) $(PTHREAD_CFLAGS)
+-AM_LDFLAGS += -static
++AM_LDFLAGS += -static -L../lib/.libs/
+ 
+ if ENABLE_LIBRARIES
+ 
+Index: boinc/apps/Makefile.am
+===================================================================
+--- boinc.orig/apps/Makefile.am	2012-07-08 20:36:42.483643292 +0200
++++ boinc/apps/Makefile.am	2012-07-08 20:36:51.043526582 +0200
+@@ -8,15 +8,15 @@
+ 
+ upper_case_SOURCES = upper_case.cpp
+ upper_case_CXXFLAGS = $(PTHREAD_CFLAGS)
+-upper_case_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
++upper_case_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L../api/.libs -L../lib/.libs
+ upper_case_LDADD = $(APPLIBS)
+ 
+ concat_SOURCES = concat.cpp
+ concat_CXXFLAGS = $(PTHREAD_CFLAGS)
+-concat_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
++concat_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L../api/.libs -L../lib/.libs
+ concat_LDADD = $(APPLIBS)
+ 
+ 1sec_SOURCES = 1sec.cpp
+ 1sec_CXXFLAGS = $(PTHREAD_CFLAGS)
+-1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
++1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L../api/.libs -L../lib/.libs
+ 1sec_LDADD = $(APPLIBS)
+Index: boinc/clientgui/Makefile.am
+===================================================================
+--- boinc.orig/clientgui/Makefile.am	2012-07-08 20:10:13.000000000 +0200
++++ boinc/clientgui/Makefile.am	2012-07-08 20:38:08.338472678 +0200
+@@ -3,6 +3,7 @@
+ 
+ include $(top_srcdir)/Makefile.incl
+ 
++AM_LDFLAGS +=  -L../lib/.libs
+ if ENABLE_CLIENT_RELEASE
+   AM_LDFLAGS += -static-libtool-libs
+ ## for an entirely statically linked library, you may want to try

-- 
BOINC packaging