update AppData PR patch
authormirabilos <tg@debian.org>
Thu, 2 May 2019 14:45:48 +0000 (16:45 +0200)
committermirabilos <mirabilos@evolvis.org>
Thu, 2 May 2019 14:45:48 +0000 (16:45 +0200)
drop local fixup as it was squashed into upstream’s, finally

debian/patches/experiments/fixup-AppData.diff [deleted file]
debian/patches/experiments/update-AppData.diff
debian/patches/series

diff --git a/debian/patches/experiments/fixup-AppData.diff b/debian/patches/experiments/fixup-AppData.diff
deleted file mode 100644 (file)
index ba163cc..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fixup AppData update…
-Author: mirabilos <tg@debian.org>
-Forwarded: https://github.com/musescore/MuseScore/pull/4070
-Last-Update: 2019-04-17
-
---- a/build/Linux+BSD/org.musescore.MuseScore.appdata.xml.in
-+++ b/build/Linux+BSD/org.musescore.MuseScore.appdata.xml.in
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2018 Werner Schweer and others -->
- <component type="desktop-application">
--  <id>org.musescore.MuseScore</id>
-+  <id>org.musescore.MuseScore@MSCORE_INSTALL_SUFFIX@</id>
-   <translation type="qt">mscore</translation>
-   <name>MuseScore</name>
-   <summary>Create, playback, and print sheet music for free</summary>
-@@ -219,7 +219,7 @@
-     <release date="2017-05-02" version="2.1.0"/>
-   </releases>
-   <provides>
--    <id>mscore.desktop</id>
-+    <id>mscore@MSCORE_INSTALL_SUFFIX@.desktop</id>
-   </provides>
-   <launchable type="desktop-id">mscore@MSCORE_INSTALL_SUFFIX@.desktop</launchable>
-   <update_contact>jurf_AT_riseup.net</update_contact>
index c9ee73b..280c760 100644 (file)
@@ -8,10 +8,11 @@ Description: Update AppData
  - Add a provides id to match instances still using the old AppID
  - Clean out empty entries in OARS, update to include donations
  - Reduce vertical space usage
- - Add 3.x release notes
+ - Add 3.x release notes [removed from this branch]
+ - [Drop things not applicable for this branch’s 2.x packaging]
 Author: Juraj Fiala <jurf@riseup.net>
 Forwarded: https://github.com/musescore/MuseScore/pull/4070
-Last-Update: 2019-04-17
+Last-Update: 2019-05-02
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -31,7 +32,7 @@ Last-Update: 2019-04-17
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!-- Copyright 2018 Werner Schweer and others -->
 +<component type="desktop-application">
-+  <id>org.musescore.MuseScore</id>
++  <id>org.musescore.MuseScore@MSCORE_INSTALL_SUFFIX@</id>
 +  <translation type="qt">mscore</translation>
 +  <name>MuseScore</name>
 +  <summary>Create, playback, and print sheet music for free</summary>
@@ -249,7 +250,7 @@ Last-Update: 2019-04-17
 +    <release date="2017-05-02" version="2.1.0"/>
 +  </releases>
 +  <provides>
-+    <id>mscore.desktop</id>
++    <id>mscore@MSCORE_INSTALL_SUFFIX@.desktop</id>
 +  </provides>
 +  <launchable type="desktop-id">mscore@MSCORE_INSTALL_SUFFIX@.desktop</launchable>
 +  <update_contact>jurf_AT_riseup.net</update_contact>
index 7c7b18f..98192dd 100644 (file)
@@ -8,9 +8,8 @@ upstream/testsuite.diff
 upstream/better-batch-convert.diff
 upstream/new-manpage.diff
 upstream/mtest-fix-freetype-includes.diff
-experiments/lyrics-hyphen-max-8sp.diff
 experiments/update-AppData.diff
-experiments/fixup-AppData.diff
 debian-specific/fixup-AppData.diff
+experiments/lyrics-hyphen-max-8sp.diff
 experiments/musescore-2.1.0-qt-5.12.patch
 experiments/revert-restriking-patch.diff