[SCM] rosegarden/master: Drop all patches (applied upstream)
stuart at users.alioth.debian.org
stuart at users.alioth.debian.org
Mon Jan 1 12:59:03 UTC 2018
The following commit has been merged in the master branch:
commit 3e6609379b2797855f21b1bd5935f7174705955a
Author: Stuart Prescott <stuart at debian.org>
Date: Sat Dec 30 01:04:13 2017 +1100
Drop all patches (applied upstream)
diff --git a/debian/patches/appdata-format.patch b/debian/patches/appdata-format.patch
deleted file mode 100644
index 44e6f73..0000000
--- a/debian/patches/appdata-format.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Description: Update format of appstream metadata file
- Format has changed over time; this updates to the metainfo/1.0 spec
- https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
-Author: Stuart Prescott <stuart at debian.org>
---- a/data/appdata/rosegarden.appdata.xml
-+++ b/data/appdata/rosegarden.appdata.xml
-@@ -1,20 +1,46 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<application>
-- <id type="desktop">rosegarden.desktop</id>
-- <licence>CC0</licence>
-- <name>Rosegarden</name>
-- <summary>Music composition and editing environment for MIDI and notation, with basic audio support</summary>
-- <description>
-- <p>
-- Rosegarden is a general-purpose music composition and editing environment that offers a mixture of features inspired by MIDI sequencers, DAWs, and score editors. Rosegarden offers a variety of extensions that work in conjunction with LilyPond to produce beautiful scores that often require little or no manual editing, and it generally does a good job of rendering human MIDI performances as legible notation.
-- </p>
-- <p>
-- Rosegarden is ideal for the small scale home artist who wishes to use one tool to handle a music project from start to finish. For example, you can record your musical idea with a MIDI keyboard, write out transposing parts for the members of a brass band, and record the band playing these parts all in the same document in the same application. Rosegarden supports a variety of import and export formats, and works well in conjunction with other applications.
-- </p>
-- </description>
-- <screenshots>
-- <screenshot type="default" width="650" height="453">http://rosegardenmusic.com/tour/notation/score-edit.png</screenshot>
-- </screenshots>
-- <url type="homepage">http://www.rosegardenmusic.com</url>
-- <updatecontact>michael.mcintyre at rosegardenmusic.com</updatecontact>
--</application>
-+<?xml version="1.0" encoding="utf-8"?>
-+<component type="desktop-application">
-+ <id>com.rosegardenmusic.rosegarden</id>
-+ <name>Rosegarden</name>
-+ <summary xml:lang="fr">Séquenceur MIDI/audio et éditeur de partitions</summary>
-+ <summary>MIDI and Audio Sequencer and Notation Editor</summary>
-+ <summary xml:lang="es">Secuenciador de MIDI y de audio y editor de partitura</summary>
-+ <summary xml:lang="de">MIDI- und Audio-Sequencer und Notensatzprogramm</summary>
-+ <summary xml:lang="ru">MIDI-секвенсер и нотный редактор</summary>
-+ <metadata_license>CC0</metadata_license>
-+ <project_license>GPL-2.0+</project_license>
-+ <developer_name>Rosegarden development team</developer_name>
-+ <url type="homepage">http://www.rosegardenmusic.com/</url>
-+ <description>
-+ <p>
-+ Rosegarden is a general-purpose music composition and editing environment that offers a mixture of features inspired by MIDI sequencers, DAWs, and score editors. Rosegarden offers a variety of extensions that work in conjunction with LilyPond to produce beautiful scores that often require little or no manual editing, and it generally does a good job of rendering human MIDI performances as legible notation.
-+ </p>
-+ <p>
-+ Rosegarden is ideal for the small scale home artist who wishes to use one tool to handle a music project from start to finish. For example, you can record your musical idea with a MIDI keyboard, write out transposing parts for the members of a brass band, and record the band playing these parts all in the same document in the same application. Rosegarden supports a variety of import and export formats, and works well in conjunction with other applications.
-+ </p>
-+ </description>
-+ <screenshots>
-+ <screenshot type="default">
-+ <caption>The score editing window.</caption>
-+ <image type="source" width="650" height="453">ttp://rosegardenmusic.com/tour/notation/score-edit.png</image>
-+ </screenshot>
-+ </screenshots>
-+ <categories>
-+ <category>AudioVideo</category>
-+ <category>Audio</category>
-+ <category>Midi</category>
-+ <category>Sequencer</category>
-+ </categories>
-+ <icon type="stock">rosegarden</icon>
-+ <mimetypes>
-+ <mimetype>audio/x-rosegarden-composition</mimetype>
-+ <mimetype>audio/x-rosegarden-device</mimetype>
-+ <mimetype>audio/x-rosegarden-project</mimetype>
-+ <mimetype>audio/x-rosegarden-template</mimetype>
-+ <mimetype>audio/x-wav</mimetype>
-+ <mimetype>audio/midi</mimetype>
-+ <mimetype>audio/ogg</mimetype>
-+ <mimetype>audio/mp3</mimetype>
-+ <mimetype>audio/x-flac</mimetype>
-+ </mimetypes>
-+</component>
diff --git a/debian/patches/appdata-location.patch b/debian/patches/appdata-location.patch
deleted file mode 100644
index be75974..0000000
--- a/debian/patches/appdata-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Update installation location of appstream metadata
- AppStream metadata is no longer placed in /usr/share/appdata/,
- rather it is now placed in /usr/share/metainfo/.
-Author: Stuart Prescott <stuart at debian.org>
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -39,4 +39,4 @@
- install(FILES desktop/com.rosegardenmusic.rosegarden.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-
- # Install appdata file
--install(FILES appdata/rosegarden.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
-+install(FILES appdata/rosegarden.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch
deleted file mode 100644
index 022b5dd..0000000
--- a/debian/patches/desktop-file.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: Update desktop file
- Several updates including:
- - change name to be the unique entry name as per spec
- https://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#desktop-file-id
- - add a keywords item
- - drop the encoding item (file must be UTF-8)
-Author: Stuart Prescott <stuart at debian.org>
---- /dev/null
-+++ b/data/desktop/com.rosegardenmusic.rosegarden.desktop
-@@ -0,0 +1,20 @@
-+[Desktop Entry]
-+Type=Application
-+Categories=AudioVideo;Audio;Midi;Sequencer;X-SuSE-Sequencer;X-Red-Hat-Base;
-+Exec=rosegarden %f
-+MimeType=audio/x-rosegarden-composition;audio/x-rosegarden-device;audio/x-rosegarden-project;audio/x-rosegarden-template;audio/midi;
-+Keywords=midi audio sequencer music notation score
-+X-KDE-NativeMimeType=audio/x-rosegarden-composition
-+Icon=rosegarden
-+Comment=MIDI and Audio Sequencer and Notation Editor
-+Comment[de]=MIDI- und Audio-Sequencer und Notensatzprogramm
-+Comment[es]=Secuenciador de MIDI y de audio y editor de partitura
-+Comment[fr]=Séquenceur MIDI/audio et éditeur de partitions
-+Comment[ru]=MIDI-секвенсер и нотный редактор
-+Terminal=false
-+Name=Rosegarden
-+GenericName=Sequencer and Notation Editor
-+GenericName[de]=Sequencer und Notensatzprogramm
-+GenericName[es]=Secuenciador y editor de partitura
-+GenericName[fr]=Séquenceur et éditeur de partitions
-+GenericName[ru]=секвенсер и нотный редактор
---- a/data/desktop/rosegarden.desktop
-+++ /dev/null
-@@ -1,20 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Application
--Categories=AudioVideo;Audio;Midi;Sequencer;X-SuSE-Sequencer;X-Red-Hat-Base;
--Exec=rosegarden %f
--MimeType=audio/x-rosegarden-composition;audio/x-rosegarden-device;audio/x-rosegarden-project;audio/x-rosegarden-template;audio/midi;
--X-KDE-NativeMimeType=audio/x-rosegarden-composition
--Icon=rosegarden
--Comment=MIDI and Audio Sequencer and Notation Editor
--Comment[de]=MIDI- und Audio-Sequencer und Notensatzprogramm
--Comment[es]=Secuenciador de MIDI y de audio y editor de partitura
--Comment[fr]=Séquenceur MIDI/audio et éditeur de partitions
--Comment[ru]=MIDI-секвенсер и нотный редактор
--Terminal=false
--Name=Rosegarden
--GenericName=Sequencer and Notation Editor
--GenericName[de]=Sequencer und Notensatzprogramm
--GenericName[es]=Secuenciador y editor de partitura
--GenericName[fr]=Séquenceur et éditeur de partitions
--GenericName[ru]=секвенсер и нотный редактор
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -36,7 +36,7 @@
-
-
- # Install desktop file
--install(FILES desktop/rosegarden.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-+install(FILES desktop/com.rosegardenmusic.rosegarden.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-
- # Install appdata file
- install(FILES appdata/rosegarden.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
diff --git a/debian/patches/fix-mime-types.patch b/debian/patches/fix-mime-types.patch
deleted file mode 100644
index 4d29c43..0000000
--- a/debian/patches/fix-mime-types.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Strip incorrect MIME types.
- Rosegarden is proposed as application to handle ogg,mp3,flac and wav files
- but it's not able to open them as expected.
-Author: Alessio Treglia <alessio at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592143
-Forwarded: no
----
- data/desktop/rosegarden.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/data/desktop/rosegarden.desktop
-+++ b/data/desktop/rosegarden.desktop
-@@ -3,7 +3,7 @@
- Type=Application
- Categories=AudioVideo;Audio;Midi;Sequencer;X-SuSE-Sequencer;X-Red-Hat-Base;
- Exec=rosegarden %f
--MimeType=audio/x-rosegarden-composition;audio/x-rosegarden-device;audio/x-rosegarden-project;audio/x-rosegarden-template;audio/x-wav;audio/midi;audio/ogg;audio/mp3;audio/x-flac;
-+MimeType=audio/x-rosegarden-composition;audio/x-rosegarden-device;audio/x-rosegarden-project;audio/x-rosegarden-template;audio/midi;
- X-KDE-NativeMimeType=audio/x-rosegarden-composition
- Icon=rosegarden
- Comment=MIDI and Audio Sequencer and Notation Editor
diff --git a/debian/patches/series b/debian/patches/series
index d65355b..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +0,0 @@
-fix-mime-types.patch
-desktop-file.patch
-appdata-format.patch
-appdata-location.patch
-svnheader.patch
diff --git a/debian/patches/svnheader.patch b/debian/patches/svnheader.patch
deleted file mode 100644
index bc587a7..0000000
--- a/debian/patches/svnheader.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix svnversion.h dependency to permit parallel building
- With CMake 3.9.1 and parallel building enabled, the incorrect specification
- of the output filename when creating svnversion.h can lead to a race condition
- such that the package fails to build.
-Author: Stuart Prescott <stuart at debian.org>
-Bug: https://sourceforge.net/p/rosegarden/bugs/1552/
-Bug-Debian: https://bugs.debian.org/871213
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -810,7 +810,7 @@
- add_custom_target(svnheader ALL DEPENDS svn_header) # svn_header never gets created, it's just a unique string
-
- # creates svnheader.h using cmake script
--add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnheader.h
-+add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
- COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
- -P ${CMAKE_CURRENT_SOURCE_DIR}/buildkey.cmake)
-
--
rosegarden packaging
More information about the pkg-multimedia-commits
mailing list