squash these patches, we have delta anyway
authormirabilos <tg@debian.org>
Thu, 2 May 2019 14:39:37 +0000 (16:39 +0200)
committermirabilos <mirabilos@evolvis.org>
Thu, 2 May 2019 14:39:37 +0000 (16:39 +0200)
debian/patches/debian-specific/dfsg-exclusions-diffpatchmatch.diff [deleted file]
debian/patches/debian-specific/dfsg-exclusions.diff
debian/patches/series

diff --git a/debian/patches/debian-specific/dfsg-exclusions-diffpatchmatch.diff b/debian/patches/debian-specific/dfsg-exclusions-diffpatchmatch.diff
deleted file mode 100644 (file)
index a11adf1..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Remove excluded directory from build
-Author: mirabilos <tg@debian.org>
-Forwarded: not-needed
-Justification: not present in upstream git master
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -648,7 +648,7 @@ ADD_CUSTOM_TARGET(mops2 DEPENDS ${PCH})
- ##
- subdirs(
-       mscore  awl bww2mxml share midi audiofile fluid mstyle libmscore synthesizer
--      effects thirdparty/rtf2html thirdparty/diff thirdparty/beatroot
-+      effects thirdparty/rtf2html thirdparty/beatroot
-       thirdparty/xmlstream thirdparty/qzip thirdparty/kQOAuth
-       )
- string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE)
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -303,7 +303,6 @@ add_executable ( ${ExecutableName}
- target_link_libraries(mscore
-       awl
-       mstyle
--      diff_match_patch
-       bww
-       rtf2html
-       ${QTSINGLEAPPLICATION_LIBRARIES}
---- a/mscore/file.cpp
-+++ b/mscore/file.cpp
-@@ -81,7 +81,6 @@
- #include "omr/importpdf.h"
- #endif
--#include "diff/diff_match_patch.h"
- #include "libmscore/chordlist.h"
- #include "libmscore/mscore.h"
- #include "thirdparty/qzip/qzipreader_p.h"
index c6429c8..620c8db 100644 (file)
@@ -5,6 +5,15 @@ Justification: Debian-specific exclusion from distfile
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
+@@ -648,7 +648,7 @@ ADD_CUSTOM_TARGET(mops2 DEPENDS ${PCH})
+ ##
+ subdirs(
+       mscore  awl bww2mxml share midi audiofile fluid mstyle libmscore synthesizer
+-      effects thirdparty/rtf2html thirdparty/diff thirdparty/beatroot
++      effects thirdparty/rtf2html thirdparty/beatroot
+       thirdparty/xmlstream thirdparty/qzip thirdparty/kQOAuth
+       )
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE)
 @@ -659,7 +659,6 @@ else(APPLE AND CMAKE_BUILD_TYPE MATCHES
  add_subdirectory(mtest EXCLUDE_FROM_ALL)
  endif(APPLE AND CMAKE_BUILD_TYPE MATCHES "DEBUG")
@@ -13,6 +22,26 @@ Justification: Debian-specific exclusion from distfile
  add_subdirectory(miditools EXCLUDE_FROM_ALL)
  add_subdirectory(fonttools EXCLUDE_FROM_ALL)
  add_subdirectory(manual)
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -303,7 +303,6 @@ add_executable ( ${ExecutableName}
+ target_link_libraries(mscore
+       awl
+       mstyle
+-      diff_match_patch
+       bww
+       rtf2html
+       ${QTSINGLEAPPLICATION_LIBRARIES}
+--- a/mscore/file.cpp
++++ b/mscore/file.cpp
+@@ -81,7 +81,6 @@
+ #include "omr/importpdf.h"
+ #endif
+-#include "diff/diff_match_patch.h"
+ #include "libmscore/chordlist.h"
+ #include "libmscore/mscore.h"
+ #include "thirdparty/qzip/qzipreader_p.h"
 --- a/mscore/mediadialog.cpp
 +++ b/mscore/mediadialog.cpp
 @@ -24,7 +24,9 @@
index 46956b5..7c7b18f 100644 (file)
@@ -1,5 +1,4 @@
 debian-specific/dfsg-exclusions.diff
-debian-specific/dfsg-exclusions-diffpatchmatch.diff
 debian-specific/debundle-openssl.diff
 debian-specific/kfreebsd-oss-salsa.diff
 upstream/lyrics-hyphen-syllable-closer.diff