* Documentation/index.texi:

* Documentation/header.html.in:
* Documentation/topdocs/index.tely: Small website fixes and updates.

diff --git a/ChangeLog b/ChangeLog
index 22f922e69337f968832fb57a06e07136af8e9224..5775f7f904f643fe4d0c96fb6d5a4a56963066d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2002-09-22  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * Documentation/index.texi: 
+       * Documentation/header.html.in: 
+       * Documentation/topdocs/index.tely: Small website fixes and updates.
+
+       * debian/: Debian patch by Anthony Fok.
+
+2002-09-21  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Documentation/footer.html.in: How time flies: It's already 2002!
+
+       * Documentation/topdocs/index.tely: Stable/development fix.  Use
+       more descriptive link names than 'here'.
+
        * ROADMAP: Remove test stuff.
 
        * scripts/update-lily.py: Allow auto-building of stable and

diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in
index fdb96eb797d245a53ada7482d3046bba3e0bdebb..b9d9a9badc3199f090d183532df2c85a1747420b 100644 (file)
--- a/Documentation/footer.html.in
+++ b/Documentation/footer.html.in
@@ -28,7 +28,7 @@ Please send comments on these web pages to
 
 <p>
 
-Copyright (c) 1997--2001 Han-Wen Nienhuys and Jan Nieuwenhuizen.
+Copyright (c) 1997--2002 Han-Wen Nienhuys and Jan Nieuwenhuizen.
 
 <p>
 

diff --git a/Documentation/header.html.in b/Documentation/header.html.in
index 1e70051a4b6c6575b7d8930659b825098e8f20a0..55b867a13b260362d1b565501a5e35da9560120c 100644 (file)
--- a/Documentation/header.html.in
+++ b/Documentation/header.html.in
@@ -41,8 +41,9 @@ which substitutes some @AT_VARIABLES@ as well.
       <b>What is LilyPond</b>
       </td></tr>
       <tr><td><font size="-1">
-       <a href="@TOP@index.html">General information</a><br>
+       <a href="@TOP@index.html">Home</a><br>
        <a href="@TOP@examples.html">Examples</a><br>
+       <a href="@TOP@input/template/out-www/template.html">Templates</a><br>
       </font></td></tr>
       <tr><td bgcolor="#e8e8ff">
        <b>Download </b>
@@ -73,8 +74,8 @@ which substitutes some @AT_VARIABLES@ as well.
       </font></td></tr>
     <tr><td bgcolor="#e8e8ff"><b>External sites</b></td></tr>
       <tr><td><font size="-1">
-        <a href="http://www.lilypond.org/development">lilypond.org/development</a><br>
         <a href="http://www.lilypond.org/stable">lilypond.org/stable</a><br>
+        <a href="http://www.lilypond.org/development">lilypond.org/development</a><br>
         <a href="http://savannah.gnu.org/projects/lilypond/">savannah.gnu.org</a><br>
         <a href="ftp://ftp.lilypond.org/pub">ftp.lilypond.org</a><br>
         <a href="http://www.mutopiaproject.org/">Mutopia</a><br>

diff --git a/Documentation/index.texi b/Documentation/index.texi
index 04c6c3dcc6216aa7003202728cc6d31febc14fc3..90b643882d8d73ea97cdaf5596d9018bd85c3174 100644 (file)
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -62,6 +62,9 @@ Windows}.  (Or just @uref{http://cygwin.com/setup.exe, Install Lily Now}).
 @c direct links into first steps and running lily?
 @itemize @bullet
 @item @uref{../user/out-www/lilypond/Tutorial.html,Learn} how to use LilyPond.
+@item
+ @uref{../../input/template/out-www/template.html, Templates}, for
+different music styles.  Add notes, and done!
 @end itemize
 
 @end quotation

diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely
index e0f7e296b1ca5f1335fdf86feb548e2fb78ba1fc..c65f5a0b26a8b40570e72cca86f0ca1e4b60f5c6 100644 (file)
--- a/Documentation/topdocs/index.tely
+++ b/Documentation/topdocs/index.tely
@@ -1,7 +1,9 @@
 \input texinfo @c -*-texinfo-*-
 @setfilename index.info
-@settitle 
+
 @c title looks silly in HTML, because it's just below WEB-TITLE.
+@c well, tough.  a web page needs a title
+@settitle GNU LilyPond
 
 @html
 <!--- @@WEB-TITLE@@=GNU Music Typesetter Homepage --->
@@ -19,11 +21,11 @@
 @end html
 
 
-@unnumberedsec What is LilyPond? What can it do for you?
+@unnumberedsec What is LilyPond?
 
-LilyPond prints beautiful sheet music.  It produces music notation from
-a description file. It excels at typesetting classical music, but you
-can also print pop-songs.
+LilyPond prints beautiful sheet music.  It produces music notation
+from a description file.  It excels at typesetting classical music,
+but you can also print pop-songs.
 
 LilyPond input is @b{plain text}. So, you can use your favorite text
 editor to enter it, you can put it in mail or embed it in an article like
@@ -34,7 +36,7 @@ this:
 @end lilypond
 @end quotation
 Or you can use it to print music from other programs, using one of the
-numerous input filters.
+various input filters.
 
 LilyPond output looks @b{beautiful}. The font and the layout algorithms
 were inspired by engraved music, so you can expect that same clear and
@@ -46,13 +48,25 @@ LilyPond is @b{free software}. It is part of the
 Public License, so you can use, modify and redistribute the program with
 almost no restrictions.
 
+@c stable:
+@ignore
+LilyPond has a stable version and a development version.  This webpage
+is for the @b{stable} version.  This means that it won't change much,
+and it is essentially bug-free.  The development releases contain
+experimental and often buggy code, so you should use those if you need
+any special new features.  If you're still insterested, you may visit
+the @uref{http://lilypond.org/development, latest development
+website}.
+@end ignore
 
-LilyPond has a development version and a stable version. This webpage is
-for the @b{development} release. This release contains experimental and
-often buggy code, so use it only if you need special new features.  On
-the other hand, stable releases don't change much, and are essentially
-bug-free.  You can access the website for the stable releases
-@uref{http://lilypond.org/stable, here}.
+@c development:
+LilyPond has a development version and a stable version.  This webpage
+is for the @b{development} version.  The development releases contain
+experimental and often buggy code, so you should use this only if you
+need any special new features.  The stable releases don't change much,
+and are essentially bug-free.  If you're not a developer, you probably
+want to visit the @uref{http://lilypond.org/stable, latest stable
+website}.
 
 @unnumberedsec Want to know more?
 
@@ -60,6 +74,6 @@ If you want to know more, visit the
 @uref{Documentation/out-www/index.html, documentation page}. If you
 want to see some sheet music, then have a look at the
 @uref{examples.html, examples}.  For even more sheet music, head over
-to @uref{http://www.mutopiaproject.org, the mutopia project}.
+to @uref{http://www.mutopiaproject.org, the Mutopia Project}.
 
 @bye

diff --git a/debian/changelog b/debian/changelog
index 1057e905e07a0bdc31a74969d9f4219440848700..696fe077c5a36a65272be3bfce09eeaf7936fd78 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+lilypond (1.6.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Higher urgency because of memory corruption bugs in previous releases.
+
+ -- Anthony Fok <foka@debian.org>  Sun, 22 Sep 2002 01:55:29 +0800
+
+lilypond (1.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Sat, 21 Sep 2002 11:14:48 +0800
+
 lilypond (1.6.2-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 5f3571eca34b5a102ab0491cad88f4fef5477067..b12664777d1efcd727e24b722a120807caf75c3b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,14 +28,14 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Suggests: lilypond (>= 1.6.2-1), postscript-viewer, www-browser
+Suggests: lilypond (>= ${Source-Version}), 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 typesetting software.
 
 Package: lilypond1.3
 Architecture: arm i386 m68k powerpc sparc
-Depends: lilypond (>= 1.6.2-1)
+Depends: lilypond (>= ${Source-Version})
 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 and now 1.6 series

diff --git a/debian/control.foka b/debian/control.foka
index 5f3571eca34b5a102ab0491cad88f4fef5477067..b12664777d1efcd727e24b722a120807caf75c3b 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -28,14 +28,14 @@ Description: A program for printing sheet music.
 Package: lilypond-doc
 Section: doc
 Architecture: all
-Suggests: lilypond (>= 1.6.2-1), postscript-viewer, www-browser
+Suggests: lilypond (>= ${Source-Version}), 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 typesetting software.
 
 Package: lilypond1.3
 Architecture: arm i386 m68k powerpc sparc
-Depends: lilypond (>= 1.6.2-1)
+Depends: lilypond (>= ${Source-Version})
 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 and now 1.6 series

diff --git a/debian/rules b/debian/rules
index 2c715919c7b9e80766859c7e0ebfa06dcccdf248..b3ade4c133ccb06261767c68534037c29bb6f719 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,8 @@ d = usr/share/doc/$(package)
 include VERSION
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
 
+#export CC = gcc-3.2
+#export CXX = g++-3.2
 gcc_version = $(shell g++ --version 2>&1 \
                | grep '[0-9]\.[0-9]' | head -1 \
                | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
@@ -148,7 +150,7 @@ binary-arch: build install
 #      dh_installcron
 #      dh_installman
 #      dh_undocumented
-       dh_installchangelogs -k CHANGES
+       dh_installchangelogs ChangeLog
        dh_link usr/share/lilypond/$(VERSION)/tex \
                        usr/share/texmf/tex/lilypond \
                usr/share/lilypond/$(VERSION)/fonts/source \