X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fpatches%2Fuse_cstring_and_ctype_includes;h=fa25d0dc2edd26b490413dace7183f4c9404f9b4;hb=f94e2ee62c8915158af82047acaf49b6165bf88a;hp=d61661af9b50baa50347fbcce6d8b535f26d9b6b;hpb=9f6d0fb4a06f79989101ebfd22efdfb9013ab32b;p=lilypond.git

diff --git a/debian/patches/use_cstring_and_ctype_includes b/debian/patches/use_cstring_and_ctype_includes
index d61661af9b..fa25d0dc2e 100644
--- a/debian/patches/use_cstring_and_ctype_includes
+++ b/debian/patches/use_cstring_and_ctype_includes
@@ -2,8 +2,8 @@ Description: Include missing cstring include files
 Forwarded: 
 Origin: vendor
 Author: Don Armstrong <don@debian.org>
---- lilypond-2.18.0.orig/lily/midi-stream.cc
-+++ lilypond-2.18.0/lily/midi-stream.cc
+--- a/lily/midi-stream.cc
++++ b/lily/midi-stream.cc
 @@ -18,7 +18,7 @@
  */
  
@@ -13,8 +13,8 @@ Author: Don Armstrong <don@debian.org>
  #include <cerrno>
  using namespace std;
  
---- lilypond-2.18.0.orig/lily/piano-pedal-engraver.cc
-+++ lilypond-2.18.0/lily/piano-pedal-engraver.cc
+--- a/lily/piano-pedal-engraver.cc
++++ b/lily/piano-pedal-engraver.cc
 @@ -38,6 +38,7 @@
  #include "item.hh"
  
@@ -23,19 +23,18 @@ Author: Don Armstrong <don@debian.org>
  
  #include <string.h>
  
---- lilypond-2.18.0.orig/lily/prob.cc
-+++ lilypond-2.18.0/lily/prob.cc
-@@ -22,7 +22,7 @@
+--- a/lily/prob.cc
++++ b/lily/prob.cc
+@@ -22,6 +22,7 @@
  #include "item.hh"
  #include "input.hh"
  #include "profile.hh"
--
 +#include <cstring>
- #include "ly-smobs.icc"
  
- IMPLEMENT_SMOBS (Prob);
---- lilypond-2.18.0.orig/lily/relocate.cc
-+++ lilypond-2.18.0/lily/relocate.cc
+ 
+ const char * const Prob::type_p_name_ = "ly:prob?";
+--- a/lily/relocate.cc
++++ b/lily/relocate.cc
 @@ -23,8 +23,10 @@
  
  /* TODO: autoconf support */
@@ -47,8 +46,8 @@ Author: Don Armstrong <don@debian.org>
  
  #if HAVE_GETTEXT
  #include <libintl.h>
---- lilypond-2.18.0.orig/lily/source-file.cc
-+++ lilypond-2.18.0/lily/source-file.cc
+--- a/lily/source-file.cc
++++ b/lily/source-file.cc
 @@ -24,7 +24,7 @@
  #endif /* GCC_MAJOR < 4 */
  
@@ -58,8 +57,8 @@ Author: Don Armstrong <don@debian.org>
  #include "config.hh"
  
  #include <cstdio>
---- lilypond-2.18.0.orig/lily/translator.cc
-+++ lilypond-2.18.0/lily/translator.cc
+--- a/lily/translator.cc
++++ b/lily/translator.cc
 @@ -18,7 +18,7 @@
  */