From 14b7d1cc2f68417ded11b0a09907a4dd9196af63 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 8 Jul 2001 18:51:34 +0200
Subject: [PATCH] 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
---
 CHANGES             | 12 +++++++++++-
 GNUmakefile.in      |  2 +-
 VERSION             |  2 +-
 lexer-gcc-3.0.patch | 11 +++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 lexer-gcc-3.0.patch

diff --git a/CHANGES b/CHANGES
index a24a79ed30..1232e3a3e4 100644
--- 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 faadd6c792..6240b6bcc9 100644
--- 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 3d99896e43..a0fd11c14c 100644
--- 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
index 0000000000..fedefc258c
--- /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. */
-- 
2.39.5