*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index b5d85cb7d198823230140215de0fe6cffdcea363..6069655a68fd3326dae49b88dbebeca851a841a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-12  Karl Hammar  <karl@aspodata.se>
+
+       * GNUmakefile.in (local-WWW-post): `find ...` overflows the
+       cmdline, use xargs instead (backportme)
+
 2004-11-10  Andreas Scherer  <andreas_mutopia@freenet.de>
        
        * Documentation/user/: Numerous fixes in the user manual.
@@ -8,6 +13,8 @@
        context-id, surround by \new Voice if not found. Fixes:
        addlyrics-second-staff.ly
 
+       * VERSION: 2.5.0 released.
+       
 2004-11-12  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/index.html.in: Fix url to one big page.  (backportme)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index c60180d4b5fe13b9c1be0e8763c1c4d9ad34a52c..ca30d735f28ba38f2cdcdc072dbfb4fa750fc885 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -67,12 +67,13 @@ final-install:
 
 web-ext = gz html midi pdf png txt ly
 
-footify = MAILADDRESS=bug-lilypond@gnu.org  $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+footifymail = MAILADDRESS=bug-lilypond@gnu.org
 
 local-WWW-post:
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
-       cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
-       cd $(builddir) && rm -f `find . -name \*.html~ -print`
+       cd $(builddir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
+       cd $(builddir) && find . -name \*.html~ -print | xargs rm -f
        cd $(builddir) && find Documentation input \
                $(web-ext:%=-path '*/out-www/*.%' -or) -false \
                > $(outdir)/weblist

diff --git a/THANKS b/THANKS
index 016e63f80528630089fee958ada7ee028e29714d..1fb10344874cf54dd4ecc7af1e6992612cb3d479 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,30 @@ Carl Sorensen
 BUG HUNTERS/SUGGESTIONS
 
 
+Release 2.5
+***********
+
+
+DEVELOPMENT TEAM
+
+Han-Wen Nienhuys  - Core development
+Jan Nieuwenhuizen - Core development
+Erik Sandberg     - Bug Meister
+Pedro Kroger      - Build Meister
+Graham Percival   - Documentation Editor
+
+CONTRIBUTORS
+
+Werner Lemberg
+Heikki Junes
+
+BUG HUNTERS/SUGGESTIONS
+
+Fernando Pablo Lopez-Lezcano
+Jack O'Quin
+Karl Hammar
+
+
 Release 2.4
 ***********
 

diff --git a/lily/include/guile-compatibility.hh b/lily/include/guile-compatibility.hh
index 13a160733c3661c695131ef1a644bc8ee62d3c91..6dd1bea91962ffcc9946c713b7279aa8387ee651 100644 (file)
--- a/lily/include/guile-compatibility.hh
+++ b/lily/include/guile-compatibility.hh
@@ -55,6 +55,7 @@ inline bool ly_c_boolean_p (SCM x) { return SCM_BOOLP (x); }
 inline bool ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); }
 #define scm_is_eq(x,y)  (SCM_EQ_P((x), (y)))
 
+#define scm_c_string_length(x) SCM_STRING_LENGTH(x)
 #define scm_is_pair(x) (SCM_CONSP(x))