[SCM] BOINC packaging branch, master, updated. upstream/7.0.28+dfsg-462-ged18f5b

Tue May 29 15:26:37 UTC 2012

The following commit has been merged in the master branch:
commit ed18f5baf12836827c98ace75f6f8c4c1f85b170
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue May 29 17:25:10 2012 +0200

    Introducing more fine-grained shared libraries.
    
    Shared libraries should be used throughout, not only for the scientific application.

diff --git a/debian/boinc-client.install b/debian/boinc-client.install
index d5cc1a6..c83ea72 100644
--- a/debian/boinc-client.install
+++ b/debian/boinc-client.install
@@ -3,7 +3,7 @@ debian/conffiles/*                  etc/boinc-client
 debian/extra/bash/*                 etc/bash_completion.d
 debian/extra/udev-cpu_share         usr/share/boinc-client
 debian/extra/update-boinc-applinks  usr/bin
-client/switcher                     usr/lib/boinc-client
-client/boinc			    usr/bin
-client/boinccmd			    usr/bin
+usr/bin/switcher                    usr/lib/boinc-client
+usr/bin/boinc			    usr/bin
+usr/bin/boinccmd		    usr/bin
 usr/share/locale/*/BOINC-Client.mo
diff --git a/debian/changelog b/debian/changelog
index b9baf20..8b03405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ boinc (7.0.28+dfsg-3) UNRELEASED; urgency=low
 
   * Splitting -dev package into libboinc and libboinc-dev.
   * Added shared library for libboinc.
+  * Added configure flag in debian/rules to allow dynamic clients
+  * Installing more from  debian/tmp to avoid lintian wrappers
  
  -- Steffen Moeller <moeller at debian.org>  Mon, 28 May 2012 13:21:35 +0200
 
diff --git a/debian/control b/debian/control
index 9858ac0..5aca950 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,22 @@ Description: metapackage for the BOINC client and the manager
  BOINC core client.
 
 
+Package: libboinc
+Architecture: any
+Section: libs
+Depends: ${misc:Depends} 
+Description: libraries of BOINC the client depends on
+ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+ software platform for distributed computing using volunteered computer
+ resources.
+ .
+ The environment offers a series of libraries that both the user-run
+ client and the client-invoked scientific applications run on. With
+ the number of cores per machine growing, and with scientific apps
+ commonly started for every core, it is essential to have memory
+ shared as much as possible between all binaries.
+
+
 Package: boinc-nvidia-cuda
 Architecture: amd64 i386
 Section: contrib/net
@@ -85,7 +101,9 @@ Description: metapackage for CUDA-savvy BOINC client and manager
 
 Package: boinc-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3),
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libboinc (= ${binary:Version}),
+ python (>= 2.3),
  adduser,
  ca-certificates
 Recommends: ia32-libs [amd64]
diff --git a/debian/libboinc-app.install b/debian/libboinc-app.install
index fb271fb..47fccbd 100644
--- a/debian/libboinc-app.install
+++ b/debian/libboinc-app.install
@@ -1 +1,4 @@
-usr/lib/lib*so.*         usr/lib
+usr/lib/libboinc_api.so.*         usr/lib
+usr/lib/libboinc_graphics2.so.*         usr/lib
+usr/lib/libboinc_opencl.so.*         usr/lib
+usr/lib/libboinc_zip.so.*         usr/lib
diff --git a/debian/libboinc.install b/debian/libboinc.install
new file mode 100644
index 0000000..7c782ac
--- /dev/null
+++ b/debian/libboinc.install
@@ -0,0 +1,2 @@
+usr/lib/libboinc.so.*         usr/lib
+libboinc_crypt.so.*	      usr/lib
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 9bdf55d..f1d6b7f 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -1,7 +1,7 @@
 Index: boinc/lib/Makefile.am
 ===================================================================
---- boinc.orig/lib/Makefile.am	2012-05-28 20:27:20.000000000 +0200
-+++ boinc/lib/Makefile.am	2012-05-28 20:28:21.196071929 +0200
+--- boinc.orig/lib/Makefile.am	2012-05-29 16:17:23.176263313 +0200
++++ boinc/lib/Makefile.am	2012-05-29 17:00:22.337518324 +0200
 @@ -146,13 +146,13 @@
  libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
  libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -18,3 +18,26 @@ Index: boinc/lib/Makefile.am
  libboinc_crypt_la_LIBADD =  -lm -lstdc++
  
  
+@@ -218,7 +218,7 @@
+ msg_test_LDADD = $(LIBBOINC)
+ crypt_prog_SOURCES = crypt_prog.cpp 
+ crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
+-crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS) 
+-parse_test_SOURCES = parse_test.cpp 
++crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) -L../lib/.libs $(LIBBOINC) $(SSL_LIBS)
++parse_test_SOURCES = parse_test.cpp
+ parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
+ parse_test_LDADD = $(LIBBOINC)
+Index: boinc/client/Makefile.am
+===================================================================
+--- boinc.orig/client/Makefile.am	2012-05-03 13:38:04.248172480 +0200
++++ boinc/client/Makefile.am	2012-05-29 16:55:00.989851700 +0200
+@@ -85,7 +85,7 @@
+ if OS_DARWIN
+ boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
+ endif
+-boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
++boinc_client_LDADD = -L../lib/.libs $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
+ 
+ boinc_clientdir = $(bindir)
+ 
diff --git a/debian/patches/dynamic_libboinc.patch b/debian/patches/dynamic_libboinc.patch
new file mode 100644
index 0000000..c95a97e
--- /dev/null
+++ b/debian/patches/dynamic_libboinc.patch
@@ -0,0 +1,38 @@
+Index: boinc/Makefile.incl
+===================================================================
+--- boinc.orig/Makefile.incl	2012-03-31 13:44:20.891195251 +0200
++++ boinc/Makefile.incl	2012-05-29 16:08:30.239454422 +0200
+@@ -37,22 +37,22 @@
+ # dependencies to make sure libs gets compiled before
+ # programs linking to them:
+ 
+-LIBSCHED = $(top_builddir)/sched/libsched.la
++LIBSCHED = -lsched
+ $(LIBSCHED):
+ 	cd $(top_builddir)/sched; ${MAKE} libsched.la
+-LIBSCHED_FCGI = $(top_builddir)/sched/libsched_fcgi.la
++LIBSCHED_FCGI = -lsched_fcgi
+ $(LIBSCHED_FCGI):
+ 	cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.la
+-LIBBOINC = $(top_builddir)/lib/libboinc.la
++LIBBOINC = -lboinc
+ $(LIBBOINC):
+ 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
+-LIBBOINC_CRYPT = $(top_builddir)/lib/libboinc_crypt.la
++LIBBOINC_CRYPT = -lboinc_crypt
+ $(LIBBOINC_CRYPT):
+ 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
+-LIBBOINC_FCGI = $(top_builddir)/lib/libboinc_fcgi.la
++LIBBOINC_FCGI = -lboinc_fcgi
+ $(LIBBOINC_FCGI):
+ 	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
+-LIBAPI = $(top_builddir)/api/libboinc_api.la
++LIBAPI = -lboinc_api
+ $(LIBAPI):
+ 	cd $(top_builddir)/api; ${MAKE} libboinc_api.la
+ 
+@@ -60,3 +60,4 @@
+ SERVERLIBS_FCGI = $(LIBSCHED_FCGI) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) -lfcgi $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
+ APPLIBS = $(LIBAPI) $(LIBBOINC)
+ 
++.PHONY: $(LIBBOINC) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) $(LIBAPI) $(LIBSCHED) $(LIBSCHED_FCGI)
diff --git a/debian/patches/series b/debian/patches/series
index f64fbbc..6db116e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -58,3 +58,4 @@ unlink_undefined.patch
 screen_saver_boinc_extra.patch
 #socklenBuildFixByDavid.patch
 boinclib_shared.patch
+dynamic_libboinc.patch
diff --git a/debian/rules b/debian/rules
index 4a6c8dd..45e281c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,6 +139,7 @@ CFGFLAGS_boinc-client = \
   --enable-shared \
   --with-ssl \
   --with-x \
+  --enable-dynamic-client-linkage \
   CFLAGS="$(CFLAGS_boinc-client)" \
   CXXFLAGS="$(CXXFLAGS_boinc-client)" \
   LDFLAGS="$(LDFLAGS)"

-- 
BOINC packaging

