[boinc] 01/01: Fix underlinking patch, avoiding sql library

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository boinc.

commit 3e21221ea860648cbe923acdd71d5e33e1a2482c
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sun Sep 3 00:18:51 2017 +0200

    Fix underlinking patch, avoiding sql library
---
 debian/changelog                      |  9 +++++++++
 debian/patches/fix-underlinking.patch |  2 +-
 debian/rules                          | 11 ++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 813becf..430ea22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+boinc (7.8.2+dfsg-2) unstable; urgency=medium
+
+  * Upload to unstable.
+  * Tweak underlinking patch, to avoid having to pull mariadb library
+    (libsched is used only by server, and it does directly link mariadb
+     directly) Closes: #873092
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 02 Sep 2017 23:20:11 +0200
+
 boinc (7.8.2+dfsg-1exp1) experimental; urgency=medium
 
   * Upload to experimental
diff --git a/debian/patches/fix-underlinking.patch b/debian/patches/fix-underlinking.patch
index 9890fca..706b313 100644
--- a/debian/patches/fix-underlinking.patch
+++ b/debian/patches/fix-underlinking.patch
@@ -54,7 +54,7 @@ Index: boinc/sched/Makefile.am
  libsched_la_CXXFLAGS = $(AM_CPPFLAGS)
 -libsched_la_LDFLAGS= -version-number $(LIBBOINC_VERSION)
 -libsched_la_LIBADD= $(SSL_LIBS)
-+libsched_la_LDFLAGS= -version-number $(LIBBOINC_VERSION) $(MYSQL_LIBS) $(SSL_LIBS)
++libsched_la_LDFLAGS= -version-number $(LIBBOINC_VERSION) $(SSL_LIBS)
 +libsched_la_LIBADD= $(LIBBOINC) $(LIBBOINC_CRYPT)
  
  ## install only headers that are meant for exporting the API !!
diff --git a/debian/rules b/debian/rules
index c1e65b4..0690903 100755
--- a/debian/rules
+++ b/debian/rules
@@ -384,19 +384,16 @@ ifeq (,$(ENABLE_SERVER_TEST))
 	echo "I: Installing example scientific applications"
 	mkdir -p $(CURDIR)/debian/tmp/samples
 	cp $(SAMPLES) $(CURDIR)/debian/tmp/samples || echo "W: Could not install samples ($(SAMPLES))"
-	cd $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/all/libraries/fonts/ ; \
+	cd $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/all/libraries/fonts/ && \
 	for i in `ls *.ttf`; do \
 		rm -r "$$i" ; \
 		ln -sf "/usr/share/fonts/truetype/dejavu/$$i" . ; \
-	done; \
-	cd -
-	cd $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/default/boinc/themes/boinc/fonts/ ; \
+	done;
+	cd $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/default/boinc/themes/boinc/fonts/ && \
 	for i in `ls *`; do \
 		rm -r "$$i" ; \
 		ln -sf "/usr/share/fonts-font-awesome/fonts/$$i" . ; \
-	done; \
-	cd -
-
+	done;
 endif
 	for i in $(CURDIR)/debian/*/usr/bin ; \
 	do \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git