[SCM] musescore/master: Patch Makefile and remove unnecessary build-depends

[shoogle-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dc0b5464e2dd31d7be5d709be5015e2d05dbeaf7
Author: Peter Jonas <pjonas56 at gmail.com>
Date:   Fri Jun 24 12:07:36 2016 +0100

    Patch Makefile and remove unnecessary build-depends
    
    - New patch: 01-posix-method-to-count-cpus.patch (backported from upstream)
    - Don't build-depend on qtquick1-5-dev (Closes: #808781, #824956)

diff --git a/debian/changelog b/debian/changelog
index dc1e112..dadd962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
 musescore (2.0.3+dfsg1-1) UNRELEASED; urgency=medium
 
   * New upstream version 2.0.3
-  * Closes: #798289, #802705, #823160; LP: #1487695, #1503714.
+  * Closes: #798289, #797259, #802705, #821325, #823160; LP: #1487695, #1503714.
   * Removed obsolete patches (Closes: #815688; LP: #1492629)
   * Update debian/copyright (Closes: #818619)
   * Set revision on upstream import via uscan (Closes: #818795; LP: #1492623)
   * Update syntax for debian/gbp.conf and debian/watch
   * Add Files-Excluded field to debian/copyright and adjusted debian/repack
+  * Don't build-depend on qtquick1-5-dev (Closes: #808781, #824956)
+  * New patch: 01-posix-method-to-count-cpus.patch (backported from upstream)
 
  -- Peter Jonas <pjonas56 at gmail.com>  Sat, 18 Jun 2016 07:34:30 +0100
 
diff --git a/debian/control b/debian/control
index 1f5a5f4..95b2d70 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Toby Smithe <tsmithe at ubuntu.com>, Tiago Bortoletto Vaz <tiago at debian.org>
 Build-Depends: debhelper (>= 9), cmake, qtbase5-dev,
  qtdeclarative5-dev (>= 5.3), qttools5-dev, qttools5-dev-tools,
- qtquick1-5-dev, qtscript5-dev, libqt5xmlpatterns5-dev,
+ qtscript5-dev, libqt5xmlpatterns5-dev,
  libqt5svg5-dev, libqt5webkit5-dev, libasound2-dev, libjack-dev,
  libpulse-dev, libsndfile1-dev (>= 1.0.18), libmp3lame-dev,
  portaudio19-dev, zlib1g-dev, libfreetype6-dev
diff --git a/debian/patches/01-posix-method-to-count-cpus.patch b/debian/patches/01-posix-method-to-count-cpus.patch
new file mode 100644
index 0000000..7aac6db
--- /dev/null
+++ b/debian/patches/01-posix-method-to-count-cpus.patch
@@ -0,0 +1,17 @@
+Description: Use POSIX method to count CPUs
+Origin: upstream,
+ https://github.com/musescore/MuseScore/commit/6f360ee2880fac0e
+Last-Update: 2016-06-19
+--- a/Makefile
++++ b/Makefile
+@@ -18,8 +18,8 @@
+ #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ #=============================================================================
+ 
+-REVISION  = `cat mscore/revision.h`
+-CPUS      = $(shell grep -c processor /proc/cpuinfo)
++REVISION  := `cat mscore/revision.h`
++CPUS      := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
+ # Avoid build errors when processor=0 (as in m68k)
+ ifeq ($(CPUS), 0)
+   CPUS=1
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..efa1009
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-posix-method-to-count-cpus.patch

-- 
musescore packaging