From 7fb17937c5ba5aa779b2a1a8040403ee446c6b7b Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 17 Oct 1999 14:45:16 +0200
Subject: [PATCH] patch::: 1.2.14.jcn1

14.jcn1
	- bf: don't fail on error in doco package
	- doco package: noarch
	- bf: standchen: mutopia prep
---
 CHANGES                         |  5 +++++
 VERSION                         |  2 +-
 make/lilypond.spec.in           |  7 ++++---
 mutopia/F.Schubert/standchen.ly | 25 +++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2463a44bc1..3c07949e2c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+14.jcn1
+	- bf: don't fail on error in doco package
+	- doco package: noarch
+	- bf: standchen: mutopia prep
+
 13.jcn2,3
 	- mutopia/J.S.Bach/Petites-Preludes: bf's and mutopia preraration
 	- separate documentation package
diff --git a/VERSION b/VERSION
index 03cfb77373..273303e4f0 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
 PATCH_LEVEL=14
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 2733a9d9bc..30d2c85045 100644
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -17,6 +17,7 @@ Prereq: tetex
 %package documentation
 Summary: Prebuilt website containing all LilyPond documentation.
 Group: Applications/Publishing
+BuildArchitectures: noarch
 
 %description documentation
 @BLURB@
@@ -57,10 +58,10 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
 #%install documentation
 #line 63: second %install
 # again, make sure that main package installs even if doco fails
-mkdir -p htmldocs
-tar -C htmldocs -xzf out/htmldoc.tar.gz
+mkdir -p htmldocs/out
+tar -C htmldocs -xzf out/htmldoc.tar.gz || true
 mkdir -p out/examples/
-tar -cf - input/  | tar -C out/examples/ -xf-
+tar -cf - input/  | tar -C out/examples/ -xf- || true
 
 %post
 
diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly
index 51b3ba5798..627d3cc47a 100644
--- a/mutopia/F.Schubert/standchen.ly
+++ b/mutopia/F.Schubert/standchen.ly
@@ -1,5 +1,14 @@
 \header{
 filename =	 "standchen.ly";
+%
+% From the album:
+% Schubert-Lieder
+% Edition Schott No. 608
+% Without date, but makes mention of
+% ``Jubil"aums-Ausgabe zum 100. Todestage'' ie, 1928
+%
+% page 60
+%
 title    = "St\\\"andchen";
 subtitle = "(Serenade)\\\\``Leise flehen meine Lieder''";
 opus =	 "D. 957 No. 4";
@@ -8,6 +17,22 @@ composer =	 "Franz Schubert (1797-1828)";
 poet=	 "Text by Ludwig Rellstab (1799-1860)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
+
+  % mutopia headers.
+  mutopiatitle = "St\\\"andchen";
+  mutopiasubtitle = "(Serenade)\\\\``Leise flehen meine Lieder''";
+  mutopiacomposer = "Franz Schubert (1797-1828)";
+  mutopiapoet = "Ludwig Rellstab (1799-1860)";
+  mutopiaopus = "D. 957 No. 4";
+  mutopiainstrument = "Piano";
+  style = "Romantic";
+  copyright = "Public Domain";
+  tagline =    "\\\\This music is part of the Mutopia project, http://sca.uwater
+loo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by Jan Nieuwenhuizen.\\\\Unrestricted modification and redistribution is permitted and enc
+ouraged - copy this music and share it!";
+  maintainer = "janneke@gnu.org";
+  lastupdated = "1999/Oct/17";
+
 } 
 
 %{
-- 
2.39.5