* VERSION (MY_PATCH_LEVEL): make 1.7.0

9 files changed, 186 insertions, 114 deletions

diff --git a/make/generic-rules.make b/make/generic-rules.make
index e81890bf2d..b41e4846f0 100644
--- a/make/generic-rules.make
+++ b/make/generic-rules.make
@@ -14,10 +14,4 @@ $(outdir)/%: %.in
 include $(depth)/make/substitute.make
 
 
-# HUH???
-$(outdir)/%.hh: $(doc-dir)/%.in
-	rm -f $@
-	echo '_(' > $@
-	cat $< | $(sed-quotes) | $(sed-newline) | $(sed-quote-line) >> $@
-	echo ');' >> $@
 
diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 516f519719..7d0d40cd6f 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -46,8 +46,7 @@ LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/  -I $(builddir)/mf/out/
 LY2DVI = $(script-dir)/ly2dvi.py
 LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
-PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh
-PS_TO_PNGS = $(buildscript-dir)/ps-to-pngs.sh
+
 
 else
 ### some versions apparently choke on $(message)
@@ -60,8 +59,6 @@ LILYPOND_BOOK = $(shell $(SHELL) -c 'type -p lilypond-book')
 LILYPOND_BOOK_INCLUDES = -I. -I.. -I$(outdir)
 LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi')
 LYS_TO_TELY = $(shell $(SHELL) -c 'type -p lys-to-tely')
-PS_TO_GIFS = $(shell $(SHELL) -c 'type -p ps-to-gifs')
-PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pngs')
 
 endif
 
diff --git a/make/lilypond.lsm.in b/make/lilypond.lsm.in
index 71bf18e624..8b8d1b9577 100644
--- a/make/lilypond.lsm.in
+++ b/make/lilypond.lsm.in
@@ -2,14 +2,16 @@ Begin3
 Title: LilyPond
 Version: @TOPLEVEL_VERSION@
 Entered-date: @DATE@
-Description: @BLURB@
+Description: LilyPond  is a music  typesetter.  It  produces beautiful  sheet music
+using  a description  file as  input.   LilyPond  is  part of  the  GNU
+Project.
 Keywords: music notation typesetting midi fonts engraving
 Author: hanwen@cs.uu.nl (Han-Wen Nienhuys)
 	janneke@gnu.org (Jan Nieuwenhuizen)
-Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
-Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-	1000k @package@-@TOPLEVEL_VERSION@.tar.gz 
-Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-	1000k @package@-@TOPLEVEL_VERSION@.tar.gz 
+Maintained-by: hanwen@cs.uu.nl (Han-Wen Nienhuys)
+Primary-site: ftp.lilypond.org /pub/LilyPond/v1.6/
+	1500k @package@-@TOPLEVEL_VERSION@.tar.gz 
+Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/v1.6/
+	1500k @package@-@TOPLEVEL_VERSION@.tar.gz 
 Copying-policy: GPL
 End
diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in
index 4738a845e9..43edd6971d 100644
--- a/make/lilypond.mandrake.spec.in
+++ b/make/lilypond.mandrake.spec.in
@@ -1,19 +1,25 @@
+# Does info really work?
+%define info yes
+
 %define name lilypond
 %define version @TOPLEVEL_VERSION@
 %define release 1mdk
 
-Name: %{name}
-Summary: A program for printing sheet music.
-Version: %{version}
-Release: %{release}
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-%{version}.tar.gz
+Summary:	A program for printing sheet music.
+Name:		%{name}
+Version:	%{version}
+Release:	%{release}
+License:	GPL
+Group:		Publishing
+URL:		http://www.lilypond.org/
+Source0:	ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-%{version}.tar.gz
 ## Patch0: lilypond-GNUmakefile.in.patch.bz2
-License: GPL
-Group: Publishing
-URL: http://www.lilypond.org/
-BuildRoot: %{_tmppath}/%{name}-buildroot
-BuildRequires: guile guile-devel
-Requires: tetex
+Source1:	%name-16x16.png.tar.bz2
+Source2:	%name-32x32.png.tar.bz2
+Source3:	%name-48x48.png.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-buildroot
+BuildRequires:	guile guile-devel
+Requires:	tetex
 
 %description
 LilyPond is a music typesetter.  It produces beautiful sheet music using a
@@ -29,22 +35,23 @@ http://www.mutopiaproject.org for details).
 If you are new to lilypond, you will almost certainly want to install the
 "lilypond-extras" package in addition to the "lilypond" package.
  
-You may also wish to investigate the "denemo" package, which provides a
-graphical front end to lilypond.
-
-See the file README.first for more information.
+## You may also wish to investigate the "denemo" package, which provides a
+## graphical front end to lilypond.
+## 
+## See the file README.first for more information.
 
-
-%package extras
+%package documentation
 Summary: LilyPond documentation, examples and Mutopia files.
 Group: Publishing
 Requires: lilypond
 
-%description extras
+%description documentation
 The documentation of LilyPond, both in HTML and PostScript, along with
 example input files and the files from the Mutopia project.
 
 %prep
+rm -rf $RPM_BUILD_ROOT
+
 %setup -a 1
 ## % patch0 -b .orig
 
@@ -52,9 +59,16 @@ example input files and the files from the Mutopia project.
 # DO NOT use % { configure } , it hardcodes all paths, runs libtool,
 # so we can't do make prefix=/tmp/ install.
 # -- not sure what this comment means; it's a relic from the PPC spec file -- mbrown@fensystems.co.uk
-./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
-make
-make web-doc
+##./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimising --enable-shared
+## Add options if needed
+./configure --disable-checking --prefix=%{_prefix} --enable-optimising
+make MAKE_PFA_FILES=1 all
+
+# make info
+make -C Documentation
+
+# make  html
+make web-doc top-web 
 
 %install
 
@@ -64,83 +78,146 @@ RPM_DOC_ROOT=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 rm -rf $RPM_DOC_ROOT
 mkdir -p $RPM_DOC_ROOT
 
-make prefix="$RPM_BUILD_ROOT%{_prefix}" install
-%{find_lang} %{name}
+strip lily/out/lilypond 
+make prefix="$RPM_BUILD_ROOT%{_prefix}" MAKE_PFA_FILES=1 all install
+# %{find_lang} %{name}
+
+%if info=="yes"
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/*
+%endif
 
 # Move info and man files into correct locations
-mv $RPM_BUILD_ROOT/usr/info $RPM_BUILD_ROOT%{_infodir}
-mv $RPM_BUILD_ROOT/usr/man $RPM_BUILD_ROOT%{_mandir}
+# mv $RPM_BUILD_ROOT/usr/info $RPM_BUILD_ROOT%{_infodir}
+# mv $RPM_BUILD_ROOT/usr/man $RPM_BUILD_ROOT%{_mandir}
 
-# Move TeX font files into system TeX tree locations
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/texmf/fonts/{afm,source,tfm}
-mv $RPM_BUILD_ROOT%{_datadir}/lilypond/afm $RPM_BUILD_ROOT%{_datadir}/texmf/fonts/afm/lilypond
-mv $RPM_BUILD_ROOT%{_datadir}/lilypond/mf $RPM_BUILD_ROOT%{_datadir}/texmf/fonts/source/lilypond
-mv $RPM_BUILD_ROOT%{_datadir}/lilypond/tfm $RPM_BUILD_ROOT%{_datadir}/texmf/fonts/tfm/lilypond
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/texmf/tex
-mv $RPM_BUILD_ROOT%{_datadir}/lilypond/tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/lilypond
+mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
+install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
+install -m 644 lilypond-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
 
-# Copy emacs mode files into %{_datadir}/lilypond/emacs
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/lilypond/emacs
-cp *.el $RPM_BUILD_ROOT%{_datadir}/lilypond/emacs/
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/*
+
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d
+cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh
+cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh
 
-# Create documentation tree in %{_docdir}
-mkdir -p $RPM_DOC_ROOT/HTML
-tar -C $RPM_DOC_ROOT/HTML -xzf out/web.tar.gz
-ln -s HTML/input $RPM_DOC_ROOT/Examples
-ln -s HTML/input/test $RPM_DOC_ROOT/Tricks
 
-mkdir -p $RPM_DOC_ROOT/Printable
-ln -s ../HTML/Documentation/user/out-www/lilypond.ps.gz $RPM_DOC_ROOT/Printable/Manual.ps.gz
-ln -s ../HTML/Documentation/user/out-www/glossary.ps.gz $RPM_DOC_ROOT/Printable/Glossary.ps.gz
-cp AUTHORS.txt CHANGES COPYING DEDICATION FAQ.txt NEWS README.txt VERSION README.mandrake $RPM_DOC_ROOT/README.first
+# again, make sure that main package installs even if doco fails
+mkdir -p web/out
+tar -C web -xzf out/web.tar.gz 
+
+# Create documentation tree in %{_docdir}
+## mkdir -p $RPM_DOC_ROOT/HTML
+## tar -C $RPM_DOC_ROOT/HTML -xzf out/web.tar.gz
+## ln -s HTML/input $RPM_DOC_ROOT/Examples
+## ln -s HTML/input/test $RPM_DOC_ROOT/Tricks
+
+## mkdir -p $RPM_DOC_ROOT/Printable
+## ln -s ../HTML/Documentation/user/out-www/lilypond.ps.gz $RPM_DOC_ROOT/Printable/Manual.ps.gz
+## ln -s ../HTML/Documentation/user/out-www/glossary.ps.gz $RPM_DOC_ROOT/Printable/Glossary.ps.gz
+## cp AUTHORS.txt COPYING DEDICATION NEWS README.txt VERSION $RPM_DOC_ROOT/README.first
+
+# Menu
+# Every entry must be changed according package specifications
+# Pay attention to "section" "command" and "longtitle"
+
+mkdir -p $RPM_BUILD_ROOT%{_menudir}
+cat >$RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
+?package(%name): command="%{_bindir}/%{name}" needs="X11" \
+icon="%{name}.png" section="Publishing" \
+title="%{name}" longtitle="%{name}"
+EOF
+  
+# icon
+install -d $RPM_BUILD_ROOT/%{_miconsdir}
+install -d $RPM_BUILD_ROOT/%{_iconsdir}
+install -d $RPM_BUILD_ROOT/%{_liconsdir}
+bzcat %{SOURCE1} > $RPM_BUILD_ROOT/%{_miconsdir}/%{name}.png
+bzcat %{SOURCE2} > $RPM_BUILD_ROOT/%{_iconsdir}/%{name}.png
+bzcat %{SOURCE3} > $RPM_BUILD_ROOT/%{_liconsdir}/%{name}png
 
 %post
-touch /tmp/.lilypond-install
-rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print'` /tmp/.lilypond-install
-/usr/bin/mktexlsr
-%_install_info lilypond.info
-%_install_info lilypond-internals.info
+%{update_menus}
 
-echo 'Please logout first before using LilyPond.'
+touch /tmp/.lilypond-install
+rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print` /tmp/.lilypond-install
 
+%if info=="yes"
+/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir 
+%endif
 
 %preun
-%_remove_install_info lilypond.info
-%_remove_install_info lilypond-internals.info
+
+%if info=="yes"
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir 
+fi
+%endif
+
+rm -f /usr/share/lilypond/%{version}/fonts/type1/fonts.dir
+chkfontpath --remove=/usr/share/lilypond/%{version}/fonts/type1/
 
 %postun
-/usr/bin/mktexlsr
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,0755)
-%{_bindir}/*
-%{_datadir}/lilypond/
-%{_datadir}/texmf/fonts/afm/lilypond
-%{_datadir}/texmf/fonts/source/lilypond
-%{_datadir}/texmf/fonts/tfm/lilypond
-%{_datadir}/texmf/tex/lilypond
-
-%doc %{_infodir}/*
-%doc %{_mandir}/man1/*
-%doc %{_docdir}/%{name}-%{version}/AUTHORS.txt
-%doc %{_docdir}/%{name}-%{version}/CHANGES
-%doc %{_docdir}/%{name}-%{version}/COPYING
-%doc %{_docdir}/%{name}-%{version}/DEDICATION
-%doc %{_docdir}/%{name}-%{version}/FAQ.txt
-%doc %{_docdir}/%{name}-%{version}/NEWS
-%doc %{_docdir}/%{name}-%{version}/README.txt
-%doc %{_docdir}/%{name}-%{version}/VERSION
-%doc %{_docdir}/%{name}-%{version}/README.first
-
-%files extras
-%defattr(-,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}/HTML
-%doc %{_docdir}/%{name}-%{version}/Mutopia
-%doc %{_docdir}/%{name}-%{version}/Printable
-%doc %{_docdir}/%{name}-%{version}/Tricks
-%doc %{_docdir}/%{name}-%{version}/Examples
+%{clean_menus}
+
+%clean
+## This section is meant to clean the build directory tree, $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
+## %files -f %{name}.lang
+%files
+# The special tag %doc designates files being part of the documentation of the
+# package. The files so-called will be placed in /usr/doc/lilypond-%{version}/
+%doc COPYING README.txt INSTALL.txt DEDICATION NEWS AUTHORS.txt
+%{_datadir}/emacs/site-lisp/lilypond-*
+# is the following really started during startup of emacs?
+%{_datadir}/emacs/site-lisp/site-start.d/lilypond-*
+
+%{_prefix}/bin/abc2ly
+%{_prefix}/bin/as2text
+%{_prefix}/bin/convert-ly
+%{_prefix}/bin/etf2ly
+%{_prefix}/bin/lilypond
+%{_prefix}/bin/ly2dvi
+%{_prefix}/bin/midi2ly
+%{_prefix}/bin/lilypond-book
+%{_prefix}/bin/mup2ly
+%{_prefix}/bin/musedata2ly
+%{_prefix}/bin/pmx2ly
+
+%if info=="yes"
+%{_prefix}/info/lilypond.info.gz
+%{_prefix}/info/lilypond-internals.info.gz
+%endif
+
+%{_prefix}/man/man1/abc2ly.1.bz2
+%{_prefix}/man/man1/as2text.1.bz2
+%{_prefix}/man/man1/convert-ly.1.bz2
+%{_prefix}/man/man1/etf2ly.1.bz2
+%{_prefix}/man/man1/lilypond.1.bz2
+%{_prefix}/man/man1/ly2dvi.1.bz2
+%{_prefix}/man/man1/midi2ly.1.bz2
+%{_prefix}/man/man1/lilypond-book.1.bz2
+%{_prefix}/man/man1/musedata2ly.1.bz2
+%{_prefix}/man/man1/mup2ly.1.bz2
+%{_prefix}/man/man1/pmx2ly.1.bz2
+
+%{_prefix}/share/%{name}/%{version}/
+%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
+%{_prefix}/../etc/profile.d/lilypond.*
+%_bindir/*
+%_menudir/*
+%_miconsdir/*
+%_iconsdir/*
+%_liconsdir/*
+
+%files documentation
+
+%doc web/
+
+%changelog
+* Fri Aug 30 2002 Heikki Johannes Junes <hjunes@cc.hut.fi> 1.6.0-1mdk
+- Adapted from lilypond.redhat.skel and skeleton found in Mandrake's RPM-docs.
+- TODO: info (?) and dependencies.
 
 %changelog
 * Fri Jun 01 2001 Lenny Cartier <lenny@mandrakesoft.com> 1.4.2-1mdk
diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 763d1f0c8a..c7f0a50fcc 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -26,7 +26,7 @@ Group: Applications/Publishing
 
 %description documentation
 
-The documentation of LilyPond, both in HTML and PostScript.
+The documentation and example files of LilyPond.
 
 %prep
 %setup
@@ -39,7 +39,7 @@ The documentation of LilyPond, both in HTML and PostScript.
 # In fact, do not take out the spaces between % and { in the above comment,
 # because RPM will gladly do a substitution anyway.
 
-./configure --disable-checking --prefix=%{_prefix} --enable-optimise
+./configure --disable-checking --prefix=%{_prefix} --enable-optimising
 
 make MAKE_PFA_FILES=1 all
 
diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in
index c5e68f391e..b5c4cb4017 100644
--- a/make/lilypond.suse.spec.in
+++ b/make/lilypond.suse.spec.in
@@ -92,7 +92,7 @@ The documentation of LilyPond, both in HTML and PostScript.
 # In fact, do not take out the spaces between % and { , because RPM will gladly
 # do a substitution anyway.
 
-CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --enable-optimise --enable-shared
+CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --enable-optimising --enable-shared
 
 make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all
 
diff --git a/make/ly-rules.make b/make/ly-rules.make
index 4d5590f2da..dd3f297c4f 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -4,7 +4,7 @@
 
 
 $(outdir)/%.latex: %.doc
-	rm -f $@
+	-chmod a+w $@
 	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES)\
 $(LILYPOND_BOOK_FLAGS) --verbose --dependencies --outdir=$(outdir) $<
 	chmod -w $@
@@ -12,22 +12,25 @@ $(LILYPOND_BOOK_FLAGS) --verbose --dependencies --outdir=$(outdir) $<
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
-	rm -f $@
+	-chmod a+w $@
 	set|egrep '(TEX|LILY)'  # ugh, what's this?
 	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --verbose $(LILYPOND_BOOK_FLAGS) $<
 	chmod -w $@
 
 $(outdir)/%.texi: $(outdir)/%.tely
-	rm -f $@
-	set|egrep '(TEX|LILY)'  # ugh, what's this?
+	-chmod a+w $@
+# debugging:
+#	set|egrep '(TEX|LILY)'
 	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --verbose $(LILYPOND_BOOK_FLAGS) $<
-	rm -f $<
+#
+# DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
+#	rm -f $<
 	chmod -w $@
 
 # nexi: no-lily texi
 # for plain info doco: don't run lily
 $(outdir)/%.nexi: %.tely
-	rm -f $@
+	-chmod a+w $@
 	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --no-lily $(LILYPOND_BOOK_FLAGS) $<
 	mv $(@D)/$(*F).texi $@
 	chmod -w $@
diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make
index 6c7f72bdf2..b41e4c7892 100644
--- a/make/lysdoc-rules.make
+++ b/make/lysdoc-rules.make
@@ -1,3 +1,6 @@
 
+
+
 $(outdir)/$(NAME).tely: $(LY_FILES)
 	$(PYTHON) ../../buildscripts/lys-to-tely.py --name=$(outdir)/$(NAME) --title="$(TITLE)" $(LY_FILES)
+
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 85ad770767..8320ee47cc 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,12 +1,8 @@
 
 
-$(outdir)/%.gif: $(outdir)/%.ps
-	sh $(PS_TO_GIFS) $<
-	-mv $(name-stem)-page*.gif $(outdir)/
-	ln -s $(name-stem)-page1.gif $@
-
 $(outdir)/%.png: $(outdir)/%.ps
-	sh $(PS_TO_PNGS) $<
+	gs -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sOutputFile="$(name-stem)-page%d.png" -r90 -dNOPAUSE $< -c quit
+
 	-mv $(name-stem)-page*.png $(outdir)/
 	ln -s $(name-stem)-page1.png $@