lilypond-0.0.76

diff --git a/flower/configure b/flower/configure
index 2a28860b95d8a708084760aef702e3e80834f7e6..5ede2662f7128080084f49c11f2d621b74afd3ad 100644 (file)
--- a/flower/configure
+++ b/flower/configure
@@ -898,7 +898,7 @@ done
 
 
 
-CXX="$ac_cv_prog_CXX" ../bin/make_version > out/version.hh
+CXX="$ac_cv_prog_CXX" ../bin/make-version > out/version.hh
 
 trap '' 1 2 15
 cat > confcache <<\EOF

diff --git a/flower/configure.in b/flower/configure.in
index e58f93f485336f7552a29e939e76d4df7acc382f..cac84bdbb757d89374808c6eedf61d370a6533f6 100644 (file)
--- a/flower/configure.in
+++ b/flower/configure.in
@@ -35,7 +35,7 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(memmem snprintf )
 AC_CONFIG_HEADER(out/config.hh:config.hh.in)
 
-CXX="$ac_cv_prog_CXX" ../bin/make_version > out/version.hh
+CXX="$ac_cv_prog_CXX" ../bin/make-version > out/version.hh
 
 AC_OUTPUT(out/Flower-flags.make:Flower-flags.make.in)
 

diff --git a/make/Makefile b/make/Makefile
index 95dd3acafee72ac4474dc5bc3526b0d6fafe680f..804cad1e9b16acfd13fa75d7e8c877a084076b33 100644 (file)
--- a/make/Makefile
+++ b/make/Makefile
@@ -40,13 +40,16 @@ include ./$(depth)/make/Rules.make
 
 spec: $(outdir)/lilypond.spec
 
-rpmdocs=$(addprefix Documentation/out/, $(notdir $(shell ls $(depth)/Documentation/$(outdir)/*.text)))
+rpmdocs=$(addprefix Documentation/out/, $(notdir $(shell ls $(depth)/Documentation/$(outdir)/*.text)))\
+       BUGS TODO NEWS DEDICATION ANNOUNCE README
+rpmmudocs=$(addprefix Documentation/out/, $(notdir $(shell ls $(depth)/Documentation/*.doc)))
+rpmdvis=$(rpmmudocs:.doc=.dvi)
 rpmexamples= $(addprefix input/, $(notdir $(shell ls $(depth)/input/*.{ly,tex})))
 
 
 sed-version= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
 sed-date=sed 's!@DATE@!${date}!g'
-sed-examples = sed 's!@EXAMPLE_LYS@!${rpmexamples}!g'
+sed-examples = sed 's!@EXAMPLE_LYS@!${rpmexamples} ${rpmdvis}!g'
 sed-docs=sed 's!@TEXT_DOCS@!${rpmdocs}!g'
 
 $(outdir)/lilypond.spec: lilypond.spec.in $(depth)/.version

diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in
index b4949cdb0f41a00429ec666992f5595b259656fa..d16767ea68bfe1330293d446795206229dce60f5 100644 (file)
--- a/make/Toplevel.make.in
+++ b/make/Toplevel.make.in
@@ -26,14 +26,14 @@ include ./$(depth)/make/Variables.make
 
 # descent order into subdirectories:
 #
-SUBDIRS = mf flower lib lily mi2mu \
+SUBDIRS = flower lib lily mi2mu \
        Documentation bin init input tex make
 #
 
 # list of distribution files:
 #
 SCRIPTS = configure configure.in install-sh
-README_FILES = ANNOUNCE COPYING NEWS README TODO INSTALL.text AUTHORS.text
+README_FILES = BUGS DEDICATION ANNOUNCE COPYING NEWS README TODO INSTALL.text AUTHORS.text
 EXTRA_DISTFILES=  .dstreamrc .version $(README_FILES) $(SCRIPTS) $(SYMLINKS)
 
 # do not dist ./Makefile (is copied from make/Toplevel.make)

diff --git a/make/lilypond.spec b/make/lilypond.spec
index 91029f1173a5224da9ba93cda1f0637090e3f6f4..6e271cb10861007cb596e85824689942a619885a 100644 (file)
--- a/make/lilypond.spec
+++ b/make/lilypond.spec
@@ -1,21 +1,21 @@
 Name: lilypond
-Version: 0.0.75
+Version: 0.0.76
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.0.75.tar.gz
+Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.0.76.tar.gz
 Summary: A preprocessor to make TeX typeset music.
 URL: http://www.stack.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@stack.nl>
-Icon: lelie_icon.xpm
+Icon: lelie_icon.gif
 Buildroot: /tmp/lilypond_build
 
 %description
-GNU LilyPond is a program which converts a music-script
-(mudela) into TeX output, or MIDI to produce multi-staff
-scores. Features include multiple meters, clefs, keys, lyrics,
-versatile input-language, cadenzas beams, slurs, triplets, multiple
-voices.
+GNU LilyPond which converts music definition files into visual or
+audio output: it can typeset formatted sheet music to a TeX file and
+and (mechanical) performances to MIDI files. Features include multiple
+meters, clefs, keys, lyrics, versatile input-language, cadenzas
+beams, slurs, triplets.
 
 %prep
 %setup
@@ -27,18 +27,17 @@ rm -rf $RPM_BUILD_ROOT
 strip lily/out/lilypond mi2mu/out/mi2mu
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files
-%doc Documentation/out/AUTHORS.text Documentation/out/CodingStyle.text Documentation/out/INSTALL.text Documentation/out/MANIFESTO.text Documentation/out/convert-mudela.text Documentation/out/error.text Documentation/out/faq.text Documentation/out/gnu-music.text Documentation/out/index.text Documentation/out/language.text Documentation/out/lilygut.text Documentation/out/lilyliterature.text Documentation/out/lilypond.text Documentation/out/mi2mu.text Documentation/out/mudela.text Documentation/out/other-packages.text input/beams.ly input/book.ly input/book.tex input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/error.ly input/header.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/rhythm.ly input/scales.ly input/scripts.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/slurs.ly input/standchen.ly input/standchen.tex input/toccata-fuga-E.ly input/twinkle.ly input/wohltemperirt.ly Documentation/lelie_logo.gif
+%doc Documentation/out/AUTHORS.text Documentation/out/CodingStyle.text Documentation/out/INSTALL.text Documentation/out/MANIFESTO.text Documentation/out/convert-mudela.text Documentation/out/error.text Documentation/out/faq.text Documentation/out/gnu-music.text Documentation/out/index.text Documentation/out/language.text Documentation/out/lilygut.text Documentation/out/lilyliterature.text Documentation/out/lilypond.text Documentation/out/mi2mu.text Documentation/out/mudela-book.text Documentation/out/other-packages.text BUGS TODO NEWS DEDICATION ANNOUNCE README input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/error.ly input/header.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/rhythm.ly input/scales.ly input/scripts.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/slurs.ly input/standchen.ly input/standchen.tex input/toccata-fuga-E.ly input/twinkle.ly input/wohltemperirt.ly Documentation/out/mudela-course.dvi Documentation/out/mudela-man.dvi Documentation/lelie_logo.gif
 /usr/bin/convert-mudela
+/usr/bin/mudela-book
 /usr/bin/lilypond
 /usr/lib/libflower.so
 /usr/bin/mi2mu
 /usr/man/man1/mi2mu.1
 /usr/man/man1/lilypond.1
-/usr/man/man5/mudela.5
+/usr/man/man1/mudela-book.1
 /usr/man/man1/convert-mudela.1
 /usr/lib/texmf/texmf/tex/lilypond/
-/usr/lib/texmf/texmf/fonts/source/lilypond/
 /usr/share/lilypond/
 %post
-echo please run texhash to update TeX directory listings 1>&2
 

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 76b484ae60514d93146e9de0a81a3c25efbcd2ba..5cab6df5a71c0d8fe61bcbddf830faa34a9dea8e 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -7,15 +7,15 @@ Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-@TOPLEVEL_VERSION@.tar.gz
 Summary: A preprocessor to make TeX typeset music.
 URL: http://www.stack.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@stack.nl>
-Icon: lelie_icon.xpm
+Icon: lelie_icon.gif
 Buildroot: /tmp/lilypond_build
 
 %description
-GNU LilyPond is a program which converts a music-script
-(mudela) into TeX output, or MIDI to produce multi-staff
-scores. Features include multiple meters, clefs, keys, lyrics,
-versatile input-language, cadenzas beams, slurs, triplets, multiple
-voices.
+GNU LilyPond which converts music definition files into visual or
+audio output: it can typeset formatted sheet music to a TeX file and
+and (mechanical) performances to MIDI files. Features include multiple
+meters, clefs, keys, lyrics, versatile input-language, cadenzas
+beams, slurs, triplets.
 
 %prep
 %setup
@@ -29,16 +29,15 @@ make prefix="$RPM_BUILD_ROOT/usr" install
 %files
 %doc @TEXT_DOCS@ @EXAMPLE_LYS@ Documentation/lelie_logo.gif
 /usr/bin/convert-mudela
+/usr/bin/mudela-book
 /usr/bin/lilypond
 /usr/lib/libflower.so
 /usr/bin/mi2mu
 /usr/man/man1/mi2mu.1
 /usr/man/man1/lilypond.1
-/usr/man/man5/mudela.5
+/usr/man/man1/mudela-book.1
 /usr/man/man1/convert-mudela.1
 /usr/lib/texmf/texmf/tex/lilypond/
-/usr/lib/texmf/texmf/fonts/source/lilypond/
 /usr/share/lilypond/
 %post
-echo please run texhash to update TeX directory listings 1>&2