(PATCH_FILES): remove darwin.patch.

diff --git a/ChangeLog b/ChangeLog
index 2a9f2622fecdba7d39f371ea215e3672ab4b5e8c..4459c006c57aed83ba3d2ff58d555f9ca5c37aa8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-10-14  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * GNUmakefile.in (PATCH_FILES): remove darwin.patch.
+
        * lily/pango-font.cc (pango_item_string_stencil): more verbose message.
 
 2006-10-13  Erlend Aasland  <erlenda@gmail.com>

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 82294790c87b609f896aac8bfcb08b2215ce4baa..c0177ffa3355e538deb90ce9d75c0db4a2d413f3 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -22,7 +22,7 @@ TOPDOC_FILES=AUTHORS README INSTALL NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
 
-PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
+PATCH_FILES = emacsclient.patch server.el.patch 
 EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)

diff --git a/THANKS b/THANKS
index f7b33a3ba1d84696efe3f6052ccb5a1b4b80efe3..1539636c6a575d48b1f306094c775561c7d69443 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -31,12 +31,12 @@ Jamie Bullock
 Kieren MacMillan
 Michael Meixner 
 Paul Scott
+Rick Hansen
 Steve Doonan
 Trent Johnston
 Trevor Bača
 Vivian Barty-Taylor
 
-
 DOCUMENTATION HELPERS
 
 Cameron Horsburgh

diff --git a/darwin.patch b/darwin.patch
deleted file mode 100644 (file)
index fa69423..0000000
--- a/darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN stepmake/stepmake/c++-rules.make lilypond-2.7.11/stepmake/stepmake/c++-rules.make
---- stepmake/stepmake/c++-rules.make   2005-10-02 09:14:45.000000000 -0700
-+++ stepmake/stepmake/c++-rules.make   2005-10-02 09:15:10.000000000 -0700
-@@ -17,6 +17,7 @@
- 
- $(outdir)/%.cc: %.ll
-       $(FLEX) -Cfe -p -p -o$@ $<
-+      perl -i.bak -pe 's/^class istream;/#include <iostream>;\nusing namespace std;/' $@
- 
- $(outdir)/%-rc.o: $(outdir)/%.rc
-       $(WINDRES) $(WINDRES_FLAGS) -o$@ $<

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index ceb057e47dd798e0c363e1ba6fb0e2953a8a045d..54db6ccbe2286891da5c0174ac33aaef2f62cd6b 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -231,7 +231,7 @@ found."
 ;; list
 
 
-(define (list-join lst intermediate)
+(define-public (list-join lst intermediate)
   "put INTERMEDIATE  between all elts of LST."
   
   (reduce (lambda (elt prev)