[boinc] 03/12: Fix typo in Makefile.am, remove parallel-build patch, remove x interactive

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit 20e213152a2a497640ef7ca51d07b0ee13b89651
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Aug 12 11:13:20 2014 +0200

    Fix typo in Makefile.am, remove parallel-build patch, remove x interactive
---
 debian/boinc-client.init            |  1 -
 debian/changelog                    | 10 ++++++++++
 debian/patches/fix-typo.patch       | 12 ++++++++++++
 debian/patches/parallel-build.patch | 32 --------------------------------
 debian/patches/series               |  2 +-
 5 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/debian/boinc-client.init b/debian/boinc-client.init
index 33ad3ea..89ccc5b 100644
--- a/debian/boinc-client.init
+++ b/debian/boinc-client.init
@@ -7,7 +7,6 @@
 # Should-Stop:       x11-common
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# X-Interactive:     true
 # Short-Description: BOINC core client
 # Description:       core client for the BOINC distributed computing
 #                    infrastructure
diff --git a/debian/changelog b/debian/changelog
index a5e8dd5..b393625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+boinc (7.4.14+dfsg-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Remove X-interactive from init script, not used.
+  * Remove parallel-builds.patch, the proble was a bad debian
+    patch.
+  * Fix a typo in lib/Makefile.am (typo-fix.patch)
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 12 Aug 2014 11:10:29 +0200
+
 boinc (7.4.8+dfsg-3exp3) experimental; urgency=medium
 
   * d/p/parallel-build.patch d/r
diff --git a/debian/patches/fix-typo.patch b/debian/patches/fix-typo.patch
new file mode 100644
index 0000000..540838a
--- /dev/null
+++ b/debian/patches/fix-typo.patch
@@ -0,0 +1,12 @@
+Description: this should ensure that parallel builds work on debian (since the dependencies are changed with dynamic libraries)
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -209,7 +209,7 @@
+ 
+ 
+ if BUILD_STATIC_LIBS
+-all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRTYPT_STATIC)
++all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRYPT_STATIC)
+ if ENABLE_FCGI
+ all_local += $(LIBBOINC_FCGI_STATIC) 
+ endif
diff --git a/debian/patches/parallel-build.patch b/debian/patches/parallel-build.patch
deleted file mode 100644
index 20fd5cb..0000000
--- a/debian/patches/parallel-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: this should ensure that parallel builds work on debian (since the dependencies are changed with dynamic libraries)
---- boinc-7.4.8+dfsg.orig/Makefile.incl
-+++ boinc-7.4.8+dfsg/Makefile.incl
-@@ -42,22 +42,22 @@ AM_LDFLAGS =
- # programs linking to them:
- 
- LIBSCHED = -lsched
--$(LIBSCHED):
-+$(LIBSCHED_STATIC):
- 	cd $(top_builddir)/sched; ${MAKE} libsched.la
- LIBSCHED_FCGI = -lsched_fcgi
--$(LIBSCHED_FCGI):
-+$(LIBSCHED_FCGI_STATIC):
- 	cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.la
- LIBBOINC = -lboinc
--$(LIBBOINC):
-+$(LIBBOINC_STATIC):
- 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
- LIBBOINC_CRYPT = -lboinc_crypt
--$(LIBBOINC_CRYPT):
-+$(LIBBOINC_CRYPT_STATIC):
- 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
- LIBBOINC_FCGI = -lboinc_fcgi
--$(LIBBOINC_FCGI):
-+$(LIBBOINC_FCGI_STATIC):
- 	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
- LIBAPI = -lboinc_api
--$(LIBAPI):
-+$(LIBAPI_STATIC):
- 	cd $(top_builddir)/api; ${MAKE} libboinc_api.la
- 
- SERVERLIBS = $(LIBSCHED) $(LIBBOINC_CRYPT) $(LIBBOINC) $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index c21c87b..bf4713d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,4 +37,4 @@ disable_silent_rules.patch
 server_status_php.patch
 #db_interface_use.patch
 boinc-server-dynamic-libs.patch
-parallel-build.patch
+fix-typo.patch

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