diff --git a/rosegarden-10.10-filepaths.patch b/rosegarden-10.10-filepaths.patch index 1b5acb7..a82b6d3 100644 --- a/rosegarden-10.10-filepaths.patch +++ b/rosegarden-10.10-filepaths.patch @@ -1,6 +1,8 @@ ---- src/gui/widgets/FileDialog.cpp.orig 2014-12-17 14:30:23.000000000 +0100 -+++ src/gui/widgets/FileDialog.cpp 2015-08-29 21:06:53.992239554 +0200 -@@ -58,8 +58,8 @@ +Index: src/gui/widgets/FileDialog.cpp +=================================================================== +--- src/gui/widgets/FileDialog.cpp.orig ++++ src/gui/widgets/FileDialog.cpp +@@ -58,8 +58,8 @@ FileDialog::FileDialog(QWidget *parent, #else QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path(); #endif @@ -11,9 +13,11 @@ QString rosegarden = home + "/rosegarden"; RG_DEBUG << "FileDialog::FileDialog(...)" << endl ---- src/gui/studio/BankEditorDialog.cpp.orig 2014-12-17 14:30:23.000000000 +0100 -+++ src/gui/studio/BankEditorDialog.cpp 2015-08-29 21:07:37.151687434 +0200 -@@ -1562,7 +1562,7 @@ +Index: src/gui/studio/BankEditorDialog.cpp +=================================================================== +--- src/gui/studio/BankEditorDialog.cpp.orig ++++ src/gui/studio/BankEditorDialog.cpp +@@ -1568,7 +1568,7 @@ BankEditorDialog::slotImport() #else QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path(); #endif diff --git a/rosegarden-14.02-fix-bashisms.patch b/rosegarden-14.02-fix-bashisms.patch index 1c22063..2d4c6a1 100644 --- a/rosegarden-14.02-fix-bashisms.patch +++ b/rosegarden-14.02-fix-bashisms.patch @@ -1,6 +1,7 @@ -diff -Ndur rosegarden-14.02/scripts/distclean.sh rosegarden-14.02-fix-bashisms/scripts/distclean.sh ---- rosegarden-14.02/scripts/distclean.sh 2014-03-03 13:58:44.000000000 +0200 -+++ rosegarden-14.02-fix-bashisms/scripts/distclean.sh 2014-11-29 04:16:27.094140542 +0200 +Index: scripts/distclean.sh +=================================================================== +--- scripts/distclean.sh.orig ++++ scripts/distclean.sh @@ -1,12 +1,10 @@ #!/bin/sh -rm -f {,src/,po/,docs/,data/}CMakeCache.txt @@ -22,10 +23,11 @@ diff -Ndur rosegarden-14.02/scripts/distclean.sh rosegarden-14.02-fix-bashisms/s + done +done rm -rf RGbuild/* -diff -Ndur rosegarden-14.02/scripts/reorganise.sh rosegarden-14.02-fix-bashisms/scripts/reorganise.sh ---- rosegarden-14.02/scripts/reorganise.sh 2014-03-03 13:58:44.000000000 +0200 -+++ rosegarden-14.02-fix-bashisms/scripts/reorganise.sh 2014-11-29 04:21:14.766121081 +0200 -@@ -585,7 +585,7 @@ +Index: scripts/reorganise.sh +=================================================================== +--- scripts/reorganise.sh.orig ++++ scripts/reorganise.sh +@@ -585,7 +585,7 @@ for file in guitar/*.h ; do fi fi done @@ -34,7 +36,7 @@ diff -Ndur rosegarden-14.02/scripts/reorganise.sh rosegarden-14.02-fix-bashisms/ cd ../src -@@ -601,21 +601,25 @@ +@@ -601,21 +601,25 @@ for replacement in $replacements; do perlcommand="s/$before/$after/g ; $perlcommand" done @@ -71,7 +73,7 @@ diff -Ndur rosegarden-14.02/scripts/reorganise.sh rosegarden-14.02-fix-bashisms/ done > $class_header_cache for hfile in $candidate_h ; do -@@ -788,8 +792,10 @@ +@@ -788,8 +792,10 @@ add_includes document/RosegardenGUIDoc.c echo Formatting at `date`... 1>&2 diff --git a/rosegarden-14.12.tar.bz2 b/rosegarden-14.12.tar.bz2 deleted file mode 100644 index bb24539..0000000 --- a/rosegarden-14.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f876fbb818326da7f012a01a4d6baf45022dcbb98626e0ce40c67b6943ee147e -size 6235233 diff --git a/rosegarden-15.10.2.tar.bz2 b/rosegarden-15.10.2.tar.bz2 new file mode 100644 index 0000000..8372c09 --- /dev/null +++ b/rosegarden-15.10.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4e8488c3447763a7d4b57925dc9d462e9e21efe647962431ea21aad8930a0a3 +size 6380389 diff --git a/rosegarden.changes b/rosegarden.changes index 84134f3..f433193 100644 --- a/rosegarden.changes +++ b/rosegarden.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 15 14:30:34 UTC 2015 - davejplater@gmail.com + +- Update to version 15.10.2 and refresh patches. +- Upstream changes see http://rosegardenmusic.com/wiki/dev:15.10 + ------------------------------------------------------------------- Sat Aug 29 19:27:19 UTC 2015 - tom.mbrt@googlemail.com diff --git a/rosegarden.spec b/rosegarden.spec index 7fdfd63..084e297 100644 --- a/rosegarden.spec +++ b/rosegarden.spec @@ -16,7 +16,7 @@ # Name: rosegarden -Version: 14.12 +Version: 15.10.2 Release: 0 License: GPL-2.0+ Summary: Midi, Audio And Notation Editor @@ -79,7 +79,7 @@ See the changelog for details. %prep %setup -q %patch1 -%patch2 -p1 +%patch2 # When we build svn we need to execute bootstrap.sh it doesn't harm the release build either. sh bootstrap.sh