release: 1.0.19.uu5

diff --git a/NEWS b/NEWS
index f42087da405aee32a76382c66ec936fa79626e2d..af131f55aad0f57f6f1c607e33747d139d0f1587 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+pl 19.uu5 
+       - mi2mu fix
+
+pl 19.uu4
+       - more debian fixes
 pl 19.uu3
        - debian fixes.
 

diff --git a/VERSION b/VERSION
index 071d2adabf01c6469f7fea09b886b9697e0e38b6..359940f86d064da1755440bd02ed9d9c4dccc8b4 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=19
-MY_PATCH_LEVEL=uu3
+MY_PATCH_LEVEL=uu5
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/debian/GNUmakefile b/debian/GNUmakefile
index 6aac4c82213c16c0adbfe053c04d5258ca24464f..9e361eff43511a1d364a5f4ccba6a836c50cf0d8 100644 (file)
--- a/debian/GNUmakefile
+++ b/debian/GNUmakefile
@@ -9,7 +9,7 @@ at-dir = $(outdir)/
 at-ext =
 
 EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) $(OUT_DIST_FILES) control.foka
-CONF_FILES=changelog copyright postinst postrm rules watch 
+CONF_FILES=changelog copyright preinst postinst postrm rules watch 
 OUTCONF_FILES=$(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES)
 OUT_DIST_FILES = $(OUTIN_FILES)
 

diff --git a/debian/changelog b/debian/changelog
index e08328d6d2607c16ac7309fd91b57e4df4bf34f6..4b24340ecf0c6fdf7efdf047c419eee9fc5ce2ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lilypond (1.0.19.uu3-1) frozen unstable; urgency=low
+
+  * New upstream bug-fix release.
+
+ -- Anthony Fok <foka@debian.org>  Sat, 12 Dec 1998 04:23:15 -0700
+
 lilypond (1.0.19.uu1-2) frozen unstable; urgency=low
 
   * [debian/rules]: Now builds the LilyPond documentation in dvi format.
@@ -10,7 +16,7 @@ lilypond (1.0.19.uu1-2) frozen unstable; urgency=low
 
 lilypond (1.0.19.uu1-1) frozen unstable; urgency=low
 
-  * New upstream bugfix release.
+  * New upstream bug-fix release.
 
  -- Anthony Fok <foka@debian.org>  Mon,  7 Dec 1998 13:12:02 -0700
 
@@ -28,7 +34,7 @@ lilypond (1.0.18-2) frozen unstable; urgency=low
 
 lilypond (1.0.18-1) frozen unstable; urgency=low
 
-  * New upstream bugfix release.
+  * New upstream bug-fix release.
   * [debian/control]:
       - Upgraded to standards version 2.5.0.0 (no changes).
       - Recommends: python-misc (>= 1.5.1) because ly2dvi needs the glob

diff --git a/debian/control b/debian/control
index 14be2746a9be339a443c7459ad5edf8c41abe9e1..0dfe808530cebfa1246d9a2d2006e6ff2ec1deb6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 2.4.1.0
+Standards-Version: 2.5.0.0
 
 Package: lilypond
 Architecture: any
-Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
-Recommends: python-base (>= 1.5.1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
+Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print

diff --git a/debian/control.foka b/debian/control.foka
index 1054ef466ec56ce370858c47b72d8fce845f82c5..0dfe808530cebfa1246d9a2d2006e6ff2ec1deb6 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -2,31 +2,23 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 2.4.1.0
+Standards-Version: 2.5.0.0
 
 Package: lilypond
 Architecture: any
-Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
-Recommends: python-base (>= 1.5.1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
+Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print
  beautiful sheet music from a music definition file.  It can also play
  mechanical performances to a MIDI file.  Features include multiple
- staffs, meters, clefs, keys, lyrics, versatile input language,
- cadenzas, beams, slurs, triplets, formatting scores, part extraction.
- It includes a nice font of musical symbols.
- .
- LilyPond is de muziek typesetter van het GNU Project.
- Het programma genereert prachtige bladmuziek uit een muziek definitie
- bestand.  Ook kan het (mechanische) uitvoeringen afspelen naar MIDI
- bestanden.  Bijzondere mogelijkheden omvatten verscheidene notenbalken,
- maatsoorten, sleutels, toonsoorten, zangteksten, krachtige invoer taal,
- cadensa, balken, boogjes, triolen, partituren, en losse partijen.  Een
- fraai font met muzikeksymbolen wordt meegeleverd.
+ staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,
+ beams, slurs, triplets, formatting scores, part extraction.  It includes
+ a nice font of musical symbols.
  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
-        http://www.digicash.com/~jan/lilypond/
-        http://sca.uwaterloo.ca/lilypond/
+        http://www.xs4all.nl/~jantien/lilypond/
+        http://sca.uwaterloo.ca/~praetzel/lilypond/
   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>

diff --git a/debian/control.in b/debian/control.in
index 6cde23db40af957a04393fb11fbada05c760945f..0a0bc8e07a0cff04a2dd782763221f43a838920c 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,12 +2,12 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 2.4.1.0
+Standards-Version: 2.5.0.0
 
 Package: lilypond
 Architecture: any
-Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
-Recommends: python-base (>= 1.5.1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
+Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.@BLURB@
  .

diff --git a/debian/copyright b/debian/copyright
index b97528466c3547872036ddbb20755dfea0553a66..05e91797e6418c54189916850048223313e4ff6d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ This package was debianized by Anthony Fok <foka@debian.org> on
 Wed,  6 Aug 1997 04:30:28 -0600
 
 It was downloaded from
-      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.0/lilypond-1.0.19.uu1.tar.gz
+      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.0/lilypond-1.0.19.uu3.tar.gz
 
 It is also available from:
 

diff --git a/debian/out/control b/debian/out/control
index 14be2746a9be339a443c7459ad5edf8c41abe9e1..0dfe808530cebfa1246d9a2d2006e6ff2ec1deb6 100644 (file)
--- a/debian/out/control
+++ b/debian/out/control
@@ -2,12 +2,12 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 2.4.1.0
+Standards-Version: 2.5.0.0
 
 Package: lilypond
 Architecture: any
-Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
-Recommends: python-base (>= 1.5.1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
+Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print

diff --git a/debian/preinst b/debian/preinst
new file mode 100644 (file)
index 0000000..cf27f6b
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# preinst script for the Debian GNU/Linux lilypond package
+#   by Anthony Fok <foka@debian.org>
+#   This is free software; see the GNU General Public Licence
+#   version 2 or later for copying conditions.  There is NO warranty.
+#   Last modified:  Tue, 10 Nov 1998 23:47:00 -0700
+
+set -e
+
+package=lilypond
+font_supplier=public
+font_typeface=lilypond
+std_TEXMFMAIN=/usr/lib/texmf
+std_VARTEXFONTS=/var/spool/texmf
+
+#DEBHELPER#
+
+TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'`
+: ${TEXMFMAIN:=$std_TEXMFMAIN}
+VARTEXFONTS=`/usr/bin/kpsewhich -expand-var '$VARTEXFONTS'`
+: ${VARTEXFONTS=$std_VARTEXFONTS}
+
+LILYTEXINPUTS=$TEXMFMAIN/tex/$package
+LILYMFINPUTS=$TEXMFMAIN/fonts/source/$font_supplier/$font_typeface
+
+case "$1" in
+    install|upgrade)
+       # Clear out the old TFM and PK files in case the fonts were
+       # left-over from previous installations
+       rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface
+       rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface
+
+       # Fix a silly bug in Debian's lilypond 1.0.17-1.  :-)
+       if [ "$2" = "1.0.17-1" ]; then
+           rm -rf $VARTEXFONTS/tfm/$font_supplier/mf
+           rm -rf $VARTEXFONTS/pk/*/$font_supplier/mf
+       fi
+
+       # Since 1.0.17-1, /usr/lib/texmf/tex/lilypond has been changed
+        # to a symbolic directory.  Remove the old real directory to
+        # prevent problems during upgrade.
+       for i in $LILYTEXINPUTS $LILYMFINPUTS; do
+           if [ -d $i -a ! -L $i ]; then
+               rm -rf $i
+           fi
+       done
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+       echo "$0 called with unknown argument \`$1'" >&2
+       exit 0
+    ;;
+
+esac

diff --git a/debian/watch b/debian/watch
index 9b35470c7c3e24195316dde3f306bdf47203516d..8d24c43590ad131c638be26f22c6564746cb3bcc 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 # Example watch control file for uscan
 # Rename this file to "watch" and then you can run the "uscan" command
 # to check for upstream updates and more.
-# Site         Directory                       Pattern                 Version Script
-ftp.cs.uu.nl   /pub/GNU/LilyPond/development   lilypond-*.tar.gz       debian  uupdate
+# Site         Directory               Pattern                 Version Script
+ftp.cs.uu.nl   /pub/GNU/LilyPond/v1.0  lilypond-*.tar.gz       debian  uupdate

diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm
index 85a31de124579dc1061dea4674e8a1a344e7b4c0..899707ee0115a5a01cb2d4c0021aa6e41ed77d20 100644 (file)
--- a/make/out/lelievijver.lsm
+++ b/make/out/lelievijver.lsm
@@ -1,15 +1,15 @@
 Begin3
 Titel: LilyPond
-Versie: 1.0.19.uu3
-Inschrijf datum: 11DEC98
+Versie: 1.0.19.uu5
+Inschrijf datum: 05JAN99
 Beschrijving: @FLAPTEKST@
 Trefwoorden: muziek typezetten midi notatie
 Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
-       770k lilypond-1.0.19.uu3.tar.gz 
+       770k lilypond-1.0.19.uu5.tar.gz 
 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-       770k lilypond-1.0.19.uu3.tar.gz 
+       770k lilypond-1.0.19.uu5.tar.gz 
 Copi-eer voorwaarden: GPL
 End

diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm
index 12ae846140a05b8d77311a242cc96bd6d0224a95..10b90c16bda3f38c17cf86780339cabb62714347 100644 (file)
--- a/make/out/lilypond.lsm
+++ b/make/out/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
-Version: 1.0.19.uu3
-Entered-date: 11DEC98
+Version: 1.0.19.uu5
+Entered-date: 05JAN99
 Description: 
 LilyPond is the GNU Project music typesetter.  This program can print
 beautiful sheet music from a music definition file.  It can also play
@@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.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
-       770k lilypond-1.0.19.uu3.tar.gz 
+       770k lilypond-1.0.19.uu5.tar.gz 
 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-       770k lilypond-1.0.19.uu3.tar.gz 
+       770k lilypond-1.0.19.uu5.tar.gz 
 Copying-policy: GPL
 End

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index dda9ff9872798b4d9e661fc3aa409534f8062667..812cf0a90fca9e2c4362191e128f9b877bea1e37 100644 (file)
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 1.0.19.uu3
+Version: 1.0.19.uu5
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.19.uu3.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.19.uu5.tar.gz
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>

diff --git a/mi2mu/mudela-staff.cc b/mi2mu/mudela-staff.cc
index 5b326d966d6ff30153a9ddb11310efa72f4241b3..3c92577895a9c9ae7ff39ac5b51e6cf8ec814f75 100644 (file)
--- a/mi2mu/mudela-staff.cc
+++ b/mi2mu/mudela-staff.cc
@@ -101,7 +101,7 @@ Mudela_staff::name_str()
 void
 Mudela_staff::output (Mudela_stream& mudela_stream_r)
 {
-  mudela_stream_r << id_str() << " = \\melodic";
+  mudela_stream_r << id_str() << " = \\notes";
   mudela_stream_r <<  (mudela_voice_p_list_.size() > 1 ? "<" : "{");
   mudela_stream_r << '\n';
   mudela_stream_r << _ ("% midi copyright:") << copyright_str_ << '\n';