[SCM] BOINC packaging branch, master, updated. upstream/7.0.45+dfsg-631-g5ab843e

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 5ab843e5f330f6cec7a133d740576d17d42cb17b
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sun Jan 27 02:20:03 2013 +0100

    7.0.45 upload to experimental.

diff --git a/debian/boinc-server-maker.install b/debian/boinc-server-maker.install
index 2f63131..83af3b9 100644
--- a/debian/boinc-server-maker.install
+++ b/debian/boinc-server-maker.install
@@ -115,4 +115,6 @@ usr/bin/crypt_prog		     usr/lib/boinc-server/bin
 
 #usr/libexec/sched  		     usr/lib/boinc-server
 
+# Only built together with server
+usr/lib/libboinc_zip.so.*         usr/lib
 
diff --git a/debian/changelog b/debian/changelog
index 297f3d7..a8b4bf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-boinc (7.0.45+dfsg-1) UNRELEASED; urgency=low
+boinc (7.0.45+dfsg-1) experimental; urgency=low
 
   * New upstream release
+  * Removed boinc zip library from client builds
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 25 Jan 2013 00:01:24 +0100
 
diff --git a/debian/libboinc-app7.install b/debian/libboinc-app7.install
index 47fccbd..dde05f6 100644
--- a/debian/libboinc-app7.install
+++ b/debian/libboinc-app7.install
@@ -1,4 +1,5 @@
 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
+# only for server builds, moved to boinc-server-maker
+#usr/lib/libboinc_zip.so.*         usr/lib
diff --git a/debian/patches/series b/debian/patches/series
index 4dd3730..c732fbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,3 +59,4 @@ boinclib_shared.patch
 dynamic_libboinc.patch
 Missing_libSched.patch
 fix-add-exclusive-app.patch
+zip_only_built_with_server.patch
diff --git a/debian/patches/zip_only_built_with_server.patch b/debian/patches/zip_only_built_with_server.patch
new file mode 100644
index 0000000..533c809
--- /dev/null
+++ b/debian/patches/zip_only_built_with_server.patch
@@ -0,0 +1,16 @@
+Index: boinc_debian/Makefile.am
+===================================================================
+--- boinc_debian.orig/Makefile.am
++++ boinc_debian/Makefile.am
+@@ -9,7 +9,10 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ if ENABLE_LIBRARIES
+-   API_SUBDIRS = api lib zip
++   API_SUBDIRS = api lib
++if ENABLE_SERVER
++   API_SUBDIRS += zip
++endif
+ endif
+ 
+ if ENABLE_SERVER

-- 
BOINC packaging