[SCM] musescore/master: patch: fix manpage errors

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Mon Jul 11 10:37:20 UTC 2016


The following commit has been merged in the master branch:
commit 9e7b2c63676fbd947d7681c6f897ac5e716bc4b6
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat Jul 9 10:46:23 2016 +0200

    patch: fix manpage errors

diff --git a/debian/patches/04-manpage-errors.patch b/debian/patches/04-manpage-errors.patch
new file mode 100644
index 0000000..2e24e5f
--- /dev/null
+++ b/debian/patches/04-manpage-errors.patch
@@ -0,0 +1,27 @@
+Description: Fix errors in mscore.1 manpage
+ CMake doesn't support single quotes, so the old value of MAN_PORTABLE was
+ causing errors. Insert manual line break to help groff displaying a long line.
+Author: James Cowgill <jcowgill at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -478,7 +478,7 @@ if (NOT MINGW AND NOT APPLE)
+                        build/rm-empty-dirs              DESTINATION bin COMPONENT portable ${SCRIPT_PERMS})
+       install(FILES    build/Linux+BSD/portable/qt.conf DESTINATION bin COMPONENT portable)
+     else (${MSCORE_INSTALL_SUFFIX} MATCHES "portable")
+-      set(MAN_PORTABLE '.\"') # comment out lines in man page that are only relevent to the portable version
++      set(MAN_PORTABLE .\\\") # comment out lines in man page that are only relevent to the portable version
+     endif (${MSCORE_INSTALL_SUFFIX} MATCHES "portable")
+     # install desktop file (perform variable substitution first)
+     configure_file(build/Linux+BSD/mscore.desktop.in mscore${MSCORE_INSTALL_SUFFIX}.desktop)
+--- a/build/Linux+BSD/mscore.1.in
++++ b/build/Linux+BSD/mscore.1.in
+@@ -69,6 +69,7 @@ For help with the full MuseScore program
+ These pages cover the topics in this manual and may be more up-to-date:
+ 
+ <https://musescore.org/handbook/command-line-options-0>
++.br
+ <https://musescore.org/handbook/revert-factory-settings-0>
+ 
+ .SH OPTIONS
diff --git a/debian/patches/series b/debian/patches/series
index 06499c5..cc91bab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-debundle-freetype.patch
 02-global-flags.patch
 03-debundle-openssl.patch
+04-manpage-errors.patch

-- 
musescore packaging



More information about the pkg-multimedia-commits mailing list