Remove patches, no longer needed since 2013-12-13 (commit 6650aef)

diff --git a/debian/patches/fix_bison_parser_generation_rules b/debian/patches/fix_bison_parser_generation_rules
deleted file mode 100644 (file)
index dc0c63e..0000000
--- a/debian/patches/fix_bison_parser_generation_rules
+++ /dev/null
@@ -1,63 +0,0 @@
-From 42cb7d446827dce32a42b5b243bda522518b3d46 Mon Sep 17 00:00:00 2001
-From: Julien Rioux <julien.rioux@gmail.com>
-Date: Mon, 2 Sep 2013 10:41:50 +0200
-Subject: [PATCH] Keep bison-generated files in sync.
-
-Use a single rule to build header and source files from
-the syntax file, thus avoiding any possibility to have
-`make' rebuild one but not the other, which might happen
-if the syntax and target files have almost the same but
-slightly differing timestamps.
-
-See http://www.mail-archive.com/bug-lilypond@gnu.org/msg37081.html
-
-Fixes issue 3528: Keep bison-generated files in sync.
-http://code.google.com/p/lilypond/issues/detail?id=3528
----
- stepmake/stepmake/c++-rules.make |  9 ++-------
- stepmake/stepmake/c-rules.make   | 10 ++--------
- 2 files changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
-index a368f4f..8de00bc 100644
---- a/stepmake/stepmake/c++-rules.make
-+++ b/stepmake/stepmake/c++-rules.make
-@@ -12,13 +12,8 @@ $(outdir)/%.lo: %.cc
- $(outdir)/%.lo: $(outdir)/%.cc
-       $(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
- 
--$(outdir)/%.cc: %.yy
--      $(BISON) -o $@  $<
--
--$(outdir)/%.hh: %.yy
--      $(BISON) -o $(subst .hh,-tmp.cc,$@) -d  $<
--      rm $(subst .hh,-tmp.cc,$@)
--      mv $(subst .hh,-tmp.hh,$@) $@
-+$(outdir)/%.cc $(outdir)/%.hh: %.yy
-+      $(BISON) -d -o $(outdir)/$*.cc $<
- 
- $(outdir)/%.cc: %.ll
-       $(FLEX) -Cfe -p -p -o$@ $<
-diff --git a/stepmake/stepmake/c-rules.make b/stepmake/stepmake/c-rules.make
-index 620275b..954e7a3 100644
---- a/stepmake/stepmake/c-rules.make
-+++ b/stepmake/stepmake/c-rules.make
-@@ -12,14 +12,8 @@ $(outdir)/%.lo: %.c
- $(outdir)/%.lo: %.c
-       $(DO_LO_DEP) $(CC) -c $(ALL_CFLAGS) $(PIC_FLAGS) -o $@ $<
- 
--$(outdir)/%.c: %.y
--      $(BISON) $<
--      mv $(*F).tab.c $@
--
--$(outdir)/%.h: %.y
--      $(BISON) -d $<
--      mv $(*F).tab.h $@
--      rm -f $(*F).tab.c # if this happens in the wrong order it triggers recompile of the .cc file
-+$(outdir)/%.c $(outdir)/%.h: %.y
-+      $(BISON) -d -o $(outdir)/$*.c $<
- 
- $(outdir)/%.c: %.l
-       $(FLEX) -Cfe -p -p -o$@ $<
--- 
-1.8.4.rc3

diff --git a/debian/patches/fix_freetype_inclusions b/debian/patches/fix_freetype_inclusions
deleted file mode 100644 (file)
index faabd1a..0000000
--- a/debian/patches/fix_freetype_inclusions
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/lily/freetype.cc
-+++ b/lily/freetype.cc
-@@ -20,6 +20,9 @@
- #include "freetype.hh"
- #include "warn.hh"
- 
-+#include FT_OUTLINE_H
-+#include FT_BBOX_H
-+
- FT_Library freetype2_library;
- 
- void
---- a/lily/freetype-error.cc
-+++ b/lily/freetype-error.cc
-@@ -31,7 +31,7 @@
-   const char *err_msg;
- } ft_errors[] =
- 
--#include <freetype/fterrors.h>
-+#include FT_ERRORS_H
- 
-   ;
- 
---- a/lily/open-type-font.cc
-+++ b/lily/open-type-font.cc
-@@ -23,7 +23,7 @@
- 
- using namespace std;
- 
--#include <freetype/tttables.h>
-+#include FT_TRUETYPE_TABLES_H
- 
- #include "dimensions.hh"
- #include "international.hh"
---- a/lily/pango-font.cc
-+++ b/lily/pango-font.cc
-@@ -22,7 +22,7 @@
- #define PANGO_ENABLE_BACKEND
- 
- #include <pango/pangoft2.h>
--#include <freetype/ftxf86.h>
-+#include FT_XFREE86_H
- 
- #include <map>
- #include <cstdio>
---- a/lily/ttf.cc
-+++ b/lily/ttf.cc
-@@ -20,7 +20,7 @@
- #include <cstdio>
- #include "freetype.hh"
- 
--#include <freetype/tttables.h>
-+#include FT_TRUETYPE_TABLES_H
- 
- #include "international.hh"
- #include "memory-stream.hh"