[SCM] musescore/master: Adding patch to fix m68k building error.

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d2988ad2b23175165165d06b46ebd80f1322e676
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Mon Jun 22 17:10:41 2015 -0400

    Adding patch to fix m68k building error.

diff --git a/debian/patches/08-disable-multiple-jobs.patch b/debian/patches/08-disable-multiple-jobs.patch
index 462593b..8fc5f1f 100644
--- a/debian/patches/08-disable-multiple-jobs.patch
+++ b/debian/patches/08-disable-multiple-jobs.patch
@@ -1,22 +1,19 @@
-From: Tobias Toedter <toddy at debian.org>
-Subject: Detect multiple CPUs better
- The current system of detecting multiple CPUs and using them for
- multiple jobs in parallel is not very robust and results in a FTBFS on
- some architectures.
+# Description: Avoid build error when processor = 0 from /proc/cpuinfo
+# Author: Tiago Bortoletto Vaz <tiago at debian.org>
 
 ---
  Makefile |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
-
 --- a/Makefile
 +++ b/Makefile
-@@ -37,7 +37,8 @@
-       cmake -DCMAKE_BUILD_TYPE=RELEASE	       \
-   	  -DCMAKE_INSTALL_PREFIX="${PREFIX}" ..;   \
-       make lrelease;                             \
--      make -j ${CPUS};                           \
-+      make;
-+      #make -j ${CPUS};                           \
+@@ -20,6 +20,10 @@
  
+ REVISION  = `cat mscore/revision.h`
+ CPUS      = `grep -c processor /proc/cpuinfo`
++# Avoid a FTBFS when processor=0 (as in m68k)
++ifeq ($(CPUS), 0)
++  CPUS=1
++endif
  
- debug:
+ PREFIX    = "/usr/local"
+ #VERSION   = "2.0.1b-${REVISION}"
diff --git a/debian/patches/series b/debian/patches/series
index acc95b3..f26b12b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,7 @@
 # dropped 05-use-mscore-common-files.patch with version 2.0~beta1-1
 # dropped 06-build-documentation with version 0.9.2+dfsg-1
 # dropped 07-fix-xml-in-msc with version 0.9.3n~svn1071+dfsg-1
-# try without 08-disable-multiple-jobs.patch ...
+08-disable-multiple-jobs.patch
 # dropped 09-disable-building-qtscript.patch with version 2.0~beta1-1
 # dropped 10-disable-awl.patch with version 2.0~beta1-1
 # dropped 11-install-manual with 0.9.5b1925+dfsg (REVERTED BELOW)

-- 
musescore packaging