patch::: 1.0.1.jcn1: Re: Lillypond and the Leeds Electronic Music group

pl 1.jcn1
	- www.digicash.com www.xs4all.nl
	- fake msgfmt
	- make uninstall fixes

diff --git a/Documentation/README-W32.yo b/Documentation/README-W32.yo
index 1523309d65fdfbadbcbdefd5eea0488e37eb6b3c..506be7899af580a34730d900d6f925d303a3a609 100644 (file)
--- a/Documentation/README-W32.yo
+++ b/Documentation/README-W32.yo
@@ -380,7 +380,7 @@ spaces.  And then place it in the bash shell path by editing
 $CYGFS/cygnus.bat.
 
 subsubsect(Yodl Document Language) 
-lurl(http://www.digicash.com/~jan/yodl/)
+lurl(http://www.xs4all.nl/~jantien/yodl/)
 
 Yodl for documentation in Lilypond.  It is currently being updated by
 Jan Nieuwenhuizen.  The development methodology of em(Yodl) as well as
@@ -413,7 +413,7 @@ em(lilypond).
                                    
 itemize(
 it() download the package from
-lurl(http://www.digicash.com/~jan/yodl/) to
+lurl(http://www.xs4all.nl/~jantien/yodl/) to
 file($HOME/usr/src/releases).
 it() From a bash shell, cd file($HOME/usr/src).
 it() tar zxf releases/yodl-em(<version>).tar.gz 

diff --git a/Documentation/links.yo b/Documentation/links.yo
index acabea0e7b887f8e4921a845faef9b37f788ea88..d0b9a87ca7c3fbb18b181883e87f2e133d954aa3 100644 (file)
--- a/Documentation/links.yo
+++ b/Documentation/links.yo
@@ -12,7 +12,7 @@ nsubsect(LilyPond)
 
 description(
 dit(lurl(http://www.cs.uu.nl/people/hanwen/lilypond/))Han-Wen's site.
-dit(lurl(http://www.digicash.com/~jan/lilypond/))Jan's site.
+dit(lurl(http://www.xs4all.nl/~jantien/lilypond/))Jan's site.
 dit(lurl(http://sca.uwaterloo.ca/lilypond/))The canadian mirror
 (thanks, Eric!)
 )
@@ -26,7 +26,7 @@ dit(lurl(http://www.gnu.org/))
 dit(lurl(http://www.zib.de/Visual/software/doc++/index.html))
     The documentation system for C++ sources, which is used for the
     LilyPond sources.
-dit(lurl(http://www.digicash.com/~jan/yodl/index.html))
+dit(lurl(http://www.xs4all.nl/~jantien/yodl/index.html))
     LilyPond documentation is in Yodl.  You'll need a recent
     development version from 
     lurl(ftp://pcnov095.win.tue.nl/pub/yodl/development).

diff --git a/Documentation/man/lilypond.yo b/Documentation/man/lilypond.yo
index c027f6c6f549f420e59df237d0b96000345bc01b..b0bb0316ae13ea529043dc7938841a39e306fd4f 100644 (file)
--- a/Documentation/man/lilypond.yo
+++ b/Documentation/man/lilypond.yo
@@ -247,5 +247,5 @@ itemize(
 it()nemail(Han-wen Nienhuys)(hanwen@cs.uu.nl)
     lurl(http://www.cs.uu.nl/people/hanwen)
 it()nemail(Jan Nieuwenhuizen)(janneke@gnu.org)
-    lurl(http://www.digicash.com/~jan)
+    lurl(http://www.xs4all.nl/~jantien)
 )

diff --git a/Documentation/man/mi2mu.yo b/Documentation/man/mi2mu.yo
index 85decf245a3ced0ca83e9050e768e5dde50936c5..14d3d7d3b4af840eac03a81364f28f15c94905e6 100644 (file)
--- a/Documentation/man/mi2mu.yo
+++ b/Documentation/man/mi2mu.yo
@@ -86,5 +86,5 @@ manpageauthor()
 Please consult the documentation file file(AUTHORS) for more detailed
 information, and small contributions. 
 
-nemail(Jan Nieuwenhuizen)(janneke@gnu.org), lurl(http://www.digicash.com/~jan)
+nemail(Jan Nieuwenhuizen)(janneke@gnu.org), lurl(http://www.xs4all.nl/~jantien)
 

diff --git a/Documentation/topdocs/AUTHORS.yo b/Documentation/topdocs/AUTHORS.yo
index b1c6ec64bd74a64061618461cde836cc9fc73c66..4db956cde2b50628720f112938040f45d285dd10 100644 (file)
--- a/Documentation/topdocs/AUTHORS.yo
+++ b/Documentation/topdocs/AUTHORS.yo
@@ -27,7 +27,7 @@ it()nemail(Han-Wen Nienhuys)(hanwen@cs.uu.nl),
     nl()
     Main author.
 it()nemail(Jan Nieuwenhuizen)(janneke@gnu.org), 
-    lurl(http://www.digicash.com/~jan)
+    lurl(http://www.xs4all.nl/~jantien)
     nl()
     Main author
 it()nemail(Alexandre Oliva)(oliva@dcc.unicamp.br), 

diff --git a/NEWS b/NEWS
index 9decb579073a9a3f2392ca4b648e27e33ce5e66b..ce7487d7af5ecdc6d636cf3e1dcc32112784735c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+pl 1.jcn1
+       - www.digicash.com www.xs4all.nl
+       - fake msgfmt
+       - make uninstall fixes
 
 pl 1
        - mi2mu fix: \key "D"

diff --git a/VERSION b/VERSION
index 522667c82e68199bfcaa0644c48fa49306db242e..086a3d5dbeb0a358b943255211e346ea098ed761 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=1
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches, always empty for released version:
 # please don't move these comments up; the patch should fail if 

diff --git a/aclocal.m4 b/aclocal.m4
index 0f54b68df8b877e0ac02d4f08e78a27ecd618f05..5f282f05b1f5a90003d36e224be2d7254db5b599 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -350,17 +350,21 @@ AC_DEFUN(AC_STEPMAKE_MAN, [
 ])
 
 AC_DEFUN(AC_STEPMAKE_MSGFMT, [
-    AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    AC_CHECK_PROGS(MSGFMT, msgfmt, \$(SHELL) \$(step-bindir)/fake-msgfmt.sh)
     AC_MSG_CHECKING(whether msgfmt accepts -o)
     msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`"
     if test "$msgfmt_output" = ""; then
        AC_MSG_RESULT(yes)
     else
        # urg
-       MSGFMT="touch $@; echo "
+       MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh)"
        AC_MSG_RESULT(no)
        AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
     fi
+    if test ! -n "$MSGFMT"; then
+       AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
+    fi
 ])
 
 AC_DEFUN(AC_STEPMAKE_TEXMF, [

diff --git a/init/score-paper.ly b/init/score-paper.ly
index f0e4783822fc62a83673efee328f3c1de844cf5c..f4e170a732e720a4351d4e59cd779dc90010b90f 100644 (file)
--- a/init/score-paper.ly
+++ b/init/score-paper.ly
@@ -2,7 +2,7 @@
 
 \paper { 
        % for simple testing only!
-       castingalgorithm = \Wordwrap; % lots faster on my 486 -- jcn
+%      castingalgorithm = \Wordwrap; % lots faster on my 486 -- jcn
 Staff = \translator {
        \type "Hara_kiri_line_group_engraver";
 

diff --git a/lily/VERSION b/lily/VERSION
index 522667c82e68199bfcaa0644c48fa49306db242e..086a3d5dbeb0a358b943255211e346ea098ed761 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=1
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches, always empty for released version:
 # please don't move these comments up; the patch should fail if 

diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index f6bbf4b1e313c4c5da20301e77acf69bfb248774..713e336d07bb4701169ad77bd1a63ffd09aa0093 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -58,3 +58,4 @@
 1.0.0.hwn1
 1.0.0.hwn2
 1.0.1
+1.0.1.jcn1

diff --git a/mutopia/Coriolan/Makefile b/mutopia/Coriolan/Makefile
index dc9e90a4722006f6e740eb95c6143cb41f880550..4363beefe852703da348cc453e364b3d39481b39 100644 (file)
--- a/mutopia/Coriolan/Makefile
+++ b/mutopia/Coriolan/Makefile
@@ -6,8 +6,8 @@ include $(depth)/make/Stepmake.make
 include $(make-dir)/Mutopia.make
 
 # do Coriolan if you have plenty RAM / CPU
-# examples=coriolan oboi-part viola-part
-examples= oboi-part viola-part
+examples=coriolan oboi-part viola-part
+# examples= oboi-part viola-part
 
 include $(stepdir)/WWW.make
 

diff --git a/po/Makefile b/po/Makefile
index d951b5a320af7b46af7513a16ba6ddde4639bfa4..e0c550371e308a8587e98ef440b0a6e37f1db917 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -27,6 +27,6 @@ localinstall: $(MO_FILES)
 localuninstall:
        for i in $(CATALOGS); do \
          rm -f $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
-         rmdir $(localedir)/$$i/LC_MESSAGES; \
+         rmdir $(localedir)/$$i/LC_MESSAGES || true; \
        done
 

diff --git a/stepmake/Documentation/topdocs/AUTHORS.yo b/stepmake/Documentation/topdocs/AUTHORS.yo
index e14f5d0a10126e8a16de16de8820b21aa87354e0..b8d45e1ae852a94ccad4a752f448e614b3957621 100644 (file)
--- a/stepmake/Documentation/topdocs/AUTHORS.yo
+++ b/stepmake/Documentation/topdocs/AUTHORS.yo
@@ -9,7 +9,7 @@ This file lists authors of StepMake, and what they wrote.
 nsect(AUTHORS)
 itemize(
 it()nemail(Jan Nieuwenhuizen)(janneke@gnu.org),
-    lurl(http://www.digicash.com/~jan)
+    lurl(http://www.xs4all.nl/~jantien)
     nl()
     Main author.
 it()nemail(Han-Wen Nienhuys)(hanwen@cs.uu.nl), 

diff --git a/stepmake/NEWS b/stepmake/NEWS
index f837a4f5720b5254e204fea0c90cf73f3744e13d..5d3ecc36f75eeef1e15f062b706e833f733c2f44 100644 (file)
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,3 +1,6 @@
+pl 42
+       - fake-msgfmt.sh; urg copied from fake-yodl
+
 pl 41
        - standard naming: _FILES
        - use install-sh

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 0f54b68df8b877e0ac02d4f08e78a27ecd618f05..5f282f05b1f5a90003d36e224be2d7254db5b599 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -350,17 +350,21 @@ AC_DEFUN(AC_STEPMAKE_MAN, [
 ])
 
 AC_DEFUN(AC_STEPMAKE_MSGFMT, [
-    AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    AC_CHECK_PROGS(MSGFMT, msgfmt, \$(SHELL) \$(step-bindir)/fake-msgfmt.sh)
     AC_MSG_CHECKING(whether msgfmt accepts -o)
     msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`"
     if test "$msgfmt_output" = ""; then
        AC_MSG_RESULT(yes)
     else
        # urg
-       MSGFMT="touch $@; echo "
+       MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh)"
        AC_MSG_RESULT(no)
        AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
     fi
+    if test ! -n "$MSGFMT"; then
+       AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
+    fi
 ])
 
 AC_DEFUN(AC_STEPMAKE_TEXMF, [

diff --git a/stepmake/bin/fake-msgfmt.sh b/stepmake/bin/fake-msgfmt.sh
new file mode 100644 (file)
index 0000000..1a97f8d
--- /dev/null
+++ b/stepmake/bin/fake-msgfmt.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+IDENTIFICATION=fake-msgfmt.sh
+
+OUTPUT='/dev/null'
+
+while getopts ':d:o:' OPT;
+do
+case $OPT in
+o)
+    OUTPUT=$OPTARG
+    ;;
+*)
+    ;;
+    esac
+done
+
+
+
+shift `expr $OPTIND - 1`
+#
+# Input file name
+#
+if [ "$1" = "" ]
+then
+  echo "$IDENTIFICATION: No input file name given"
+  exit 1
+fi
+
+echo Faking msgfmt: copying $1 to $OUTPUT
+
+
+cp $1 $OUTPUT

diff --git a/stepmake/stepmake/Installfiles.make b/stepmake/stepmake/Installfiles.make
index 93d4083fe2a7f4227d58817e420c021ced08ecaa..96b8ee76b19e109253d357bbe9a3f3c46b37c031 100644 (file)
--- a/stepmake/stepmake/Installfiles.make
+++ b/stepmake/stepmake/Installfiles.make
@@ -10,6 +10,6 @@ localinstall-files:
 localuninstall: localuninstall-files
 
 localuninstall-files:
-       $(foreach i,  $(INSTALLATION_FILES),
+       $(foreach i,  $(INSTALLATION_FILES),\
                rm -f $(INSTALLATION_DIR)/$(i) && ) true
        -rmdir $(INSTALLATION_DIR)