patch::: 1.4.4.stable.jcn2

1.4.4.stable.jcn2
---
Generated by janneke@gnu.org,
From = lilypond-1.4.4.stable.jcn1, To = lilypond-1.4.4.stable.jcn2

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.4.4.stable.jcn2.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index a24a79ed303adb99b9447a1def3b32c6298707c6..1232e3a3e4733ff2f4dc09934d0ff8f4607316e0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
-1.4.4.jcn3
+--- ../lilypond-1.4.4.stable.jcn1/CHANGES      Fri Jun 29 18:23:09 2001
+++ b/CHANGES   Sun Jul  8 18:51:34 2001
+@@ -1,5 +1,7 @@
+-1.4.4.stable.jcn1
+1.4.4.stable.jcn2
+ =================
+
+* Now really included lexer-gcc-3.0.patch.
+ 
+ * Added feature to ly2dvi to find feta pfa font files used in a
+ postscript file to make printing of direct postscript a bit easier:1.4.4.jcn3
 ==========
 
 TODO: look at other filledbox'es (stafflines and barlines don't match up).

diff --git a/GNUmakefile.in b/GNUmakefile.in
index faadd6c792e47fac62c6806da633c2d0cf0f8926..6240b6bcc96cad8536063a124de32f8f3e0f00c8 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -20,7 +20,7 @@ SCRIPTS = configure aclocal.m4
 README_FILES =  DEDICATION COPYING NEWS CHANGES ROADMAP
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch mktexnam.patch
+EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch mktexnam.patch lexer-gcc-3.0.patch
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(configuration) VERSION

diff --git a/VERSION b/VERSION
index 3d99896e43e69759d151b75cdd7283cc754132e6..a0fd11c14cc8e2594ec81f42532a236f11d2b151 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=4
-MY_PATCH_LEVEL=jcn4
+MY_PATCH_LEVEL=stable.jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lexer-gcc-3.0.patch b/lexer-gcc-3.0.patch
new file mode 100644 (file)
index 0000000..fedefc2
--- /dev/null
+++ b/lexer-gcc-3.0.patch
@@ -0,0 +1,11 @@
+--- ./lily/out-gcc-3.0/lexer.cc~       Tue Jun 26 13:12:26 2001
++++ ./lily/out-gcc-3.0/lexer.cc        Tue Jun 26 13:11:56 2001
+@@ -21,7 +21,7 @@
+ #ifdef __cplusplus
+ 
+ #include <stdlib.h>
+-class istream;
++#include <iostream.h>
+ #include <unistd.h>
+ 
+ /* Use prototypes in function declarations. */