patch::: 1.4.2.jcn1

1.4.2.jcn1

diff --git a/CHANGES b/CHANGES
index 6eadd906641586113414255ab46e1fb177d633b2..aff2549b380fc43322cda0c72ec2b0157171191a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,21 @@
-1.4.1.jcn4
+1.4.2.jcn1
 ==========
 
+* Included mktexnam.patch (again?).
+
+* Documentation fix (Mark Hindley).
+
+* Debian patch and bashism fix (Anthony).
+
+* Bugfix: local-install should depend on $(INSTALLATION_FILES).  This fixes
+./configure; make install in buildscripts/ (Michael Vanier).
+
+* Removed les-nereides from short-examples, as it is tweaked a lot,
+contrary to what the webpage claims (didn't know that).
+
+1.4.2
+=====
+
 * Glossary fixes (Thanks Jean-Pierre Coulon).
 
 1.4.1.jcn3

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index b50c5a14bb31fd971761adac139ec01dc3b60044..623ece58d5481fb86a28de994344d48cff72260c 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -78,11 +78,11 @@ use
 @uref{ftp://ftp.xcf.berkeley.edu/pub/xdelta/, xdelta}.
  This is much safer than using patches, and is the recommended way.
 
-The following command produces @file{lilypond-1.4.1.tar.gz} from
-@file{lilypond-1.4.0.tar.gz} identical (up to compression dates) to the .1
+The following command produces @file{lilypond-1.4.3.tar.gz} from
+@file{lilypond-1.4.2.tar.gz} identical (up to compression dates) to the .3
 on the FTP site.
 @example
-  xdelta patch lilypond-1.4.0-1.4.1.xd lilypond-1.4.0.tar.gz
+  xdelta patch lilypond-1.4.2-1.4.3.xd lilypond-1.4.2.tar.gz
 @end example
 @end itemize
 
@@ -374,7 +374,7 @@ A Debian package is also available.  You may install it easily by running
 @command{apt-get} as root:
 
 @example
-       apt-get install lilypond
+       apt-get install lilypond lilypond-doc
 @end example
 
 
@@ -405,7 +405,7 @@ Alternatively, visit
 @itemize @bullet
 @item @uref{http://packages.debian.org/lilypond,http://packages.debian.org/lilypond}
 @item @uref{http://people.debian.org/~foka/lilypond/,http://people.debian.org/~foka/lilypond/}
-for latest semi-unofficial build of LilyPond 1.3.121 for Debian 2.2 (potato) users.
+for latest semi-unofficial build of LilyPond 1.4.2 for Debian 2.2 (potato) users.
 The official stable Debian 2.2 is stuck with the old LilyPond-1.3.24.
 Since LilyPond-1.4 has been released, the older lilypond1.3 Debian
 package is now obsolete.
@@ -421,16 +421,20 @@ make the .deb by doing, for example:
        $ su - root
        # dpkg --purge lilypond lilypond1.3
        # exit
-       $ tar xzf lilypond-1.4.1.tar.gz
-       $ cd lilypond-1.4.1
-       $ dch -p -v 1.4.1-0.local.1 "Local build."
-       $ debuild
+       $ tar xzf lilypond-1.4.3.tar.gz
+       $ cd lilypond-1.4.3
+       $ dch -p -v 1.4.3-0.local.1 "Local build."
+       $ debuild -B
        $ su - root
-       # dpkg -i ../lilypond_1.4.1*.deb
+       # dpkg -i ../lilypond_1.4.3*.deb
        # exit
        $
 @end example
 
+Use command @command{debuild} instead of @command{debuild -B} if you have
+a very fast machine and want to build the HTML, PS and DVI documentation
+too.
+
 For compilation on a Debian GNU/Linux system you need these packages,
 in addition to the those needed for running:
 

diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely
index 71f53b947d449becea93c0fe9627b753a58e9be4..b6d09011ad02c343ddfc56887ee214eaa4bb468e 100644 (file)
--- a/Documentation/user/converters.itely
+++ b/Documentation/user/converters.itely
@@ -180,7 +180,7 @@ Report bugs to @email{bug-gnu-music@@gnu.org}.
 @node pmx2ly
 @section pmx2ly
 
-PMX is a Musixtex preprocessor written by Don Simons, see
+PMX is a MusiXTeX preprocessor written by Don Simons, see
 @uref{http://icking-music-archive.sunsite.dk/Misc/Music/musixtex/software/pmx/}.
 
 Report bugs to @email{bug-gnu-music@@gnu.org}.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 8c42c8b8e78af65666c424e0e19ce2eab47801fc..ac17a848af24010203ff7292993714891354701f 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -886,15 +886,15 @@ are defined in @file{scm/auto-beam.scm}.
 The value of @code{autoBeamSettings} is changed using
 @code{\override} and unset using @code{\revert}:
 @example
-\property Voice.autoBeamSettings \override #'(@var{BE} @var{N} @var{M} @var{P} @var{Q}) = @var{dur}
-\property Voice.autoBeamSettings \revert #'(@var{BE} @var{N} @var{M} @var{P} @var{Q})
+\property Voice.autoBeamSettings \override #'(@var{BE} @var{P} @var{Q} @var{N} @var{M}) = @var{dur}
+\property Voice.autoBeamSettings \revert #'(@var{BE} @var{P} @var{Q} @var{N} @var{M})
 @end example
 Here, @var{BE} is the symbol @code{begin} or @code{end}. It determines
 whether the rule applies to begin or end-points.  The quantity
-@var{N}/@var{M} refers to a time signature (wildcards, `@code{* *}' may
-be entered to designate all time signatures), @var{P}/@var{Q} refers to
-the length of the beamed notes (and `@code{* *}' designates notes of any
-length).
+@var{P}/@var{Q} refers to the length of the beamed notes (and `@code{*
+*}' designates notes of any length), @var{N}/@var{M} refers to a time
+signature (wildcards, `@code{* *}' may be entered to designate all time
+signatures).
 
 For example, if you want automatic beams to end on every quarter note,
 you can use the following:
@@ -917,18 +917,18 @@ In 4/4 time signature, this means that automatic beams could end only on
 
 You can also restrict rules to specific time signatures. A rule that
 should only be applied in @var{N}/@var{M} time signature is formed by
-replacing the first asterisks by @var{N} and @var{M}. For example, a
+replacing the second asterisks by @var{N} and @var{M}. For example, a
 rule for 6/8 time exclusively looks like
 @example
 \property Voice.autoBeamSettings \override
-    #'(begin 6 8 * *) =  ... 
+    #'(begin * * 6 8) =  ... 
 @end example
 
 If you want a rule to apply to certain types of beams, you can use the
-second pair of asterisks. Beams are classified according to the shortest
+first pair of asterisks. Beams are classified according to the shortest
 note they contain. For a beam ending rule that only applies to beams
-with 32nd notes (and no shorter notes), you would use @code{(end * * 1
-32)}.
+with 32nd notes (and no shorter notes), you would use @code{(end 1
+32 * *)}.
 
 @c not true
 @c Automatic beams can not be put on the last note in a score.

diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi
index 119f8acc68331d2fa0a076ac6032732a37641c65..5110fb12e229cd228513892300343e1f305fab82 100644 (file)
--- a/Documentation/windows/compiling.texi
+++ b/Documentation/windows/compiling.texi
@@ -21,8 +21,8 @@ included in LilyPond's source distribution.
 
 These binaries are cross compiled for Windows on a GNU/Linux box.  You
 may want to check out the
-@uref{http://www.lilypond.org/gnu-windows/cross-1.1.8.tar.gz,cross
-compilation scripts}.
+@uref{http://www.lilypond.org/gnu-windows/cross.tar.gz,cross compilation
+scripts}.
 
 
 @section Windows installation specifics
@@ -35,8 +35,27 @@ in the source package directory @file{Documentation/windows}.
 @item @var{guile-1.4-gnu-windows.patch}
 You may (Cygwin gets better every day) need this patch to compile GUILE.
 @item @var{cygwin-installer.patch}
-Apply this patch to the @file{cinstall} directory of Cygwin, to get the
-LilyPond installer.
+Apply this patch to the @file{cinstall} directory of
+@file{winsup-src/cinstall}, to get the LilyPond installer.
+
+Compiling @file{setup.exe} has been complicated a bit with the
+introduction of the non-feature bzip2.  Here's how I did it:
+@quotation
+@example
+    tar xjf cygwin-src-20010531.tar.bz2 
+    tar xjf winsup-src-20010531.tar.bz2 
+    tar xzf mingw-20010424-1.tar.gz
+    cd winsup/cinstall
+    patch < ../../cygwin-installer.patch
+    cp /home/cygwin/cygwin-1.3.2/usr/lib/mingw/crt2.o .
+    cd ../bzip
+    MINGW32=yes CFLAGS='-mno-cygwin' ./configure
+    make
+    cd -
+    make w32api_lib=/home/cygwin/cygwin-1.3.2/usr/lib/w32api \
+        CXX='g++ -L/home/cygwin/cygwin-1.3.2/usr/lib/mingw'
+@end example
+@end quotation
 @item @var{--prefix=/usr/lilypond-x.y.x}
 The standard binary installation installs LilyPond into its own prefix.
 We think it's silly, but do this is on special request of Windows users.

diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi
index 2bd8bcf504864e843d90394958b76925353a504d..e71cae45cf58dce55b2ad8940ddf33683b8fe524 100644 (file)
--- a/Documentation/windows/installing.texi
+++ b/Documentation/windows/installing.texi
@@ -49,11 +49,16 @@ Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
 If you're lucky, after running @file{setup.exe} you're all set up.
 
 Open a LilyPond shell (or any bash shell), and type
+
+@quotation
 @example
 lilypond --help
 @end example
+@end quotation
 
 If you don't see something similar to
+
+@quotation
 @example
 Usage: lilypond [OPTION]... [FILE]...
 
@@ -67,12 +72,16 @@ Options:
   -h,--help             this help
 [..]
 @end example
+@end quotation
 
 you should try adding @file{/usr/lilypond-x.y.z/bin} to your @var{PATH},
 do:
+
+@quotation
 @example
 PATH=/usr/lilypond-1.3.147/bin:$PATH
 @end example
+@end quotation
 
 and try again.
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 17208a76cabfc2013b5109c8a3efdfe0dba34e5a..faadd6c792e47fac62c6806da633c2d0cf0f8926 100644 (file)
--- 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
+EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch mktexnam.patch
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(configuration) VERSION
@@ -85,7 +85,7 @@ top-web:
                -not -name '*.vr' -not -name '*.yp' -not -name '*.ky' \
                -not -name '*.pg' -not -name '*.tmp' -not -name '*.toc' \
                -not -name '*.fns' -not -name '*.cps' -not -name '*.nexi' \
-               -not -name '*.texi' -not -name '*.texidoc' \
+               -not -name '*.texi' -not -name '*.texidoc' -not -name '*.tp' \
                -not -name '*.log' -not -name 'out-www' -not -name '*.dep' \
            > $(outdir)/weblist
        ls *.png *.html >> $(outdir)/weblist

diff --git a/VERSION b/VERSION
index 601e00c0817e1cf7795d80e39a70b82f85c251c8..472b33396412507e014fd62b46aaad2454a0fca3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=2
-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/buildscripts/GNUmakefile b/buildscripts/GNUmakefile
index 71fc0d2a8247ab75ef057b712cbe431c28d72219..d75ba0987b4be9999e45a82c272e2dc50308a1fa 100755 (executable)
--- a/buildscripts/GNUmakefile
+++ b/buildscripts/GNUmakefile
@@ -1,13 +1,13 @@
-# bin/Makefile
-
 depth = ..
-STEPMAKE_TEMPLATES=script install install-out po
 
-include $(depth)/make/stepmake.make 
+#STEPMAKE_TEMPLATES=script install install-out po
+STEPMAKE_TEMPLATES=script install po
 
 INSTALLATION_FILES=$(outdir)/gettext.py
 INSTALLATION_DIR=$(datadir)/python
 
+include $(depth)/make/stepmake.make 
+
 # Should we install these? This should be handled by sysadmin or
 # packager but if she forgets...
 #INSTALLATION_OUT_SUFFIXES=1
@@ -16,8 +16,3 @@ INSTALLATION_DIR=$(datadir)/python
 
 all: $(outdir)/gettext.py
 
-
-
-
-
-

diff --git a/buildscripts/install-info-html.sh b/buildscripts/install-info-html.sh
index a21e9b7d8f2827814115f32821331e68b3e94bcf..79e8289ec9e7ab34faa287e509f8a1c1a19fadee 100644 (file)
--- a/buildscripts/install-info-html.sh
+++ b/buildscripts/install-info-html.sh
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@SHELL@
 
 name=install-info-html
 version=1.0
@@ -15,7 +15,7 @@ debug_echo=:
 #
 # print usage
 #
-function help ()
+help ()
 {
        cat << EOF
 $name $version
@@ -33,7 +33,7 @@ EOF
 }
  
 
-function cleanup ()
+cleanup ()
 {
        $debug_echo "cleaning ($?)..."
 }

diff --git a/debian/GNUmakefile b/debian/GNUmakefile
index 205ae80403da51096aa6b044d03541ce86f71cbe..1ac411aaa91e5ecb591043d438865ad9ebc0c93c 100644 (file)
--- a/debian/GNUmakefile
+++ b/debian/GNUmakefile
@@ -11,7 +11,8 @@ CONF_FILES = changelog control copyright emacsen-startup \
 EXTRA_DIST_FILES = README.Debian $(CONF_FILES) \
        control.foka control.potato \
        lilypond.dirs lilypond.doc-base lilypond.links \
-       lilypond-doc.dirs lilypond-doc.doc-base lilypond-doc.README.Debian
+       lilypond-doc.dirs lilypond-doc.doc-base lilypond-doc.README.Debian \
+       lilypond1.3.copyright
 #OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES)
 OUTCONF_FILES = $(OUTIN_FILES)
 OUT_DIST_FILES = $(OUTIN_FILES)

diff --git a/debian/changelog b/debian/changelog
index fd0a0cb6f2c5f33c84d0d778a739353f1c203f19..37cfe0df1a78253f4fb184b413b250c13689eedf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lilypond (1.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Moved "bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1)"
+    from Build-Depends to Build-Depends-Indep because these packages
+    are only needed for building lilypond-doc.
+
+ -- Anthony Fok <foka@debian.org>  Tue, 29 May 2001 02:26:58 -0600
+
 lilypond (1.4.1-1) unstable; urgency=low
 
   * New upstream release.  (Closes: Bug#97598)

diff --git a/debian/control b/debian/control
index 3d1ba98510a4cf04fbd88599ee2ddc2688c33ca8..7998422c27d78bd36beea40ec8bd558becf93e71 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: lilypond
-Build-Depends: debhelper (>= 3.0.5), python-base (>= 1.5.2-4), libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), bibtex2html, groff, gs | gs-aladdin, netpbm (>= 2:9.10-1), m4, gettext (>= 0.10.36-1)
+Build-Depends: debhelper (>= 3.0.5), python-base (>= 1.5.2-4), libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), groff, m4, gettext (>= 0.10.36-1)
+Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1)
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
@@ -27,7 +28,7 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Recommends: lilypond (= ${Source-Version})
+Suggests: lilypond (>= 1.4.1-1)
 Suggests: postscript-viewer, www-browser
 Description: LilyPond Documentation in HTML, PS and DVI formats
  This package contains the HTML, PostScript and DVI documentation for the

diff --git a/debian/control.foka b/debian/control.foka
index 1388612c342ddf5e3e6b6b9b90243eab1a6fd650..78f5b60f09045106d3849ebe2c03fcfa4e224ec3 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -1,5 +1,6 @@
 Source: lilypond
-Build-Depends: debhelper (>= 3.0.5), python-base (>= 1.5.2-4), libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), bibtex2html, groff, gs | gs-aladdin, netpbm (>= 2:9.10-1), m4, gettext (>= 0.10.36-1)
+Build-Depends: debhelper (>= 3.0.5), python-base (>= 1.5.2-4), libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), groff, m4, gettext (>= 0.10.36-1)
+Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1)
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
@@ -27,7 +28,7 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Recommends: lilypond (= ${Source-Version})
+Suggests: lilypond (>= 1.4.1-1)
 Suggests: postscript-viewer, www-browser
 Description: LilyPond Documentation in HTML and PS formats
  This package contains the HTML and PostScript documentation for the

diff --git a/debian/control.potato b/debian/control.potato
index ea0cfdf66ed518c9c9278380509d441e3cd1790f..0a3ff854e5ba5a3a311bcc2ae592f0b30566901a 100644 (file)
--- a/debian/control.potato
+++ b/debian/control.potato
@@ -1,25 +1,22 @@
-Source: lilypond1.3
-Build-Depends: debhelper (>= 2.0.72), python-base (>= 1.5.2-4), libguile6-dev, tetex-bin, tetex-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), groff, gs, netpbm, pnmtopng, m4, gettext (>= 0.10.35-13)
+Source: lilypond
+Build-Depends: debhelper (>= 2.0.72), python-base (>= 1.5.2-4), libguile6-dev, tetex-bin, tetex-lib, tetex-extra, flex, bison, texinfo (>= 4.0-4), groff, m4, gettext (>= 0.10.35-13)
+Build-Depends-Indep: gs | gs-aladdin, netpbm, pnmtopng
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 3.2.1
+Standards-Version: 3.1.1
 
-Package: lilypond1.3
+Package: lilypond
 Architecture: any
-Replaces: lilypond
-Provides: lilypond
+Replaces: lilypond1.3
+Provides: lilypond1.3
 Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python-base (>= 1.5.2-4), guile
-Recommends: tetex-extra (>= 1.0-1)
-Conflicts: lilypond, musixtex-fonts
+Recommends: lilypond-doc, tetex-extra (>= 1.0-1)
+Conflicts: lilypond, lilypond1.3 (<= 1.3.132-1), musixtex-fonts
 Description: A program for printing sheet music.
  LilyPond is a music typesetter.  It produces beautiful sheet music
  using a high level description file as input.  LilyPond is part of 
  the GNU Project.
- .
- This is the developmental 1.3 branch of LilyPond.  It is not intended for
- use with stable projects, although 1.3.x is most likely to be less buggy
- and much more featureful than then the old "stable" 1.2.17.
  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/
@@ -27,3 +24,22 @@ Description: A program for printing sheet music.
         http://www.lilypond.org/
   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
+
+Package: lilypond-doc
+Section: doc
+Architecture: all
+Suggests: lilypond (>= 1.4.1-1)
+Suggests: postscript-viewer, www-browser
+Description: LilyPond Documentation in HTML, PS and DVI formats
+ This package contains the HTML, PostScript and DVI documentation for the
+ LilyPond music typestting software.
+
+Package: lilypond1.3
+Architecture: all
+Depends: lilypond (>= 1.3.150-1)
+Description: Dummy package for transition to new stable lilypond.
+ This dummy package provides a transition from the previous lilypond1.3
+ package back to a newer lilypond because the stable 1.4 series has arrived.
+ .
+ Please feel free to remove this dummy package after you have upgraded
+ to the latest lilypond.

diff --git a/debian/lilypond1.3.copyright b/debian/lilypond1.3.copyright
new file mode 100644 (file)
index 0000000..29e3390
--- /dev/null
+++ b/debian/lilypond1.3.copyright
@@ -0,0 +1,21 @@
+This is a dummy package to aid the transition from the old
+"lilypond1.3" package to the newer "lilypond" package.
+It was created by Anthony Fok <foka@debian.org>
+Mon, 16 Apr 2001 22:17:10 -0600
+
+Copyright:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA

diff --git a/debian/rules b/debian/rules
index 7538d7bc3fad936a5220f1a8b58c040759f8d9a8..15dbc650d634371f6bb64639188cc1151915e3c9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,17 +15,15 @@ r = debian/$(package)
 r_doc = debian/$(package)-doc
 d = usr/share/doc/$(package)
 
-# TELY_FILES := $(notdir $(wildcard Documentation/user/*.tely))
-# DVI_FILES = $(addprefix Documentation/user/out/, $(TELY_FILES:.tely=.dvi))
-# PS_FILES = $(DVI_FILES:.dvi=.ps)
-
 # "main_memory = 263000" in /etc/texmf/texmf.cnf isn't large enough
 # for latex to process standchen.dvi.latex, so adding extra_mem_* ...
-export extra_mem_top=100000
-export extra_mem_bot=100000
-export MODE=ljfour
-export BDPI=600
-export MAILADDRESS=lilypond@packages.debian.org
+export extra_mem_top = 100000
+export extra_mem_bot = 100000
+export MODE = ljfour
+export BDPI = 600
+export USER_CFLAGS = -DDEBIAN
+export DEB_BUILD = yes
+export MAILADDRESS = lilypond@packages.debian.org
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -44,7 +42,7 @@ build-stamp:
                --prefix=/usr --enable-optimise \
                --infodir='$${prefix}/share/info' \
                --mandir='$${prefix}/share/man'
-       $(MAKE) USER_CFLAGS=-DDEBIAN all
+       $(MAKE)
 
        touch build-stamp
 
@@ -78,7 +76,7 @@ install: build
 
        # Add here commands to install the package into debian/tmp.
        dh_installdirs
-       $(MAKE) prefix=$(PWD)/$(r)/usr USER_CFLAGS=-DDEBIAN install
+       $(MAKE) prefix=$(PWD)/$(r)/usr install
 
        # Change from an absolute symlink to a relative symlink (Lintian)
        if [ -L $(r)/usr/share/lilypond/cmtfm ]; then \
@@ -103,7 +101,7 @@ binary-indep: build-doc install
        dh_installdocs
        dh_installchangelogs
        dh_link
-       dh_compress
+       dh_compress -Xusr/share/doc/lilypond/html/
        dh_fixperms
        dh_installdeb
        dh_gencontrol
@@ -142,10 +140,7 @@ binary-arch: build install
        dh_compress
        dh_fixperms
        dh_installdeb
-#      dh_shlibdeps
-       # Ugh, ugly kludge to avoid the circular symlinks under html/
-       cd debian/lilypond && dpkg-shlibdeps -T../substvars -dDepends \
-               usr/bin/lilypond usr/bin/midi2ly
+       dh_shlibdeps
        dh_gencontrol
 #      dh_makeshlibs
        dh_md5sums

diff --git a/input/GNUmakefile b/input/GNUmakefile
index d94dff4e60b156f635b148a8fe25324d7c9ca072..3f3951d288085b9e7df790bc397c19526b2b130a 100644 (file)
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -1,10 +1,9 @@
-# input/Makefile
-
 depth = ..
 
 SUBDIRS=bugs test regression tutorial no-notation ascii-art
 
-examples=trip  star-spangled-banner paddy twinkle nereides
+# nereides is tweaked a lot, can't do (read webpage)
+examples=trip star-spangled-banner paddy twinkle #nereides
 
 LOCALSTEPMAKE_TEMPLATES=ly mutopia
 EXTRA_DIST_FILES=paddy.abc

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 2135a39c835212e8cd2a9d6c413d67f225c3d5d0..1634bdbcf0388f00a6a45dbfc21df9ee92019374 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -4,7 +4,13 @@ export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
 export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS)::
 export TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd)::
 export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE)
-export TFMFONTS=$(topdir)/mf/out:
+export TFMFONTS:=$(topdir)/mf/out:
+
+ifdef DEB_BUILD
+export PKFONTS := $(topdir)/mf/out
+export MT_DESTROOT := $(topdir)/mf/out
+export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out
+endif
 
 export LILYPONDPREFIX:=$(depth)/
 export PYTHONPATH:=$(buildscript-dir)/$(outdir):$(PYTHONPATH)

diff --git a/mktexnam.patch b/mktexnam.patch
new file mode 100644 (file)
index 0000000..ff16dca
--- /dev/null
+++ b/mktexnam.patch
@@ -0,0 +1,10 @@
+--- mktexnam.orig      Sun Mar  4 19:29:45 2001
++++ mktexnam   Tue May  8 20:28:57 2001
+@@ -158,6 +158,7 @@
+       MT_PKDESTDIR=$DEST
+       MT_TFMDESTDIR=$DEST
+       MT_MFDESTDIR=$DEST
++      MT_DESTROOT=foobar
+       MT_NAMEPART=;;
+    *) # Relative destdir => append to the default.
+       MT_NAMEPART=$DEST;;

diff --git a/ports/mutopia/Anonymous/GNUmakefile b/ports/mutopia/Anonymous/GNUmakefile
new file mode 100644 (file)
index 0000000..aa36317
--- /dev/null
+++ b/ports/mutopia/Anonymous/GNUmakefile
@@ -0,0 +1,3 @@
+ depth = ../../..
+ include $(depth)/ports/ports.make
+ 

diff --git a/ports/mutopia/BaltzarT/GNUmakefile b/ports/mutopia/BaltzarT/GNUmakefile
new file mode 100644 (file)
index 0000000..aa36317
--- /dev/null
+++ b/ports/mutopia/BaltzarT/GNUmakefile
@@ -0,0 +1,3 @@
+ depth = ../../..
+ include $(depth)/ports/ports.make
+ 

diff --git a/ports/mutopia/BanisterJ/GNUmakefile b/ports/mutopia/BanisterJ/GNUmakefile
new file mode 100644 (file)
index 0000000..aa36317
--- /dev/null
+++ b/ports/mutopia/BanisterJ/GNUmakefile
@@ -0,0 +1,3 @@
+ depth = ../../..
+ include $(depth)/ports/ports.make
+ 

diff --git a/ports/mutopia/HattonJ/GNUmakefile b/ports/mutopia/HattonJ/GNUmakefile
new file mode 100644 (file)
index 0000000..aa36317
--- /dev/null
+++ b/ports/mutopia/HattonJ/GNUmakefile
@@ -0,0 +1,3 @@
+ depth = ../../..
+ include $(depth)/ports/ports.make
+ 

diff --git a/ports/mutopia/Traditional/GNUmakefile b/ports/mutopia/Traditional/GNUmakefile
new file mode 100644 (file)
index 0000000..aa36317
--- /dev/null
+++ b/ports/mutopia/Traditional/GNUmakefile
@@ -0,0 +1,3 @@
+ depth = ../../..
+ include $(depth)/ports/ports.make
+ 

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index d6a634499527120a14664121c120abf7a994bf4a..16d769ccb395b059c2121c70b01e14679a4dd827 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -193,7 +193,7 @@ def error (s):
 
 
        '''Report the error S.  Exit by raising an exception. Please
-       do not abuse by trying to catch this error. If you donn't want
+       do not abuse by trying to catch this error. If you do not want
        a stack trace, write to the output directly.
 
        RETURN VALUE

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index a38b9b49f7b5fff74ca31c6cc9a36670bdd77534..d866ce7705b32b55d70fa63a2888fd05740d8a41 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -5,7 +5,7 @@ local-install: local-install-files local-install-outfiles
 local-install-outfiles:
 
 # urg, parameterise
-local-install-files:
+local-install-files: $(INSTALLATION_FILES)
        $(PRE_INSTALL)
        -$(INSTALL) -d $(INSTALLATION_DIR)
        $(foreach i,  $(INSTALLATION_FILES),\