[SCM] musescore/master: let’s try to fix this issue cheaply

[tg at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d2bd474900f4e2c49c1983e7369ad04d6be306de
Author: mirabilos <tg at debian.org>
Date:   Tue Oct 10 19:38:26 2017 +0200

    let’s try to fix this issue cheaply

diff --git a/debian/changelog b/debian/changelog
index c8d27bc..fec3efa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ musescore (2.1.0+dfsg1-1) unstable; urgency=low
   * Split fluidr3mono-gm-soundfont off musescore-common. (Closes: #871920)
   * Update to Debian Policy 4.1.1.1 (no changes).
   * Install fluidr3mono-gm-soundfont’s upstream changelog.
+  * Create fix for upstream issue #150956.
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 10 Oct 2017 19:29:22 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 10 Oct 2017 19:38:07 +0200
 
 musescore (2.1.0+dfsg1-0.2) unstable; urgency=medium
 
diff --git a/debian/patches/06-relative-paths-to-scores.patch b/debian/patches/06-relative-paths-to-scores.patch
new file mode 100644
index 0000000..3f8a5cb
--- /dev/null
+++ b/debian/patches/06-relative-paths-to-scores.patch
@@ -0,0 +1,36 @@
+Description: Fix saving scores opened by relative pathname from cmdline
+Author: mirabilos <tg at debian.org>
+Forwarded: https://musescore.org/en/node/150956
+
+--- a/libmscore/scorefile.cpp
++++ b/libmscore/scorefile.cpp
+@@ -390,6 +390,7 @@ bool Score::saveFile()
+       temp.close();
+ 
+       QString name(info.filePath());
++      QString basename(info.fileName());
+       QDir dir(info.path());
+       if (!saved()) {
+             // if file was already saved in this session
+@@ -412,8 +413,8 @@ bool Score::saveFile()
+             // step 3
+             // rename old file into backup
+             //
+-            if (dir.exists(name)) {
+-                  if (!dir.rename(name, backupName)) {
++            if (dir.exists(basename)) {
++                  if (!dir.rename(basename, backupName)) {
+ //                      if (!MScore::noGui)
+ //                            QMessageBox::critical(0, tr("Save File"),
+ //                               tr("Renaming old file <")
+@@ -428,8 +429,8 @@ bool Score::saveFile()
+             }
+       else {
+             // file has previously been saved - remove the old file
+-            if (dir.exists(name)) {
+-                  if (!dir.remove(name)) {
++            if (dir.exists(basename)) {
++                  if (!dir.remove(basename)) {
+ //                      if (!MScore::noGui)
+ //                            QMessageBox::critical(0, tr("Save File"),
+ //                               tr("Removing old file") + name + tr(" failed"));
diff --git a/debian/patches/series b/debian/patches/series
index 8a22b26..d499604 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03-debundle-openssl.patch
 04-manpage-errors.patch
 05-desktop-keywords.patch
+06-relative-paths-to-scores.patch

-- 
musescore packaging