mark as applied upstream (already in the experimental branch)
authormirabilos <tg@debian.org>
Thu, 2 May 2019 14:29:56 +0000 (16:29 +0200)
committermirabilos <mirabilos@evolvis.org>
Thu, 2 May 2019 14:29:56 +0000 (16:29 +0200)
debian/patches/series
debian/patches/upstream/mtest-fix-freetype-includes.diff [moved from debian/patches/experiments/mtest-fix-freetype-includes.diff with 97% similarity]

index bc016e3..46956b5 100644 (file)
@@ -8,8 +8,8 @@ upstream/save-locale-dependent-preferences.diff
 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/mtest-fix-freetype-includes.diff
 experiments/update-AppData.diff
 experiments/fixup-AppData.diff
 debian-specific/fixup-AppData.diff
@@ -1,6 +1,7 @@
 Description: Use system includes also for mtest
 Author: mirabilos <tg@debian.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/4143
+Applied-Upstream: master, commit:5d889d7f3
 
 --- a/mtest/CMakeLists.txt
 +++ b/mtest/CMakeLists.txt