[SCM] musescore/master: Fix Vcs-Git in control file, thanks duck.
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Fri Jul 3 15:41:31 UTC 2015
The following commit has been merged in the master branch:
commit ef49ef422f60a706118ddb7e1c7c6a72795a5d3d
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Fri Jul 3 11:41:26 2015 -0400
Fix Vcs-Git in control file, thanks duck.
diff --git a/Makefile b/Makefile
index c0a46b8..2733612 100644
--- a/Makefile
+++ b/Makefile
@@ -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
PREFIX = "/usr/local"
#VERSION = "2.0.1b-${REVISION}"
diff --git a/debian/changelog b/debian/changelog
index 97c3dd0..57f9216 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-musescore (2.0.1+dfsg-3) unstable; urgency=medium
+
+musescore (2.0.1+dfsg-3) UNRELEASED; urgency=medium
* Re-using old patch related to multiple processors and m68k.
+ * Fix Vcs-Git in control file, thanks duck.
- -- Tiago Bortoletto Vaz <tiago at debian.org> Thu, 25 Jun 2015 09:36:17 -0400
+ -- Tiago Bortoletto Vaz <tiago at debian.org> Fri, 03 Jul 2015 11:40:29 -0400
musescore (2.0.1+dfsg-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 4ae1cec..9813432 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), cmake, qtbase5-dev,
portaudio19-dev, zlib1g-dev, libfreetype6-dev, chrpath
Standards-Version: 3.9.6
Homepage: http://www.musescore.org/
-Vcs-Git: git://anonscm.debian.org/users/pkg-multimedia/musescore.git
+Vcs-Git: git://anonscm.debian.org/pkg-multimedia/musescore.git
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-multimedia/musescore.git
Package: musescore
--
musescore packaging
More information about the pkg-multimedia-commits
mailing list