Imported Debian patch 2.12.3-1

diff --git a/Documentation/ja/user/introduction.itely b/Documentation/ja/user/introduction.itely
index 407505a89abf3b9584483ab907c169ee273658bb..3aa0634f9662ad6dda3e940af0fce799c951e7f6 100644 (file)
--- a/Documentation/ja/user/introduction.itely
+++ b/Documentation/ja/user/introduction.itely
@@ -629,7 +629,7 @@ f4
 
 上で示した楽譜の断片はすべて手作業で作成されていました。しかしながら、必ずしも手作業で行う必要はありません。フォーマット エンジンの大部分は自動化されているため、その出力を音楽を操作する他のプログラムに供することができます。例えば、音楽の断片のデータベースをウェブサイトやマルチメディア プレゼンテーションで使用する画像に変換するために使用することもできます。
 
-このマニュアルも利用例です: 入力フォーマットはテキストなので、容易に他のテキスト ベースのフォーマット -- 例えば、@LaTex{}, HTML, このマニュアルの場合は Texinfo -- に埋め込むことができます。ある特別なプログラムによって入力断片を音楽イメージに置き換えることができ、それによって PDF や HTML の出力ファイルという結果を得ることができます。これはドキュメントの中で音楽とテキストを混在させることを容易にします。
+このマニュアルも利用例です: 入力フォーマットはテキストなので、容易に他のテキスト ベースのフォーマット -- 例えば、@LaTeX{}, HTML, このマニュアルの場合は Texinfo -- に埋め込むことができます。ある特別なプログラムによって入力断片を音楽イメージに置き換えることができ、それによって PDF や HTML の出力ファイルという結果を得ることができます。これはドキュメントの中で音楽とテキストを混在させることを容易にします。
 
 
 

diff --git a/Documentation/ja/user/macros.itexi.debdiff b/Documentation/ja/user/macros.itexi.debdiff
new file mode 100644 (file)
index 0000000..6eeb8e1
--- /dev/null
+++ b/Documentation/ja/user/macros.itexi.debdiff
@@ -0,0 +1,460 @@
+@c -*- coding: utf-8; mode: texinfo; -*-
+@ignore
+    Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+@end ignore
+
+
+@include version.itexi
+
+@c Translators: Yoshiki Sawada
+
+@c Don't replace quotes with directed quotes.
+
+@set txicodequoteundirected
+@set txicodequotebacktick
+
+
+
+@c   ***** Displaying text *****
+
+@c We need this since @q{\} doesn't work with makeinfo 4.11 --
+@c say @q{@bs{}} instead.
+
+@macro bs
+\\
+@end macro
+
+@macro hash
+\#
+@end macro
+
+@c To get decent quotes in `foo' and ``foo''.
+@c FIXME: Use thin spaces for @qq.
+
+@ifnotinfo
+
+@macro q{TEXT}
+@quoteleft{}\TEXT\@quoteright{}
+@end macro
+
+@macro qq{TEXT}
+@quotedblleft{}\TEXT\@quotedblright{}
+@end macro
+
+@end ifnotinfo
+
+@ifinfo
+
+@macro q{TEXT}
+`\TEXT\'
+@end macro
+
+@macro qq{TEXT}
+« \TEXT\ »
+@end macro
+
+@end ifinfo
+
+
+@ifhtml
+
+@macro warning{TEXT}
+@cartouche
+@b{Note:} \TEXT\
+@end cartouche
+@end macro
+
+@end ifhtml
+
+@ifnothtml
+
+@macro warning{TEXT}
+@quotation
+@quotation
+@cartouche
+@b{Note:} \TEXT\
+@end cartouche
+@end quotation
+@end quotation
+@end macro
+
+@end ifnothtml
+
+
+@ifnotinfo
+
+@macro notation{TEXT}
+@var{\TEXT\}
+@end macro
+
+@end ifnotinfo
+
+@ifinfo
+
+@macro notation{TEXT}
+\TEXT\
+@end macro
+
+@end ifinfo
+
+
+@macro smallspace
+@sp 1
+@end macro
+
+
+
+@c   ***** Displaying images not generated by lilypond-book *****
+
+@c Current installation setup of Info docs requires that all images are
+@c expected to be found in the `lilypond/' subdirectory.  `lilypond-book'
+@c already generates proper @image commands for images of music; these
+@c macro definitions do the same for other images.
+
+@ifnotinfo
+
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
+@end macro
+
+@end ifnotinfo
+
+@ifinfo
+
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{lilypond/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
+@end macro
+
+@end ifinfo
+
+
+
+@c   ***** Headings in a doc subsection *****
+
+@c Don't insert an empty line after @predefined!  Right now
+@c it doesn't matter, but a future implementation will probably
+@c add some code which needs this restriction.
+
+@macro predefined
+@noindent
+@subsubheading Predefined commands
+@end macro
+
+@c The next macro is a dummy currently since texinfo doesn't
+@c provide a real ragged-right environment yet.
+@c
+@c Due to a bug in texi2html (texi2html.pl CVS versions <= 1.245)
+@c the macro must not be empty.
+
+@macro endpredefined
+@c
+@end macro
+
+
+@macro snippets
+@noindent
+@subsubheading Selected Snippets
+@end macro
+
+
+@c Don't insert an empty line after @seealso!  Otherwise we get
+@c unwanted extra vertical space in the PDF output.
+
+@macro seealso
+@noindent
+@subsubheading See also
+@indent
+@end macro
+
+
+@macro knownissues
+@noindent
+@subsubheading Known issues and warnings
+@end macro
+
+
+@macro lydoctitle {TEXT}
+@emph{\TEXT\}
+@end macro
+
+
+@c Don't remove the `@c' within the macro definition!  See section 19.3,
+@c `Macro Details and Caveats', in the texinfo info file for explanation.
+
+@macro funindex {TEXT}
+@findex \TEXT\
+@kindex \TEXT\
+@c
+@end macro
+
+
+
+@c   ***** Links and references *****
+
+@c  Definitions for references:
+@c
+@c     @rglos
+@c     @rlearning
+@c     @ruser
+@c     @rprogram
+@c     @rlsr
+@c     @rinternals
+@c
+@c  All these also have a @...named version which allows to specify the
+@c  displayed text for the reference as second argument.
+@c
+@c ***** HTML + bigpage is a special case (other manual names); all other
+@c formats are treated similarly.
+
+
+@c *** not TeX ***
+
+@ifnottex
+
+@c ** bigpage **
+
+@ifset bigpage
+
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary-big-page,Music Glossary}
+@end macro
+
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Music Glossary}
+@end macro
+
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning-big-page,Learning Manual}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Learning Manual}
+@end macro
+
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-big-page,Notation Reference}
+@end macro
+
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notation Reference}
+@end macro
+
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program-big-page,Application Usage}
+@end macro
+
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Application Usage}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets-big-page,Snippets}
+@end macro
+
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Snippets}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Internals Reference}
+@end macro
+
+@end ifset
+
+
+@c ** not bigpage **
+
+@ifclear bigpage
+
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary,Music Glossary}
+@end macro
+
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary}
+@end macro
+
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@end macro
+
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond,Notation Reference}
+@end macro
+
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
+@end macro
+
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program,Application Usage}
+@end macro
+
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Snippets}
+@end macro
+
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
+@end macro
+
+@end ifclear
+
+@end ifnottex
+
+
+@c *** TeX ***
+
+@iftex
+
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary,Music Glossary}
+@end macro
+
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary}
+@end macro
+
+@macro rlearning{TEXT}
+@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual}
+@end macro
+
+@macro ruser{TEXT}
+@ref{\TEXT\,,,lilypond,Notation Reference}
+@end macro
+
+@macro rusernamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
+@end macro
+
+@macro rprogram{TEXT}
+@ref{\TEXT\,,,lilypond-program,Application Usage}
+@end macro
+
+@macro rprogramnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Snippets}
+@end macro
+
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
+@end macro
+
+@end iftex
+
+
+
+
+
+@c   ***** Macros specific to translated docs *****
+
+@c ugh, cannot set/define global variable 'translationof' in some way?
+
+@iftex
+
+@macro translationof{TEXT}
+@end macro
+
+@end iftex
+
+@ifinfo
+
+@macro translationof{TEXT}
+@set translationof \TEXT\
+@end macro
+
+@end ifinfo
+
+
+@c TODO: If @translationof is used in translated docs
+@c see whether it is feasible to say @value{translationof}.
+
+@macro englishref
+Cette section n'est pas encore encore traduite, veuillez
+vous reporter à la documentation correspondante en anglais.
+@end macro
+
+
+@ifhtml
+
+@ifset bigpage
+@macro untranslated
+@end macro
+@end ifset
+
+@ifclear bigpage
+@macro untranslated
+UNTRANSLATED NODE: IGNORE ME
+@end macro
+@end ifclear
+
+@end ifhtml
+
+@ifnothtml
+
+@macro untranslated
+@end macro
+
+@end ifnothtml

diff --git a/Documentation/user/lilypond-learning.tely b/Documentation/user/lilypond-learning.tely
index cb0c89f1fccba85d76b04cc8998d4ddb239ff7a7..33b08af0ed317c0454e11acd6df8ca8965d3f77f 100644 (file)
--- a/Documentation/user/lilypond-learning.tely
+++ b/Documentation/user/lilypond-learning.tely
@@ -15,6 +15,11 @@
 @afourpaper
 
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Learning Manual: (lilypond-learning).  Start here.
+@end direntry
+
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival

diff --git a/Documentation/user/lilypond-program.tely b/Documentation/user/lilypond-program.tely
index ba1722c39f5422485b26b95e1d3b04256fdf8564..95feccbe30727311fba28225466f3823149e5d0c 100644 (file)
--- a/Documentation/user/lilypond-program.tely
+++ b/Documentation/user/lilypond-program.tely
@@ -14,6 +14,11 @@
 
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Application Usage: (lilypond-program). Installing and running applications.
+@end direntry
+
 
 @c don't remove this comment.
 @ignore

diff --git a/debian/GNUmakefile b/debian/GNUmakefile
new file mode 100644 (file)
index 0000000..e4c6cf3
--- /dev/null
+++ b/debian/GNUmakefile
@@ -0,0 +1,41 @@
+# debian/Makefile
+
+depth = ..
+
+NAME = debian
+at-dir = $(outdir)/
+at-ext =
+
+CONF_FILES = changelog control copyright emacsen-startup\
+ preinst rules watch
+
+EXTRA_DIST_FILES = $(CONF_FILES)\
+ README.Debian\
+ TODO\
+ compat\
+ control.foka\
+ control.potato\
+ lilypond-data.dirs\
+ lilypond-data.doc-base\
+ lilypond-data.emacsen-startup\
+ lilypond-data.install\
+ lilypond-data.postinst\
+ lilypond-data.postrm\
+ lilypond-doc.README.Debian\
+ lilypond-doc.dirs\
+ lilypond-doc.doc-base\
+ lilypond-doc.postinst\
+ lilypond-doc.prerm\
+ lilypond.doc-base\
+ lilypond.install\
+ lilypond1.3.copyright\
+ #
+
+
+#OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES)
+OUTCONF_FILES = $(OUTIN_FILES)
+OUT_DIST_FILES = $(OUTIN_FILES)
+
+STEPMAKE_TEMPLATES = debian
+include $(depth)/make/stepmake.make 
+

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..c257da9
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,43 @@
+lilypond for Debian
+-------------------
+
+Dear music lover:
+
+  Welcome to the wonderful world of music typesetting!  ^_^
+  This is the Debian package of GNU LilyPond.
+  Hope you enjoy producing beautiful music scores with GNU LilyPond
+  and other related packages!  ^_^
+
+  Note:
+    If you experience problems about missing EC fonts during the TeX run,
+    please make sure you have the tetex-extra package installed.
+
+Old LilyPond Fonts Issue:
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  If you installed the lilypond_0.1.48-1 or previous versions of the
+  Debian GNU LilyPond package, please note the following:
+
+    LilyPond comes with its own MF fonts starting with version 0.1.12.
+
+    The old lilypond fonts were not listed in
+    /usr/lib/texmf/fontname/special.map (from the teTeX 0.4 package),
+    therefore the fonts were created in a non-standard directory
+    somewhere under /var/spool/texmf.  The problem was usually only
+    aesthetic.  TeTeX could create and find the *.tfm and *.pk files
+    without any problems.
+
+    However, if you experience any font problems (such as the note
+    heads not showing up, characters in the wrong places, error
+    messages from TeX), especially after upgrading to a new version of
+    LilyPond, you may need to delete the relevant *.tfm and *.pk files
+    under the directory /var/spool/texmf.  You may also file a bug
+    report about this if you like.
+
+  Nonetheless, GNU LilyPond now comes with the standard "feta" fonts,
+  and they are already listed in the latest teTeX 0.9 / Web2C 7.2
+  /usr/share/texmf/fontname/special.map file, so there shouldn't be any
+  more problems!  Enjoy!  :-)
+
+
+Anthony Fok <foka@debian.org>, Wed,  7 Jul 1999 15:19:48 -0600

diff --git a/debian/TODO b/debian/TODO
new file mode 100644 (file)
index 0000000..70a3b20
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,12 @@
+To be added to the changelog when a new texinfo is available:
+
+  * Build-Depends: texinfo (>= 4.7-1) to avoid the old HTML tag mismatch
+    for @subsection (<h3>...</h4>) bug in makeinfo.  Thanks to Magnus Henoch
+    for the bug report.  (Closes: Bug#204202)
+
+ -- Anthony Fok <foka@debian.org>  Sun, 26 Oct 2003 12:21:35 +0800   
+
+
+  * Inefficient packaging of arch independent data in package lilypond
+   (Closes: Bug#233406)
+  * split font into another package? (Closes: Bug#87700)

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..ac23654
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,1516 @@
+lilypond (2.12.3-1) unstable; urgency=low
+
+  * New upstream release
+    - Ditch claop.py (Closes: #545911)
+    - fix FTBFS (Closes: #560487)
+  * Always suppress gs startup output
+  * Build-Depend on texlive-latex-recommended
+  * Move Pre-Depends: for kpsewhich to Depends: (we no longer ship a preinst)
+  * Update standards version
+    - Stop calling install-info directly; use triggers instead
+
+ -- Don Armstrong <don@debian.org>  Tue, 23 Feb 2010 00:12:21 -0800
+
+lilypond (2.12.2-1) unstable; urgency=low
+
+  * New maintainer
+  * Use patches from Raphael Geissert to fix bashism and remove path to
+    commands 
+    - Fix bashism in debian/rules. Closes: #535404 
+    - Remove the path to the commands in the maintainer scripts
+
+ -- Don Armstrong <don@debian.org>  Wed, 08 Jul 2009 16:01:06 -0700
+
+lilypond (2.12.2-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release (closes: #506936)
+    - Resolves issue with guile 1.8.6 (closes: #524023)
+    - Fixes FTBFS (closes: #524086)
+  * Remove build-coonflicts indep on gs-gpl as the conflicting versions
+    aren't distributed anymore
+  * Remove versioned build dependencies (all of the requirements are older
+    than the oldest we distribute)
+  * Add Build-Depends on texi2html and texlive-metapost
+  * Move Homepage: to a control header (closes: #474262)
+  * Add ja/user/macros.texi and python/langdefs from git commit
+    4ee200780114be081a73cae3f7bf6bbc84a30b53 (Allows building the ja texi
+    documentation)
+
+ -- Don Armstrong <don@debian.org>  Sat, 06 Jun 2009 13:49:11 -0700
+
+lilypond (2.10.33-2.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix double build problem as patched by Peter Eisentraut
+    <petere@debian.org> (Closes: #482911).
+  * Do not list transitional package first in Pre-Depends
+    line (Closes: #481776).
+  * Changed build dependency from gs-gpl|gs-esp to ghostscript
+    to not reference transitional packages.
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 05 Oct 2008 13:48:20 +0200
+
+lilypond (2.10.33-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with dash (Closes: #471757).
+
+ -- Peter Eisentraut <petere@debian.org>  Sun, 25 May 2008 03:27:26 +0200
+
+lilypond (2.10.33-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with GCC 4.3 (Closes: #413427).
+  * Copy config.{guess,sub} to fix FTBFS on GNU/kFreeBSD (Closes: #404441).
+
+ -- Luk Claes <luk@debian.org>  Sat, 08 Mar 2008 13:43:35 +0000
+
+lilypond (2.10.33-2) unstable; urgency=low
+
+  * debian/control (Build-Depends-Indep): Use ttf-dejavu instead of
+    ttf-bitstream-vera.  (Closes: #461271)
+  
+  * debian/control (Standards-Version): Update to 3.7.3. (No changes needed.)
+  
+  * debian/rules (clean): Don't ignore all errors on recursive make invocations.
+  
+  * debian/rules (binary-indep): Use $(CURDIR) instead of $(PWD).
+  
+  * debian/copyright: Update FSF address to Franklin St.
+  
+  * debian/changelog: Fix syntax for trailer line for 2.8.7-3.1 record.
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Thu, 17 Jan 2008 10:24:27 -0800
+
+lilypond (2.10.33-1) unstable; urgency=low
+
+  * New upstream release.
+  
+  * debian/control (lilypond Depends): Use source:Version instead of
+  Source-Version.
+  (lilypond-doc Suggests): Likewise.
+  (lilypond-data Recommends): Likewise, but with >= in place of = as well.
+  (Closes: #380071).  Thanks to Lior Kaplan for the patch.
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Wed, 02 Jan 2008 10:11:04 -0700
+
+lilypond (2.10.29-2) unstable; urgency=low
+
+  * debian/control: Drop gs-afpl from Build-Conflicts-Indep, since that package
+    no longer exists. (Closes: #447460).
+  * debian/control: Build-Conflict with guile-1.8-dev version 1.8.2+1-2,
+    which had an ABI-incompatible change by mistake.  Likewise, lilypond
+    package Conflicts with guile-1.8 version 1.8.2+1-2. (Closes: #452647)
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Fri, 30 Nov 2007 22:20:42 -0500
+
+lilypond (2.10.29-1) unstable; urgency=low
+
+  * New upstream release.  Require at least version 1.1.19 of mftrace.
+    Require at least version 2.4 of python-dev.  (Closes: #396889,
+    #399356, #400335)
+  * debian/control (Build-Depends-Indep): Add rsync.
+  
+  * Acknowledge NMU (Closes: #422395).
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Sat, 08 Sep 2007 20:08:21 -0400
+
+lilypond (2.8.7-3.1) unstable; urgency=low
+  
+  * Non-maintainer upload.
+  * FTBFS: ! I cannot find file 'lcircle10'. (Closes: #422395)
+  
+ -- Neil Williams <codehelp@debian.org>  Tue, 17 Jul 2007 12:59:43 +0100  
+   
+lilypond (2.8.7-3) unstable; urgency=medium
+
+  * scripts/midi2ly.py: When setting DATADIR, find Lilypond python files
+    in the @TOPLEVEL_VERSION@ directory, not 'current'.  Patch thanks to
+    Chris Lamb (chris@chris-lamb.co.uk).  (Closes: #400550)
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Tue, 19 Dec 2006 10:18:12 -0800
+
+lilypond (2.8.7-2) unstable; urgency=low
+
+  * debian/control (Build-Depends-Indep): Drop gs alternative for
+    Ghostscript.  Move gs-gpl | gs-esp to Build-Depends.  
+    (Build-Depends): Put gs-gpl | gs-esp here; require at least version
+    8.50 of either.  Require version 2.1 at least of python-dev.
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Sat, 11 Nov 2006 21:11:48 -0800
+
+lilypond (2.8.7-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #357057, #358663)
+  * debian/control (Build-Depends): Require at least version
+    0.0.20060125-1 of fontforge.  Require at least version 4.8.dfsg.1-1 of
+    texinfo.  Require guile-1.8-dev instead of guile-1.6-dev.
+  * debian/control (Build-Depends-Indep): Require gsfonts | gsfonts-x11 to
+    fetch New Century Schoolbook fonts.
+  * debian/control (lilypond/Depends): Require guile-1.8 instead of guile-1.6.
+  * debian/rules (install): Don't delete texinfo.tex anymore, upstream is
+    no longer shipping it.
+    
+  * debian/control (Build-Depends): Add libgmp3-dev and libltdl3-dev,
+    temporarily. to workaround missing dependencies in guile-1.8-dev.
+  
+  * debian/control (lilypond-data/Pre-Depends): Allow texlive-base as an
+    alternative to tetex-bin. (Closes: #386589)
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Wed, 25 Oct 2006 23:26:15 -0700
+
+lilypond (2.6.5-3) unstable; urgency=medium
+
+  * debian/rules (install): Don't install .pyc files.
+  * debian/control (Build-Depends): Require python-support and at least
+    version 5 of debhelper.
+    (lilypond-data/Depends): Add ${python:Depends}.
+  * debian/rules (binary-indep): Call dh_pysupport on our private modules
+    directory. (Closes: #392488)
+  
+  * debian/compat: Bump to version 5.
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Thu, 12 Oct 2006 11:59:58 -0700
+
+lilypond (2.6.5-2) unstable; urgency=low
+
+  * debian/rules (HOME): Set this environment variable to a usable value
+    to avoid a fontconfig buglet.
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Mon, 18 Sep 2006 23:01:35 -0700
+
+lilypond (2.6.5-1) unstable; urgency=low
+
+  * New upstream release.  Lilypond 2.8 for Debian is currently stalled
+    because guile-1.8 is required for it, and the Debian builds of
+    guile-1.8 are encountering bugs.  So let's at least get the last
+    lilypond-2.6 into etch in case guile-1.8 doesn't get there in time.
+  * stepmake/bin/config.sub, stepmake/bin/config.guess: Use debian
+    versions, from autotools-dev 20060702.1.
+  
+  * lily/include/accidental-interface.hh (Accidental_interface): Declare
+    member accurate_boxes without qualification.
+  * lily/include/stem.hh (Stem): Declare member beam_multiplicity without
+    qualification.
+  * lily/include/slur-scoring.hh (Slur_score_state): Declare member
+    generate_avoid_offsets without qualification.
+    (Thanks to Martin Michlmayr <tbm@cyrius.com> for the patch.)
+    (Closes: #357057, #387644)
+
+  * mf/GNUmakefile (pfa_warning): Select only the first line of mftrace
+    --version output for mftrace check, since mftrace now prints more than
+    just one line.
+  
+  * debian/control (Build-Depends-Indep): Add ttf-bitstream-vera and
+    ttf-freefont. (Many thanks to Bill Allombert <allomber@math.u-bordeaux>
+    for the fix.) (Closes: #359855)
+    
+  * debian/control (Build-Depends): Require at least version 2.4.1-1 of
+    libfontconfig1-dev; 2.4.0 was missing FcConfigAppFontAddDir, which we
+    need.
+  
+  * debian/rules (binary-indep): Don't symlink logos anymore.
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Thu,  7 Sep 2006 22:34:19 -0700
+
+lilypond (2.6.3-10) unstable; urgency=low
+
+  * debian/control (Build-Depends): Drop explicit dependency on
+    g++-3.4. 
+  * debian/rules: No longer set CXX demanding g++-3.4 on certain
+    archs.  (Closes: #343007)
+  
+  * debian/lilypond-data.postrm: Don't set TEXMFMAIN at all (it isn't
+    used).  Don't try and set VARTEXFONTS if $1 is "purge".  Don't remove
+    fonts on a purge command; it gets done at remove time and that's
+    sufficient.  (All this is necessary because postrm scripts cannot
+    depend on non-essential packages at purge time.)  (Closes: #325907)
+    
+  * debian/control (lilypond-data): Pre-Depends on tetex-bin to make sure
+    kpsewhich is available for the maintainer scripts.  (Closes: #336052,
+    #343182, #335847).
+    
+  * debian/control (Build-Depends): No longer accept libguile-dev for
+    guile support, and require at least version 1.6.7 of guile-1.6-dev.
+    (lilypond): Likewise here, require version 1.6.7 of guile-1.6.
+    (Closes: #337597)
+  
+  * debian/control (lilypond): Spell "seamlessly" correctly.  (Closes:
+    #327675)
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Fri, 13 Jan 2006 12:59:15 -0800
+
+lilypond (2.6.3-9) unstable; urgency=low
+
+  * Packaging suggestions from upstream:
+  * debian/control (Build-Depends): Drop ec-fonts-mftraced,
+    libkpathsea-dev, tetex-bin, tetex-extra.  
+   (Build-Depends-Indep): Add emacs-intl-fonts, xfonts-intl-arabic,
+    xfonts-intl-asian, xfonts-intl-chinese, xfonts-intl-chinese-big,
+    xfonts-intl-european, xfonts-intl-japanese, xfonts-intl-japanese-big,
+    xfonts-intl-phonetic, ttf-kochi-gothic, ttf-kochi-mincho.  (These
+    get embedded into the generated webpage.)
+   (lilypond): Don't depend on ec-fonts-mftraced, tetex-bin, or tetex-extra. 
+   (lilypond-data): Don't depend on tetex-bin.
+  
+  * debian/control (Build-Depends): Drop long-unneeded version dependency
+    on binutils and libc6-dev and its variants.
+    
+  * debian/gui-2.6.patch: New file, provided by upstream.  Applied, with
+    suitable massaging of ChangeLog.
+  * debian/rules, scm/lily.scm: Revert change from 2.6.3-7.
+    
+  * debian/python-2.6.patch: New file, provided by upstream.  Applied, with 
+    suitable massaging of ChangeLog.
+  * debian/rules (install): Revert change from 3.6.3-6.
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  23 Oct 2005 15:22:34 -0700
+
+lilypond (2.6.3-8) unstable; urgency=low
+
+  * Avoid GCC 4.0 bug on arm, hppa, and m68k.
+  * debian/control (Build-Depends): Add g++-3.4 on arm, hppa, and m68k.
+  * debian/rules: On arm, hppa, and m68k, use g++-3.4 for CXX.
+  (Closes: #335287)
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Sat, 22 Oct 2005 23:18:36 -0700
+
+lilypond (2.6.3-7) unstable; urgency=low
+
+  * debian/rules (build, build-doc): Abandon attempts to have a terminal
+    set as stdin.  Instead, set and export environment variable
+    LILYPONDNOGUI.
+  * scm/lily.scm (running-from-gui?): Return #f anytime LILYPONDNOGUI
+    environment variable is set.  (Closes: #334877)
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Sat, 22 Oct 2005 15:18:35 -0700
+
+lilypond (2.6.3-6) unstable; urgency=low
+
+  * debian/rules (install): Move midi.so from /usr/share into /usr/lib and 
+    leave behind a symlink to find it.
+  * debian/lilypond.install: Add usr/lib.
+    (Closes: #335207)
+  
+  * debian/rules (build, build-doc): Use screen to set up a tty for input
+    instead of relying on /dev/tty; that will work in more environments.
+  * debian/control (Build-Depends, Build-Depends-Indep): Add screen.  Gak.
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Sat, 22 Oct 2005 10:51:49 -0700
+
+lilypond (2.6.3-5) unstable; urgency=low
+
+  * debian/rules (build, build-doc): Redirect input from /dev/tty in MAKE
+    invocations.  It seems that lilypond assumes that, if stdin is not a
+    terminal, we must be running under a gui.  This changes the behavior
+    of the program in several fundamental ways, causing the scripts used
+    for generating documentation to fail. (Closes: #334877)
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Fri, 21 Oct 2005 20:33:11 -0700
+
+lilypond (2.6.3-4) unstable; urgency=low
+
+  * debian/control (Build-Depends): Require libfreetype6-dev,
+    libpango1.0-dev, and libfontconfig-dev.  Grr, I think this does it.
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Wed, 19 Oct 2005 20:48:51 -0700
+
+lilypond (2.6.3-3) unstable; urgency=low
+
+  * debian/control (Build-Depends): Require pkg-config, at least version
+    0.9.0.
+  
+  * debian/control (Build-Depends): Accept libc0.1-dev (>= 2.2.4-6) as a
+    libc alternative.
+  * stepmake/bin/config.guess, stepmake/bin/config.sub: Use debian
+    versions, from autotools-dev 20050803.1.  (Closes: #334786)
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Wed, 19 Oct 2005 16:40:21 -0700
+
+lilypond (2.6.3-2) unstable; urgency=low
+
+  * debian/rules (clean): Don't fail if lib/python isn't hanging around.
+    (Closes: #334725).
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Wed, 19 Oct 2005 09:41:10 -0700
+
+lilypond (2.6.3-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #323526, #315970, #316125, #314242)
+  * upstream-debian: holds the "debian" directory that upstream insists on
+    packaging, and which makes updating versions a royal PITA.  So we'll just
+    store what they do there, and then let them do what they want, and build
+    ourselves for the Debian way.
+  * debian/rules (binary-indep): No longer look for lilypond.map file or
+    install it.
+  * debian/lilypond-data.dirs: Drop etc/texmf/dvips.
+  * debian/watch: Look in the v2.6 download directory now.
+  * debian/lilypond.install: Don't worry about usr/lib anymore.
+  * debian/rules (binary-indep): No longer does upstream build PS docs, so 
+    we no longer make symlinks to them.
+  
+  * debian/control (clean): Remove annoying lib/python symlink.
+  
+  * debian/control (lilypond): Update description to mention SVG.
+  
+  * debian/control (lilypond1.3): Drop transitional package.
+  * debian/lilypond1.3.copyright: Remove file.  (Closes: #308709)
+  * debian/control (lilypond): Don't conflict with lilypond1.3 or
+    musixtex-fonts anymore.
+  
+  * debian/control (lilypond-data): Depend on texinfo | texlive-texinfo.
+  * debian/rules (install): Don't install texinfo.tex.  (Closes: #322338)
+    
+  * debian/control (Build-Depends): Require version 0.0.20050911-1 of
+    fontforge, or greater, to avoid crashes during building.
+    
+  * debian/control (Build-Depends): Require at least version 1.1.17-1 of
+    mftrace, to avoid a gcc4-related bug that was only fixed in that version.
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Tue, 18 Oct 2005 19:33:41 -0700
+
+lilypond (2.4.5-2) unstable; urgency=low
+
+  * debian/control (Build-Depends): Build system demands you have
+    ec-fonts-mftraced installed to build, so do it.
+
+ -- Thomas Bushnell, BSG <tb@debian.org>  Fri,  8 Apr 2005 04:38:44 -0700
+
+lilypond (2.4.5-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #285370, #296034, #300609)
+  * debian/control (Build-Depends): Remove fontforge, autotrace, t1utils,
+    imagemagick.
+  (Build-Depends-Indep): Add imagemagick.
+  (lilypond Depends): Add ec-fonts-mftraced.
+  * debian/rules (binary-indep): Get lilypond.map from its new location.
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Thu,  7 Apr 2005 12:48:17 -0700
+
+lilypond (2.2.6-3) unstable; urgency=low
+
+  * New maintainer.  (Closes: #278502).
+  
+  * debian/control: Build-Depends on autotrace.  (Closes: #289376).
+    
+  * mf/GNUmakefile (.pfa generic rule): Use "--formats=pfa" instead of "--pfa."
+  * stepmake/metafont-rules.make: Likewise; also for .pfb generic rule.
+  * debian/control: Require at least version 1.1.5-1 of mftrace.
+  
+ -- Thomas Bushnell, BSG <tb@debian.org>  Mon, 14 Mar 2005 10:44:03 -0800
+
+lilypond (2.2.6-2.1) unstable; urgency=high
+
+  * Non-maintainer upload during BSP
+  * Version build-dep on fontforge, only newest upstream seems to be able to
+    build this package. Thanks Bastian Kleineidam <calvin@debian.org> for
+    fixing fontforge and suggesting this fix (Closes:#278502)
+
+ -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl>  Sat,  8 Jan 2005 19:54:27 +0100
+
+lilypond (2.2.6-2) unstable; urgency=high
+
+  * Added the Werner Lemberg's Asian scripts examples.  He e-mailed me
+    and said, "I suggest that you add the two example files to the
+    Debian package also -- the mailing list archive of the lilypond
+    list shows garbage only (at least for me)."  Yes, ditto here.
+    So yes, xiao-haizi-guai-guai.ly and sakura-sakura.ly are in!  :-)
+  * The "-sDEVICE=bbox" bug has been fixed in gs-gpl (8.01-5), so I have
+    adjusted debian/control accordingly.  (Note to self: Need to check
+    gs-afpl (8.14-3) to see if it too can be taken off the blacklist.)
+
+ -- Anthony Fok <foka@debian.org>  Sun, 19 Sep 2004 06:39:07 +0800
+
+lilypond (2.2.6-1) unstable; urgency=high
+
+  * New upstream stable release.  (Closes: Bug#264263)
+  * urgency=high to ensure entrance into Debian Sarge.
+  * Special thanks to Daniel Burrows for the previous NMUs!  :-)
+    (Closes: #257335, #261861)
+  * Added patch by Werner Lemberg to lilypond.py so that Asian scripts
+    may be used with LilyPond.  Need to "apt-get install latex-ucs"!  See
+    http://lists.gnu.org/archive/html/lilypond-devel/2004-07/msg00071.html
+  * Thanks to Ferenc Wagner for letting me know of some packaging bugs
+    that I have introduced over the years:
+     - Removed obsolete MAKE_PFA_FILES=1 from "make" invocations.
+     - s/--enable-optimise/--enable-optimising/;
+     - Removed Build-Depends: autotrace; mftrace prefers potrace.
+  * Let's follow Han-wen's Red Hat SPECS file too: --disable-checking.
+
+ -- Anthony Fok <foka@debian.org>  Thu, 26 Aug 2004 02:30:04 +0800
+
+lilypond (2.2.3-1.3) unstable; urgency=low
+
+  * The doc-base file was coming from upstream!  Kill it dead in
+    debian/rules clean so that it doesn't keep coming back from
+    the grave to haunt me. (Closes: #261861)
+
+ -- Daniel Burrows <dburrows@debian.org>  Mon,  2 Aug 2004 16:03:32 -0400
+
+lilypond (2.2.3-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Added Replaces: lilypond (<= 2.2.3-1), lilypond-data (<= 2.2.3-1) to
+    lilypond-doc. (Closes: #261861)
+
+ -- Daniel Burrows <dburrows@debian.org>  Wed, 28 Jul 2004 13:08:57 -0400
+
+lilypond (2.2.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Removed doc-base files for the lilypond and lilypond-data packages;
+    moved the description of the info files to the doc-base file of the
+    lilypond-doc package, which actually contains them; corrected the
+    location of the info files in the doc-base file. (Closes: #257335)
+
+ -- Daniel Burrows <dburrows@debian.org>  Sat, 17 Jul 2004 12:55:57 -0400
+
+lilypond (2.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Sun, 27 Jun 2004 16:53:06 +0800
+
+lilypond (2.2.2-2) unstable; urgency=low
+
+  * New upstream release.  (Closes: Bug#242861)
+    - Thanks to Pedro Kroeger for providing interim sid packages while
+      I was away for an extended period of time.
+  * Copied some ideas from Ferenc Wagner's LilyPond for woody (Thanks!):
+     - Split out shared data to lilypond-data package.  (Closes: Bug#233406)
+     - Make lilypond-data conflict with earlier lilypond versions.
+     - debian/control: Relaxed autotrace Build-Depends (>= 0.29).
+     - debian/control: Added imagemagick Build-Depends (>= 5.4.4.5).
+  * Added more details to lilypond package description.  (Closes: Bug#245370)
+  * gs-gpl 8.01 (and gs-afpl 8.14) dies when building LilyPond docs.
+    (Known -sDEVICE=bbox bug in gs 8.01 and newer, see gs-gpl Bug#250290.)
+    Added Build-Conflict-Indep: gs-gpl (>= 8.01) | gs-afpl (Closes: Bug#250622)
+  * Build-Depends: fontforge | pfaedit.
+  * debian/watch: Updated to new URL and new format.
+  * vim/GNUmakefile: Install $(vimdir)/*/lilypond.vim scripts with "-m 644".
+
+ -- Anthony Fok <foka@debian.org>  Fri, 18 Jun 2004 02:39:58 +0800
+
+lilypond (2.1.0-2) unstable; urgency=low
+ 
+  * A few HTML links in Documentation/user/{introduction,tutorial}.itely
+    went up one too few level in the directory tree, i.e. broken links.
+    Thanks to D. Raleigh Arnold for the bug report.  (Closes: Bug#208208)
+  * Build-Depends: imagemagick; lilypond uses "convert" nowadays.
+    Thanks to Daniel Schepler for the bug report.  (Closes: Bug#221062)
+
+ -- Anthony Fok <foka@debian.org>  Wed, 19 Nov 2003 10:12:16 +0800
+
+lilypond (2.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-Requires: pfaedit (>= 0.0.20031020-3) to prevent FTBFS on alpha.
+    Thanks to Petter Reinholdtsen for the bug report, and thanks to
+     Peter Hawkins for adopting the PfaEdit package!  (Closes: Bug#217216)
+  * Build process used to redirect to /dev/stderr which does not exist in
+    all environments.  Upstream replaced it with ">&2" in 1.9.0 in August.
+    Thanks to Daniel Schepler for the bug report.  (Closes: #215481)
+  * Added symlink from /usr/share/lilypond/$(VERSION)/fonts/type1 to
+    /usr/share/texmf/fonts/type1/public/lilypond.  Thanks to Pedro Kroger
+    and Mats Bengtsson's discussion on the lilypond-devel:
+    http://mail.gnu.org/archive/html/lilypond-devel/2003-10/msg00016.html
+
+ -- Anthony Fok <foka@debian.org>  Sat, 25 Oct 2003 19:34:41 +0800
+
+lilypond (1.8.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Thanks to Jan Nieuwenhuizen for the following fixes:
+    debian/control (Build-Depends): Add flex-old as alternative to flex.
+                                    Deprecate bison 1.75.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 27 Aug 2003 00:24:20 +0800
+
+lilypond (1.8.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 13 Aug 2003 00:23:36 +0800
+
+lilypond (1.7.29-1) unstable; urgency=medium
+
+  * New upstream release, preparing for lilypond-1.8.  :-)
+  * stepmake/bin/add-html-footer.py: Use LOGNAME only if it exists.
+    pbuilder unsets LOGNAME and Python returns KeyError.
+    Thanks to Daniel Schepler for the report.  (Closes: Bug#193065)
+  * debian/rules: Revert to calling ./configure rather than ./autogen.sh.
+  * An issue with autoconf <= 2.57 and g++ >= 3.3 has been preventing
+    getopt-long.cc from compiling.  A workaround was checked in by upstream
+    author Jan Nieuwenhuizen on 2003-06-08, and the fix in aclocal.m4 was
+    backported from 1.7.29.  (Closes: Bug#197761)
+  * Mark Brown says 1.7.27 has fixed FTBFS on m86k too.  Thanks for the
+    note!  (Closes: Bug#200510)
+  * Run dh_scrollkeeper to register *.omf files.
+
+ -- Anthony Fok <foka@debian.org>  Fri,  1 Aug 2003 05:40:04 +0800
+
+lilypond (1.6.9-2) unstable; urgency=medium
+
+  * CVS updates as of 2003-04-29.  (Thanks, Jan!)
+  * "Empty midi2ly.1" problem has been fixed upstream.  (Closes: Bug#181927)
+  * Build-Depends: autoconf2.13 and run autogen.sh in debian/rules
+    to ensure this package passes the auto-build daemons.  :-)
+
+ -- Anthony Fok <foka@debian.org>  Thu,  1 May 2003 13:18:57 +0800
+
+lilypond (1.6.9-1) unstable; urgency=medium
+
+  * New upstream release with CVS updates as of 2003-04-15.
+    Jan Nieuwenhuizen has backported fixes to deal with build problems
+    with flex (>= 2.5.29).
+  * Rebuild with guile-1.6 packages.
+  * Merged debian/* fixes by upstream author Jan Nieuwenhuizen (Thanks!):
+    - Depend on mftrace (>= 1.0.17-1) instead of pktrace.
+    - Add guile-1.6-dev as alternative dependency to libguile-dev
+    - Bugfix for docdir when with changed package name.
+    - Remove bibtex2html dependencies.  (LilyPond has come with its own
+      bib2html for some time now.  However, xpmtoppm and pnmtopng from
+      netpbm is still needed - foka)
+    - Remove gcc-3.x/lexer kludge.
+  * midi2ly.1 was empty because help2man calls midi2ly but it couldn't
+    "import midi": python/out/midi.so wasn't built until later.  Added
+    a kludge in debian/rules to regenerate midi2ly.1 manually.
+    Thanks to Colin Watson for reporting the bug.  (See Bug#181927)
+
+ -- Anthony Fok <foka@debian.org>  Mon, 28 Apr 2003 03:50:50 +0800
+
+lilypond (1.6.6-2) unstable; urgency=high
+
+  * Hmm, so /usr/share/texmf/dvips/config is an symlink, and thus
+    /usr/share/lilypond/1.6.6/dvips/lilypond.map conflicts with tetex-base.
+    Let's move it to /etc/texmf/dvips/lilypond.map then, and make it a
+    conffile.  Thanks for all the (duplicate) bug reports!  ;-)
+    (Closes: Bug#169811, #169812, #169877, #169946)
+
+ -- Anthony Fok <foka@debian.org>  Sat, 23 Nov 2002 19:21:04 +0800
+
+lilypond (1.6.6-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Updated Debian section in Documentation/topdocs/INSTALL.texi.
+  * FTBFS bug due to bugs in bison-1.50.  Now explicitly Build-Depends
+    on bison << 1:1.50 or >= 1:1.75-1.  (Closes: Bug#165662)
+
+ -- Anthony Fok <foka@debian.org>  Tue, 22 Oct 2002 02:05:33 +0800
+
+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.
+  * Check g++ version and run lexer-gcc-3.1.sh if necessary.
+
+ -- Anthony Fok <foka@debian.org>  Tue, 10 Sep 2002 23:37:27 +0800
+
+lilypond (1.6.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * binary-arch: Changed "DH_OPTIONS=-a" to "DH_OPTIONS=-s" so that
+    dpkg-gencontrol would not choke on lilypond1.3 for unlisted
+    architectures.  Thanks to Ryan Murray for the report and suggested
+    fix.  (Closes: Bug#157766)
+
+ -- Anthony Fok <foka@debian.org>  Sun, 25 Aug 2002 11:59:01 +0800
+
+lilypond (1.5.68-2) unstable; urgency=low
+
+  * Oops, I was missing Build-Depends on python-dev.  Thanks to LaMont
+    Jones and his hppa build daemon for the report. (Closes: Bug#153402)
+  * lilypond should Depends instead of Recommends tetex-extra.
+    Thanks to Russell Neches for the report.  (Closes: Bug#152228)
+  * lilypond-indent.el is now installed in lilypond 1.5.x.
+    Thanks to Christophe Rhodes for the report.  (Closes: Bug#139070)
+
+ -- Anthony Fok <foka@debian.org>  Thu, 18 Jul 2002 23:41:44 +0800
+
+lilypond (1.5.68-1) unstable; urgency=low
+
+  * New upstream release, gearing up for 1.6.0.
+  * Thanks to upstream author Jan Nieuwenhuizen for updating the Debian
+    package to work with 1.5.68.
+  * As per Jan's suggestion, now Build-Depends: pktrace (>= 1.0.3-1),
+    pfaedit (>= 0.0.20020312-1), autotrace, t1utils
+
+ -- Anthony Fok <foka@debian.org>  Wed, 17 Jul 2002 03:20:23 +0800
+
+lilypond (1.4.13-1) unstable; urgency=low
+
+  * New upstream release.
+  * Depends: pktrace
+
+ -- Anthony Fok <foka@debian.org>  Mon,  6 May 2002 04:09:32 +0800
+
+lilypond (1.4.12-1) unstable; urgency=high
+
+  * New upstream maintenance release.
+  * Several important fixes (including our bison-related patch added
+    to 1.4.10-1) are included since 1.4.11 this release.  (Now, I
+    don't even need to increase teTeX's extra_mem_top, extra_mem_bot
+    or pool_size!  :-)  Please include in Woody.
+  * Fixed a typo in lilypond-doc package description: typestting ->
+    typesetting.  Thanks, Matt Zimmerman!  (Closes: Bug#125083)
+
+ -- Anthony Fok <foka@debian.org>  Sun, 24 Feb 2002 02:06:15 +0800
+
+lilypond (1.4.10-1) unstable; urgency=high
+
+  * New upstream release.
+  * lilypond failed to build with bison >= 1.30 because bison's output file
+    has been renamed.  Applied an upstream fix.  (Closes: Bug#133692)
+  * lilypond's documentation also failed to build with the latest
+    tetex or texinfo package.  Instead of increasing extra_mem_top and
+    extra_mem_bot, increasing pool_size does the trick.
+
+ -- Anthony Fok <foka@debian.org>  Mon, 18 Feb 2002 11:41:31 +0800
+
+lilypond (1.4.9-1) unstable; urgency=high
+
+  * New upstream release.
+  * Oops, libc6-dev is known as libc6.1-dev and libc-dev on some
+    architectures.  Fixed Build-Depends so that lilypond can be built
+    on all platforms.  Thanks to Colin Watson for reporting the bug.
+    (Closes: Bug#120208)
+
+ -- Anthony Fok <foka@debian.org>  Tue, 27 Nov 2001 23:28:11 +0800
+
+lilypond (1.4.8-2) unstable; urgency=high
+
+  * [debian/rules]: Use -s instead of -a so that lilypond would get built
+     on all architectures even when the dummy lilypond1.3 package isn't
+     built.  Thanks to Ryan Murray for the report.  (Closes: Bug#117622)
+  * Depends on python instead of python-base.  The python scripts in
+    lilypond work with old and new Python versions.
+  * Build-Depends on "-z combreloc"-enabled binutils (>= 2.11.92.0.10-2)
+    and libc6-dev (>= 2.2.4-5) so that lily runs faster!  :-)
+
+ -- Anthony Fok <foka@debian.org>  Sun, 11 Nov 2001 10:45:10 +0800
+
+lilypond (1.4.8-1) unstable; urgency=high
+
+  * New upstream release.  (Closes: Bug#111132)
+  * Stopped using $(PWD) in make, as it doesn't seems to work on
+    potato systems with older "make".  Reverted to `pwd`.
+    Thanks to Wolfgang Schnitker for notifying me this problem.
+  * Changed the lilypond1.3 dummy package's Architecture from "all"
+    to "arm i386 m68k powerpc sparc".  Also, as upstream updated
+    config.sub and config.guess to recognize ia64 and hppa.
+    Thanks to Anthony Towns for the bug report.  (Closes: Bug#114266)
+  * Versioned Build-Depends: flex (>= 2.5.4a-14) to ensure gcc-3.0
+    compatibility.
+
+ -- Anthony Fok <foka@debian.org>  Sun, 14 Oct 2001 18:28:45 +0800
+
+lilypond (1.4.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upstream includes lexer-gcc-3.0.patch which should fix compilation
+    problems with g++-3.0.  (Closes: Bug#105001)
+  * Hurray!  texinfo-4.0b is finally in Debian!  Thanks, Josip!  :-)
+    Updated Build-Depends.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 25 Jul 2001 03:04:37 +0800
+
+lilypond (1.4.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * Urgency high because LilyPond-1.2.17 is too buggy and yet it has
+    been stuck in testing forever.  LilyPond-1.4.x fixes multiple
+    serious bugs.  :-)
+  * Ah, silly me, lilypond was conflicting against itself!  I forgot
+    to remove this relics during the switch from lilypond1.3 to lilypond.
+  * Fixed a new bug in lily/main.cc which caused lilypond to skip over every
+    other command-line argument.
+  * [configure.in]: Added -mieee to CFLAGS and CXXFLAGS when building on
+     Alpha to prevent FP exception.  Thanks to Christopher C. Chimelis
+     for the fix!
+
+ -- Anthony Fok <foka@debian.org>  Fri, 15 Jun 2001 00:42:46 -0600
+
+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)
+  * export extra_mem_top=100000 and extra_mem_bot=100000, otherwise
+    latex runs out of memory when processing standchen.dvi.latex.
+  * Split the documentation into the "lilypond-doc" package, which
+    provides the LilyPond website in /usr/share/doc/lilypond/html.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 16 May 2001 16:03:40 -0600
+
+lilypond (1.3.150-1) unstable; urgency=low
+
+  * New upstream version.
+  * Renamed package from lilypond1.3 back to lilypond.
+    This also fixes a lot of bugs from the old lilypond-1.2.17 package.
+    lilypond1.3 is temporarily provided as a dummy transitional package.
+    Closes: Bug#67697, 84352, 48731, 72223, 85834.
+  * [debian/rules]:
+     - No longer blindly copy intermediate DVI files into
+       the deb package.  Thanks to Daniel Burrows for the reminder.
+       Closes: Bug#87852.
+     - Added "export MODE=ljfour" and "export BDPI=600" because I use
+       something different in my local /etc/texmf/mktex.cnf and that
+       broke the build.
+  * Fixed Build-Depends because pnmtopng has been merged into the netpbm
+    package.  Thanks to Adrian Bunk for the notice.  Closes: Bug#93961.
+  * [lily/kpath.cc]: Modified to better conform to web2c fontpath policy.
+
+ -- Anthony Fok <foka@debian.org>  Thu, 26 Apr 2001 03:25:50 -0600
+
+lilypond1.3 (1.3.132-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Oops, in 1.3.129-1, the "(setq auto-mode-alist (append ..." line in
+    /etc/emacs/site-start.d/50lilypond1.3.el (debian/emacsen-startup)
+    and in FAQ.txt was buggy.  Thanks to Erik Demaine for the bug report.
+    Closes: Bug#86685.
+
+ -- Anthony Fok <foka@debian.org>  Sun, 25 Feb 2001 20:27:09 -0700
+
+lilypond1.3 (1.3.129-1) unstable; urgency=low
+
+  * In memory of Werner Icking + (August 26, 1943 - February 8, 2001),
+    a dear friend, a kind educator, and a hard worker in sharing beautiful
+    typeset music to the world.  (Maintainer of the GMD Music Archive,
+    http://www.gmd.de/Misc/Music/).
+
+  * New upstream release.
+  * Upstream has changed from "lilypond-mode" to the "studly caps name"
+    "LilyPond-mode".  Fixed /etc/emacs/site-start.d/50lilypond1.3.el
+    (debian/emacsen-startup).  Thanks to Christophe Rhodes for the bug
+    report.  Closes: Bug#83732.
+  * Added "Build-Conflicts: lilypond, lilypond1.3" to prevent old
+    lilypond font files from potentially interfering with the build on
+    other Debian ports autobuilders.
+  * Built with libguile-dev (1:1.4-9) or newer to ensure correct
+    linkage to libqthreads.so.9.  Also updated the Build-Depends and
+    Depends fields accordingly.  Thanks to guile1.4 package maintainer
+    Rob Browning for his notification and to Daniel Burrows for his bug
+    report.  Closes: Bug#85896.
+
+ -- Anthony Fok <foka@debian.org>  Sat, 10 Feb 2001 01:38:36 -0700
+
+lilypond1.3 (1.3.121-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added more detailed instruction for building lilypond1.3 on Debian
+    in Documentation/topdocs/INSTALL.texi (hence INSTALL.txt).
+  * Applied Han-wen's one-line patch to lily/system-start-delimiter.cc
+    to remove bracket-width.
+  * It seems that bracket-width needs to be removed from
+    scm/grob-description.scm and scm/interface-description.scm too.
+
+ -- Anthony Fok <foka@debian.org>  Sun,  7 Jan 2001 02:34:46 -0700
+
+lilypond1.3 (1.3.119-1) unstable; urgency=low
+
+  * New upstream release.
+  * Merged debian/* fixes by upstream author Jan Nieuwenhuizen.  Thanks!
+     - The lilypond info files are back!  Partially fixed Bug#72233.
+     - Uses the new libguile9 instead of the old libguile6.
+  * Depends on libkpathsea3 instead of the old tetex-lib; Build-Depends
+    is also changed accordingly.  Closes: Bug#79469, Bug#79837.
+  * Edited Documentation/user/development.itexi so that it builds
+    without error.
+
+ -- Anthony Fok <foka@debian.org>  Fri, 22 Dec 2000 12:54:49 -0700
+
+lilypond1.3 (1.3.107) unstable; urgency=low
+
+  * Fixed watch location.
+  * Local build, not uploaded to Debian.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Mon, 13 Nov 2000 13:33:53 +0100
+   
+lilypond1.3 (1.3.103) unstable; urgency=low
+
+  * Re-enabled info doc rules.
+  * Local build, not uploaded to Debian.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Sun,  5 Nov 2000 22:15:57 -0100
+
+lilypond1.3 (1.3.99-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Tue, 31 Oct 2000 00:48:20 -0700
+
+lilypond1.3 (1.3.94-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Sun,  8 Oct 2000 12:36:52 -0600
+
+lilypond1.3 (1.3.80.jcn1-1) unstable; urgency=low
+
+  * New upstream release.
+  * s/tetex-devel/tetex-dev/ in Build-Depends.  Thanks to bug report
+    filed by fellow developer Roman Hodek (closes: Bug#69772).
+
+ -- Anthony Fok <foka@debian.org>  Sun, 27 Aug 2000 06:11:22 -0600
+   
+lilypond1.3 (1.3.79-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added tetex-dev to Build-Depends.  Thanks to bug report by fellow
+    developer Daniel Jacobowitz (closes: Bug#68441).
+  * Install two documentation files NEWS and ROADMAP.
+
+ -- Anthony Fok <foka@debian.org>  Thu, 17 Aug 2000 22:57:57 -0600
+
+lilypond1.3 (1.3.78-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 16 Aug 2000 06:32:14 -0600
+
+lilypond1.3 (1.3.75-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated the link to the http://sca.uwaterloo.ca/lilypond/ mirror in
+    the package description.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 26 Jul 2000 01:56:28 -0600
+
+lilypond1.3 (1.3.58-1) unstable; urgency=low
+
+  * New upstream release with patch from Han-wen.
+
+ -- Anthony Fok <foka@debian.org>  Thu,  8 Jun 2000 17:19:08 -0600
+
+lilypond1.3 (1.3.48-1) unstable; urgency=low
+
+  * New upstream release.
+  * [debian/control]: Added Depends: guile, for /usr/bin/as2text (Lintian).
+  * [debian/rules]: Changed the symlink /usr/share/lilypond/cmtfm from
+      absolute to relative.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 10 May 2000 12:17:54 -0600
+
+lilypond1.3 (1.3.45-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Fri, 14 Apr 2000 21:39:40 -0600
+
+lilypond1.3 (1.3.44-1) unstable; urgency=low
+
+  * New upstream development release with numerous bug fixes, small
+    enhancements, and updates to documentation.
+  * [debian/postinst]: Fixed the pathname to README.Debian.  Thanks to
+      Olivier Abad for the bug report (closes: Bug#58674).
+  * [debian/rules]: Now configure with --enable-optimise again.
+      Yes, it appears that LilyPond and glibc2.1.3 finally get along
+      nicely even with optimisation turned on.  Hurray!  :-)
+  * [Documentation/user/*]: Fixed some formatting bugs in the texinfo files.
+  * [debian/control]: Modified description to hint that 1.3.43 is better
+      than 1.2.17.  :-)
+  * [debian/{rules,emacsen-startup}]: Added an Emacs startup file
+      /etc/emacs/site-start.d/50lilypond1.3.el so that lilypond-mode is
+      automatically loaded for *.ly files.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 12 Apr 2000 21:22:31 -0600
+
+lilypond1.3 (1.3.24-1) frozen unstable; urgency=low
+
+  * New upstream development release with lots of bug fixes.  :-)
+  * [debian/control]: Added missing build dependencies.  Thanks to
+     Roman Hodek for the bug report and solution (closes: Bug#58078).
+
+ -- Anthony Fok <foka@debian.org>  Sat, 19 Feb 2000 15:14:31 -0700
+
+lilypond1.3 (1.3.17-1) unstable; urgency=low
+
+  * New upstream release.  Merry Christmas!
+
+ -- Anthony Fok <foka@debian.org>  Fri, 24 Dec 1999 08:59:21 -0700
+
+lilypond1.3 (1.3.16-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 22 Dec 1999 22:12:30 -0700
+
+lilypond1.3 (1.3.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * [debian/rules]: Commented out "$(MAKE) -C Documentation/programmer ps"
+      temporarily because of error making lilypond-overview.dvi.
+
+ -- Anthony Fok <foka@debian.org>  Fri, 17 Dec 1999 00:33:47 -0700
+
+lilypond1.3 (1.3.5-1) unstable; urgency=low
+
+  * New upstream release.  lilypond1.3 is the developmental branch.
+  * [debian/rules]: Removed "install-stamp".
+  * [debian/control]:
+      - Standards-Version: 3.1.0
+      - Added the Build-Depends field.
+      - Updated dependencies of tetex-{base,bin,extra} packages to
+        1.0*-1.
+
+ -- Anthony Fok <foka@debian.org>  Sat, 13 Nov 1999 23:25:42 -0700
+
+lilypond (1.2.17-1) unstable; urgency=low
+
+  * New upstream release.
+  * [debian/rules]:
+     - Reverted to configuring with --disable-optimise.
+     - The documentation files are now built properly, and both
+       ps and dvi versions are included.
+  * Standards-Version: 3.0.1
+
+ -- Anthony Fok <foka@debian.org>  Sat, 30 Oct 1999 06:57:04 -0600
+
+lilypond (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * [debian/control]:
+     - Removed recommendation for python-misc (>= 1.5.1)
+       and updated the recommendation of python-base to 1.5.2-4.
+       Thanks to Gregor Hoffleit for the note (closes: Bug#41343).
+     - Updated package description to that provided by the upstream
+       authors in the new version.
+  * [debian/rules]: Now configure with --enable-optimise.
+
+ -- Anthony Fok <foka@debian.org>  Tue, 24 Aug 1999 22:05:12 -0600
+
+lilypond (1.1.53-1) unstable; urgency=low
+
+  * New upstream release.
+  * Partially upgraded to standards version 3.0.0:
+     - Updated copyright to point to /usr/share/common-licenses
+     - First step towards FHS-compliance: Man pages are now installed
+       under /usr/share/man.
+
+ -- Anthony Fok <foka@debian.org>  Wed,  7 Jul 1999 15:23:57 -0600
+
+lilypond (1.1.47-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Thu, 10 Jun 1999 18:10:13 -0600
+
+lilypond (1.1.42-1) unstable; urgency=low
+
+  * New upstream release.
+  * [postinst]: Runs "/usr/bin/mktexlsr /usr/share/texmf" to save time.
+  * [postrm]: Removed the unnecessary "/usr/bin/mktexlsr" call.
+  * The segfault problem has disappeared on my computer (running
+    the latest potato system).  Please test.
+
+ -- Anthony Fok <foka@debian.org>  Tue, 11 May 1999 11:16:58 -0600
+
+lilypond (1.1.37-1) unstable; urgency=low
+
+  * New upstream release.
+  * Known problem: LilyPond simply segfaults under glibc 2.1 on my i386
+    system, and I don't know how to fix the problem yet.  I hope users of
+    other platforms have better luck.
+  * [debian/rules]:
+      - Make and install info files.
+      - Removed "CC=egcc" because the default gcc on all platforms is
+        now the one from egcs.
+      - Install *.png instead of *.xpm.
+      - Minor clean-ups.
+  * Added debian/compress to make sure *.png are not compressed.
+  * Added debian/doc-base and postinst/prerm for the LilyPond info files.
+  * s!usr/lib/texmf!usr/share/texmf!g and cleaned up old hacks
+    in {pre,post}{inst,rm} files due to tetex's new FHS-compliant
+    directory structure.
+  * [debian/control]: Now Depends/Recommends the latest FHS-compliant
+      tetex-{bin,base,extra} (>= 0.9.99031{0,1}-1) packages.
+
+ -- Anthony Fok <foka@debian.org>  Mon,  5 Apr 1999 20:43:30 -0600
+
+lilypond (1.1.31-1) unstable; urgency=low
+
+  * New upstream release.
+  * Re-incorporated the changes in debian/rules and debian/postinst
+    from lilypond_1.0.xx series.  I forgot these changes when I moved
+    from 1.0.19.uu3-1 to 1.1.29-1.  Sorry!  :-)
+  * [make/lilypond-vars.make]: Copied the definition of TEX_TFMDIR from
+      make/toplevel.make.in and added it to LILYINCLUDE...
+  * Applied the patch lilypond-1.1.31.jcn1.diff from Jan Nieuwenhuizen.
+  * [debian/rules]:
+      - Temporarily use "-$(MAKE) -k -C Documentation/tex dvi" to
+        circumvent the occasional \times segfault problem when building
+        refman.dvi.
+      - Added symlink /usr/lib/texmf/fonts/tfm/public/lilypond.
+
+ -- Anthony Fok <foka@debian.org>  Thu, 18 Feb 1999 00:25:04 -0700
+
+lilypond (1.1.29-1) unstable; urgency=low
+
+  * New upstream release.
+  * [stepmake/aclocal.m4]: AC_STEPMAKE_GUILE now calls the GUILE_FLAGS
+      macro to set -lqthreads etc., otherwise Guile would not be detected
+      by the configure script.
+
+ -- Anthony Fok <foka@debian.org>  Sun, 14 Feb 1999 09:05:00 -0700
+
+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.
+      Thanks to Roland Rosenfeld <roland@spinnaker.rhein.de>
+      for the bug report. (closes: Bug#30123).
+  * [debian/control]: Now also Recommends: tetex-extra (>= 0.9.981030-1)
+      because the .dvi documentation uses the EC fonts in that package.
+
+ -- Anthony Fok <foka@debian.org>  Thu, 10 Dec 1998 17:43:57 -0700
+
+lilypond (1.0.19.uu1-1) frozen unstable; urgency=low
+
+  * New upstream bug-fix release.
+
+ -- Anthony Fok <foka@debian.org>  Mon,  7 Dec 1998 13:12:02 -0700
+
+lilypond (1.0.18-2) frozen unstable; urgency=low
+
+  * [debian/rules]: Added symlink /usr/lib/texmf/fonts/afm/public/lilypond.
+      Thanks to Julian Gilbey <jdg@maths.qmw.ac.uk> for the bug report
+      (closes: Bug#29407).
+  * [scripts/ly2dvi.py]: Re-added a patch similar to the one in 1.0.17-1,
+      but teTeX's default search path is now placed *before* the ones that
+      ly2dvi adds.  Thanks to Roland Rosenfeld <roland@spinnaker.rhein.de>
+      for the bug report. (closes: Bug#29459).
+
+ -- Anthony Fok <foka@debian.org>  Mon, 23 Nov 1998 21:29:25 -0700
+
+lilypond (1.0.18-1) frozen unstable; urgency=low
+
+  * 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
+        module in the python-misc package (closes: Bug#29283).
+      - Updated dependencies on tetex* to the latest versions:
+          Depends: tetex-bin (>= 0.9.981031-2)
+          Recommends: tetex-base (>= 0.9.981030-1)
+        due to changes in tetex's directory structure.
+  * [debian/rules]:
+      - The symlink ../../../../../share/lilypond/mf is now named
+        /usr/lib/texmf/fonts/source/public/lilypond instead of
+        /usr/lib/texmf/fonts/source/public/mf (Bug#29284).
+      - In the latest tetex-base package, /usr/lib/texmf/doc is now a
+        symlink to /usr/doc/texmf.  Therefore, we now install lilypond's
+        documentation into /usr/doc/texmf/musixtex/lilypond.
+        (closes: Bug#28999, Bug#29326)
+  * [debian/preinst]:
+      - The script now removes the directories
+        /var/spool/texmf/pk/*/public/mf and /var/spool/texmf/tfm/public/mf
+        created inadvertently by Debian's buggy lilypond 1.0.17-1.  :-)
+        (Bug#29284)
+      - Since 1.0.17-1, /usr/lib/texmf/tex/lilypond has been changed to a
+        symbolic directory.  The script now removes the old real directory
+        to prevent problems during upgrade (closes: Bug#29284).
+  * [debian/postinst]: I copied a few lines from tetex-nonfree's postinst
+      to remove the old directory /usr/lib/texmf/doc if lilypond is the
+      last package to use that directory, and create a symlink to
+      /usr/doc/texmf.  :-)
+  * Rebuilt with yodl (1.31.7-1) installed to ensure the documentations
+    are compiled properly (closes: Bug#29285).
+  * Thanks to Fabien Ninoles <fab@tzone.org>, Roland Rosenfeld
+    <roland@spinnaker.rhein.de> and Julian Gilbey <jdg@maths.qmw.ac.uk>
+    for reporting the bugs listed above. :-)
+
+ -- Anthony Fok <foka@debian.org>  Thu, 12 Nov 1998 03:14:25 -0700
+
+lilypond (1.0.17-1) frozen unstable; urgency=low
+
+  * New upstream "stable" release.
+  * [debian/{copyright,control}]: pcnov095.win.tue.nl -> ftp.cs.uu.nl
+      (New upstream master FTP site).  Also updated JCN's web site URL.
+  * [debian/rules]: 
+      - Now, in the "clean:" target, runs either 
+        "find . -user root | xargs -r chown $$SUDO_USER.$$SUDO_GID" or
+        "find . -user root | xargs -r chown $$LOGNAME" to deal with all those
+        root-owned "out/*" files generated during a "sudo debian/rules clean"
+        run.  Thanks to Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
+        for reporting the problem!  (closes: Bug#27044)
+      - Updated debian/rules according to the new debhelper rules example.
+      - Now configures with --disable-optimise instead of --enable-optimise,
+        otherwise it would not compile.
+      - Added symlinks to directories under /usr/lib/texmf because lilypond
+        now puts everything under /usr/share/lilypond.
+  * [Documentation/topdocs/AUTHORS.yo]: Added a trailing "/" on URLs. 
+  * [scripts/ly2dvi.py]: Added a hack to add an extra os.pathsep (":" on
+      Linux) to TEXINPUTS and MFINPUTS, otherwise ly2dvi and TeX would fail
+      to find the necessary files.
+  * Compiled with libstdc++2.9.  :-)
+
+ -- Anthony Fok <foka@debian.org>  Tue,  3 Nov 1998 14:31:18 -0700
+
+lilypond (1.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Sat, 15 Aug 1998 04:32:08 -0600
+
+lilypond (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * [aclocal.m4]: Temporarily changed OPTIMIZE="-O2" to OPTIMIZE="-O"
+      to avoid egcs (c++) complaint of "Internal compiler error"
+      on my computer.
+  * [scripts/mudela-book.py]: Added "#!@PYTHON@" at the top.  This string
+      expands to "#!/usr/bin/python" in /usr/bin/mudela-book.
+      (Thanks to Lintian.  :-)
+  * [debian/control]: Recommends: python-base (>= 1.5.1).
+      (Again, thanks to Lintian.  :-)
+  * [debian/postrm]: Now also removes the generated LilyPond fonts
+      *.{tfm,pk} under /var/spool/texmf when called as "postrm remove".
+  * [debian/preinst]: Yes, have to bring this back to remove the generated
+      LilyPond fonts in /var/spool/texmf because "postrm remove" didn't do
+      its jobs in previous versions.  Oops.  :-)
+  * [debian/rules]: Installs a few new upstream documentation files, and
+      the example files in out/ directories are moved to parent directories.
+
+ -- Anthony Fok <foka@debian.org>  Fri, 14 Aug 1998 03:30:05 -0600
+
+lilypond (0.1.76-1) unstable; urgency=low
+
+  * support for 'make deb' target
+  * Not uploaded to Debian's FTP site.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Fri,  3 Jul 1998 17:53:37 +0200
+
+lilypond (0.1.71-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Sat,  6 Jun 1998 00:00:00 -0600
+
+lilypond (0.1.66-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Wed, 20 May 1998 06:50:12 -0600
+
+lilypond (0.1.61-1) frozen unstable; urgency=low
+
+  * New upstream release with tons of bug fixes.
+    Please put this in Hamm.
+  * Revised debian/rules w.r.t. make/lilypond.spec.in.
+
+ -- Anthony Fok <foka@debian.org>  Mon,  4 May 1998 03:36:06 -0600
+
+lilypond (0.1.60-1) frozen unstable; urgency=medium
+
+  * New upstream release with lots of bug fixes, including the MIDI
+    generation bug in 0.1.48.  Please put this in Hamm.
+  * debian/control:
+     - Upgraded to standards version 2.4.1.0 (no changes).
+  * debian/rules:
+     - lilypond now also depends on tetex-base (>= 0.9-5)
+       and conflicts with tetex-base (<< 0.9).
+  * Modified postinst and postrm to work with teTeX 0.9 / Web2C 7.2:
+     - Removed all the *ugly* kludges and functions that were supposed to
+       deal with non-Debian teTeX installations.  Those kludges were
+       specifically made for teTeX 0.4, but they failed to work as intended
+       due to the changes in teTeX 0.9.
+     - No longer messes with special.map because the standard
+       Web2C 7.2 special.map already lists the feta fonts.
+     - Since postinst is so much simpler, it is now a sh script!  :-)
+  * Removed preinst which contained yet another obsolete kludge to clean
+    obsolete/ancient lilypond fonts.
+  * Updated the GNU LilyPond Home Page URIs.
+
+ -- Anthony Fok <foka@debian.org>  Fri,  1 May 1998 01:14:49 -0600
+
+lilypond (0.1.48-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Fri, 13 Mar 1998 22:15:11 -0800
+
+lilypond (0.1.46-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Fri, 27 Feb 1998 22:43:41 -0800
+
+lilypond (0.1.45-1) unstable; urgency=low
+
+  * New upstream "The Utrecht Release".
+  * Compiled on va.debian.org because egcs 1.0.1 on my computer
+    no longer comes with libg++.  :-(  But hey, va.debian.org
+    sure is fast!  <grin>
+  * Temporarily includes *.xpm instead of *.gif files because
+    the netpbm package is not installed on va.debian.org, and
+    also because it violates Policy 2.1.2.  Thanks to
+    James Troup <J.J.Troup@scm.brad.ac.uk> for bug report!  :-)
+    (Fixes Bug#18212)
+  * debian/rules: Added "dh_undocumented ly2dvi.1".
+
+ -- Anthony Fok <foka@debian.org>  Sat, 21 Feb 1998 01:37:57 -0700
+
+lilypond (0.1.44-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Fri,  6 Feb 1998 22:07:39 -0700
+
+lilypond (0.1.43-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upgraded to standards version 2.4.0.0 (no changes).
+  * Minor fixes to the copyright file (GPL.gz -> GPL).
+  * Revised the package description based on the new lilypond.lsm.
+  * Now includes *.gif instead of *.xpm files.
+  * Other minor revisions to debian/rules.
+  * Added version numbering to the libflower shared library.
+  * Now installs /usr/lib/emacs/site-lisp/mudela-mode.el,
+    but I haven't figured out how to use it myself.  <grin>
+
+ -- Anthony Fok <foka@debian.org>  Fri,  6 Feb 1998 17:26:55 -0700
+
+lilypond (0.1.42-1) unstable; urgency=low
+
+  * New upstream release.
+  * Now places ly2dvi in /usr/bin.
+
+ -- Anthony Fok <foka@debian.org>  Thu, 29 Jan 1998 02:50:36 -0700
+
+lilypond (0.1.41-1) unstable; urgency=low
+
+  * New upstream "The Birthday Release".
+
+ -- Anthony Fok <foka@debian.org>  Wed, 21 Jan 1998 02:20:00 -0700
+
+lilypond (0.1.40-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Fok <foka@debian.org>  Mon, 12 Jan 1998 19:19:50 -0700
+
+lilypond (0.1.39-2) unstable; urgency=low
+
+  * debian/control:
+     - Description: Remove the note about installing musixtex or
+       musixtex-fonts.
+     - Added "Conflicts: musixtex-fonts".
+
+ -- Anthony Fok <foka@debian.org>  Tue,  6 Jan 1998 02:42:56 -0700
+
+lilypond (0.1.39-1) unstable; urgency=low
+
+  * New upstream LilyPond '98 "New Year Gift" release.
+  * debian/control:
+     - No longer Recommends: "musixtex" or "musixtex-fonts" because
+       LilyPond no longer needs them.
+     - Therefore, Section: is changed from "contrib/tex" to "tex".
+       LilyPond can finally go into the main distribution.  Hurray!
+  * debian/rules: Now also dh_installdocs ANNOUNCE-0.1 and ONEWS.
+  * preinst, postinst, postrm: Added #DEBHELPER#.
+  * preinst, postrm: Changed #!/bin/bash to #!/bin/sh.
+
+ -- Anthony Fok <foka@debian.org>  Mon,  5 Jan 1998 18:42:30 -0700
+
+lilypond (0.1.38-1) unstable; urgency=low
+
+  * New upstream Xmas release.
+  * Applied patch patch-0.1.38.jcn1 from Jan Nieuwenhuizen.
+  * Have fun, Merry Christmas and a Happy 1998. -- Han-Wen Nienhuys
+
+ -- Anthony Fok <foka@debian.org>  Wed, 24 Dec 1997 16:38:14 -0700
+
+lilypond (0.1.37-1) unstable; urgency=low
+
+  * New upstream release
+  * Minor modifications to debian/rules due to changes in
+    debhelper 0.32.
+
+ -- Anthony Fok <foka@debian.org>  Fri, 12 Dec 1997 11:11:12 -0700
+
+lilypond (0.1.36-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@debian.org>  Tue,  9 Dec 1997 18:33:50 -0700
+
+lilypond (0.1.35-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@debian.org>  Fri,  5 Dec 1997 21:06:31 -0700
+
+lilypond (0.1.34-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@debian.org>  Thu,  4 Dec 1997 19:42:22 -0700
+
+lilypond (0.1.33-1) unstable; urgency=low
+
+  * New upstream release
+  * Changed my maintainer e-mail address to <foka@debian.org>.  :)
+
+ -- Anthony Fok <foka@debian.org>  Tue, 25 Nov 1997 00:22:57 -0700
+
+lilypond (0.1.32-2) unstable; urgency=low
+
+  * Commented out run_texhash() in postinst by mistake.  Fixed.
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Sun, 23 Nov 1997 03:04:29 -0700
+
+lilypond (0.1.32-1) unstable; urgency=low
+
+  * New upstream release
+  * Applied a small fix to postinst.  The font-entries-search-and-replace
+    add_fonts() subroutine was slightly buggy.
+  * Unpatched ./configure.  It turned out that I spelt "--enable-optimise"
+    as "--enable-optimize" in debian/rules by mistake.  Oops!  :)  Thanks
+    to the upstream author for pointing this out!  :)
+  * The upstream authors has included the ./debian/* files in the pristine
+    source archive!  They also fixed some minor errors in README.debian
+    and copyright.  Thanks a lot!  :)
+  * Removed the line "dh_clean" from "binary-arch:" and switched the order
+    of dh_clean in "clean:" in debian/rules.  dh_clean was deleting
+    the zero-byte file ./make/out/Site.make, causing the build to fail.
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Sun, 23 Nov 1997 01:39:31 -0700
+
+lilypond (0.1.29-1) unstable; urgency=low
+
+  * New upstream release
+  * Patched ./configure in source package to make c++ use the -O2 -g options
+    on all the files.  Now, /usr/bin/lilypond is a lot leaner!  <smile>
+    (I will discuss it with the upstream author.)
+  * Adapted postinst (a Perl script) from the musixtex package for lilypond.
+    Now postinst adds the new LilyPond font entries into
+    /usr/lib/texmf/fontname/special.map.
+  * Added preinst to clean up my mess from previous releases: the old
+    "stray" automatically generated TFM and PK font files were placed in
+    the wrong directories because they were not listed in
+    /usr/lib/texmf/fontname/special.map.
+  * Did some minor clean-up in debian/rules and switched to debhelper.
+  * Updated Standards-Version to 2.3.0.1
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Tue, 11 Nov 1997 02:31:33 -0700
+
+lilypond (0.1.25-1) unstable; urgency=low
+
+  * Added a note in README.debian about the possibility of some LilyPond
+    fonts not showing up after an upgrade, and a possible solution to this
+    problem.
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Thu, 23 Oct 1997 17:00:14 -0600
+
+lilypond (0.1.24-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Tue, 21 Oct 1997 04:12:01 -0600
+
+lilypond (0.1.23-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Thu, 16 Oct 1997 02:15:55 -0600
+
+lilypond (0.1.22-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Mon, 13 Oct 1997 23:51:01 -0600
+
+lilypond (0.1.21-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Thu,  9 Oct 1997 22:58:26 -0600
+
+lilypond (0.1.18.jcn1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Sat,  4 Oct 1997 03:48:45 -0600
+
+lilypond (0.1.17-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove redundancy in package's description (Fixed bug #12511)
+  * Added a note about the new LilyPond MF fonts which are not yet listed
+    in the current standard special.map (in the teTeX package)
+  * Added SHELL=/bin/bash to debian/rules because I use bashism. <smile>
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Sun, 28 Sep 1997 01:41:15 -0600
+
+lilypond (0.1.12-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated the mailing address of the Free Software Foundation
+    listed in /usr/doc/lilypond/copyright
+  * Updated Standards-Version to 2.3.0.0
+  * Built with debmake 3.3.14 and fakeroot 0.0-9 <grin>
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Sun,  7 Sep 1997 23:00:53 -0600
+
+lilypond (0.1.9-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Mon, 18 Aug 1997 15:14:24 -0600
+
+lilypond (0.1.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Thu, 14 Aug 1997 15:18:40 -0600
+
+lilypond (0.1.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Thu, 14 Aug 1997 05:14:06 -0600
+
+lilypond (0.1.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Sat,  9 Aug 1997 14:15:11 -0600
+
+lilypond (0.1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Thu,  7 Aug 1997 22:54:20 -0600
+
+lilypond (0.1.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Anthony Fok <foka@gpu.srv.ualberta.ca>  Wed,  6 Aug 1997 04:40:57 -0600

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..879be07
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,75 @@
+Source: lilypond
+Build-Depends: debhelper (>= 5), python-dev (>= 2.4), guile-1.8-dev,
+ flex, bison, texinfo, groff, m4, gettext, mftrace, fontforge,
+ pkg-config, libfreetype6-dev, libpango1.0-dev,
+ libfontconfig1-dev, python-support,
+ libgmp3-dev, libltdl-dev, ghostscript, texlive-latex-base,
+ texlive-generic-recommended, texlive-latex-recommended, autotools-dev, texi2html, texlive-metapost,
+ zip
+Build-Conflicts: guile-1.8-dev (= 1.8.2+1-2)
+Build-Depends-Indep: netpbm, imagemagick,
+ emacs-intl-fonts, xfonts-intl-arabic, xfonts-intl-asian,
+ xfonts-intl-chinese, xfonts-intl-chinese-big, xfonts-intl-european,
+ xfonts-intl-japanese, xfonts-intl-japanese-big, xfonts-intl-phonetic,
+ ttf-kochi-gothic, ttf-kochi-mincho, ttf-dejavu, ttf-freefont, gsfonts
+ | gsfonts-x11, rsync
+Section: tex
+Priority: optional
+Maintainer: Don Armstrong <don@debian.org>
+Standards-Version: 3.8.4
+Homepage: http://lilypond.org/
+
+Package: lilypond
+Architecture: any
+Replaces: lilypond1.3
+Provides: lilypond1.3
+Depends: ${shlibs:Depends}, python, guile-1.8, ${misc:Depends}, lilypond-data (= ${source:Version})
+Conflicts: guile-1.8 (= 1.8.2+1-2)
+Recommends: lilypond-doc
+Description: A program for typesetting sheet music
+ LilyPond is a music typesetter, an automated engraving system.  It
+ produces beautiful sheet music using a high level description file as input.
+ .
+ LilyPond supports many forms of music notation constructs, including
+ chord names, drum notation, figured bass, grace notes, guitar tablature,
+ modern notation (cluster notation and rhythmic grouping), tremolos,
+ (nested) tuplets in arbitrary ratios, and more.
+ .
+ LilyPond's text-based music input language support can integrate into
+ LaTeX, HTML and Texinfo seamlessly, allowing single sheet music
+ or musicological treatises to be written from a single source.  Form and
+ content are separate, and with LilyPond's expert automated formatting,
+ users don't need typographical expertise to produce good notation.
+ .
+ LilyPond produces PDF, PostScript, SVG, or TeX printed output, as well
+ as MIDI for listening pleasures.  LilyPond is exported from the
+ RoseGarden and NoteEdit GUIs, and can import ABC, ETF and MIDI.
+ .
+ LilyPond is part of the GNU Project.
+ .
+  Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
+           Jan Nieuwenhuizen <janneke@gnu.org>
+
+Package: lilypond-data
+Architecture: all
+Depends: texinfo | texlive-texinfo, texlive-base-bin, ${python:Depends}, ${misc:Depends}
+Recommends: lilypond (>= ${source:Version})
+Conflicts: lilypond (<< 2.2.2-2)
+Description: LilyPond music typesetter (data files)
+ LilyPond is a music typesetter, an automated engraving system.  It
+ produces beautiful sheet music using a high level description file as input.
+ . 
+ This package contains architecture-independent data files for LilyPond.
+
+Package: lilypond-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Suggests: lilypond (>= ${source:Version}), gv | postscript-viewer, mozilla-browser | www-browser
+Replaces: lilypond (<= 2.2.3-1), lilypond-data (<= 2.2.3-1)
+Description: LilyPond Documentation in HTML, PS and DVI formats
+ LilyPond is a music typesetter, an automated engraving system.  It
+ produces beautiful sheet music using a high level description file as input.
+ .
+ This package contains the HTML, PostScript and DVI documentation for the
+ LilyPond music typesetting software.
\ No newline at end of file

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..0983b05
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,51 @@
+This package was Debianized by Anthony Fok <foka@debian.org> on
+Wed,  6 Aug 1997 04:30:28 -0600
+
+The development branch, lilypond1.3, was packaged separately
+on Tue,  9 Nov 1999 22:30:32 -0700
+but was merged back into the lilypond package
+as of Mon, 16 Apr 2001 21:58:42 -0600
+
+It was downloaded from
+    http://lilypond.org/download/v2.2/lilypond-2.2.2.tar.gz
+
+For more information about GNU LilyPond, please visit:
+    http://lilypond.org/
+
+Authors:
+      Han-Wen Nienhuys <hanwen@cs.uu.nl>
+      Jan Nieuwenhuizen <janneke@gnu.org>
+ 
+Copyright:
+
+  GNU LilyPond is Copyright (C) 1996--2004
+  Jan Nieuwenhuizen & Han-Wen Nienhuys
+
+    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
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+    *** NOTE
+
+            This license applies to all files except the included example
+    input files (which are in the subdirectory input/ )
+
+    *** END NOTE
+
+
+All the other scripts and control files for building and installing
+GNU LilyPond under Debian GNU/Linux are also under the GNU General
+Public License (GPL) version 2 or later.  
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.

diff --git a/debian/gui-2.6.patch b/debian/gui-2.6.patch
new file mode 100644 (file)
index 0000000..e30b1b4
--- /dev/null
+++ b/debian/gui-2.6.patch
@@ -0,0 +1,110 @@
+Index: ChangeLog
+===================================================================
+RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
+retrieving revision 1.3836.2.42
+diff -p -u -r1.3836.2.42 ChangeLog
+--- ChangeLog  23 Oct 2005 15:58:39 -0000      1.3836.2.42
++++ ChangeLog  23 Oct 2005 19:03:38 -0000
+@@ -1,3 +1,8 @@
++2005-10-23  Jan Nieuwenhuizen  <janneke@gnu.org>
++
++      * scm/lily.scm: Remove horrendous running-from-gui? kludge.
++      (lilypond-main): Redirect to gui-main if 'gui is set.
++
+ 2005-10-23  Erik Sandberg  <mandolaerik@gmail.com>
+ 
+       * scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson.
+Index: lily/lily-parser-scheme.cc
+===================================================================
+RCS file: /cvsroot/lilypond/lilypond/lily/lily-parser-scheme.cc,v
+retrieving revision 1.16
+diff -p -u -r1.16 lily-parser-scheme.cc
+--- lily/lily-parser-scheme.cc 22 Jun 2005 15:06:05 -0000      1.16
++++ lily/lily-parser-scheme.cc 23 Oct 2005 19:02:10 -0000
+@@ -8,15 +8,16 @@
+ 
+ #include <unistd.h>
+ 
++#include "file-name-map.hh"
+ #include "file-name.hh"
+ #include "file-path.hh"
+-#include "main.hh"
+-#include "lily-parser.hh"
+-#include "warn.hh"
+-#include "source.hh"
+ #include "lily-lexer.hh"
++#include "lily-parser.hh"
+ #include "ly-module.hh"
+-#include "file-name-map.hh"
++#include "main.hh"
++#include "program-option.hh"
++#include "source.hh"
++#include "warn.hh"
+ 
+ /* Do not append `!' suffix, since 1st argument is not modified. */
+ LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click",
+@@ -52,7 +53,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file
+ 
+   /* When running from gui, generate output in .ly source directory.  */
+   if (output_name_global.is_empty ()
+-      && scm_call_0 (ly_lily_module_constant ("running-from-gui?")) == SCM_BOOL_T)
++      && ly_get_option (ly_symbol2scm ("gui")) == SCM_BOOL_T)
+     {
+       File_name f (file);
+       f.base_ = "";
+Index: scm/lily.scm
+===================================================================
+RCS file: /cvsroot/lilypond/lilypond/scm/lily.scm,v
+retrieving revision 1.367.2.3
+diff -p -u -r1.367.2.3 lily.scm
+--- scm/lily.scm       1 Aug 2005 15:14:46 -0000       1.367.2.3
++++ scm/lily.scm       23 Oct 2005 19:02:10 -0000
+@@ -348,6 +348,9 @@ The syntax is the same as `define*-publi
+ (define-public (lilypond-main files)
+   "Entry point for LilyPond."
+ 
++  (if (ly:get-option 'gui)
++      (gui-main files))
++
+   (if (null? files)
+       (no-files-handler))
+ 
+@@ -385,29 +388,12 @@ The syntax is the same as `define*-publi
+ 
+ (use-modules (scm editor))
+ 
+-(define-public (running-from-gui?)
+-  (let ((have-tty? (isatty? (current-input-port))))
+-    ;; If no TTY and not using safe, assume running from GUI.
+-    (cond
+-     ((eq? PLATFORM 'windows)
+-      ;; Always write to .log file.
+-      (if DOS #t
+-      ;; This only works for i586-mingw32msvc-gcc -mwindows
+-      (not (string-match "standard input"
+-                       (format #f "~S" (current-input-port))))))
+-     ;; FIXME: using -dgui would be nice, but it does not work
+-     ((eq? PLATFORM 'foo-windows)
+-      (ly:get-option 'gui))
+-     ((eq? PLATFORM 'darwin) #f)
+-     (else
+-      (not have-tty?)))))
+-
+ (define-public (gui-main files)
+   (if (null? files)
+       (gui-no-files-handler))
+   (let* ((base (basename (car files) ".ly"))
+        (log-name (string-append base ".log")))
+-    (if (not (running-from-gui?))
++    (if (not (ly:get-option 'gui))
+       (ly:message (_ "Redirecting output to ~a...") log-name))
+     (ly:stderr-redirect log-name "w")
+     (ly:message "# -*-compilation-*-")
+@@ -430,7 +416,3 @@ The syntax is the same as `define*-publi
+     (ly:message (_ "Invoking `~a'...") cmd)
+     (system cmd)
+     (exit 1)))
+-
+-(or (not (running-from-gui?))
+-    (ly:get-option 'safe)
+-    (define lilypond-main gui-main))

diff --git a/debian/lilypond-data.dirs b/debian/lilypond-data.dirs
new file mode 100644 (file)
index 0000000..e6c3b86
--- /dev/null
+++ b/debian/lilypond-data.dirs
@@ -0,0 +1,2 @@
+usr/share/doc/lilypond/examples
+

diff --git a/debian/lilypond-data.emacsen-startup b/debian/lilypond-data.emacsen-startup
new file mode 100644 (file)
index 0000000..379d566
--- /dev/null
+++ b/debian/lilypond-data.emacsen-startup
@@ -0,0 +1,3 @@
+(autoload 'LilyPond-mode "lilypond-mode" nil t)
+(setq auto-mode-alist (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
+(add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock)))

diff --git a/debian/lilypond-data.install b/debian/lilypond-data.install
new file mode 100644 (file)
index 0000000..7cc93b4
--- /dev/null
+++ b/debian/lilypond-data.install
@@ -0,0 +1,3 @@
+usr/share/lilypond
+usr/share/omf
+usr/share/emacs/site-lisp

diff --git a/debian/lilypond-data.postinst b/debian/lilypond-data.postinst
new file mode 100644 (file)
index 0000000..f86c19d
--- /dev/null
+++ b/debian/lilypond-data.postinst
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# postinst script for the Debian GNU/Linux lilypond-data package
+#   by Anthony Fok <foka@debian.org>
+#   Initial release:  Sun, 26 Oct 1997 03:23:00 -0700
+#     Last modified:  Thu, 17 Jun 2004 11:40:36 +0800
+
+set -e
+
+package=lilypond               # This is used for filenames!  Don't change it!
+pkg_name="GNU LilyPond"
+
+std_TEXMFMAIN=/usr/share/texmf # Debian's standard $TEXMFMAIN
+
+TEXMFMAIN=`kpsewhich -expand-var '$TEXMFMAIN'`
+: ${TEXMFMAIN:=$std_TEXMFMAIN}
+
+echo " Running mktexlsr $TEXMFMAIN..."
+mktexlsr $TEXMFMAIN
+
+#DEBHELPER#
+echo
+echo " $pkg_name configuration completed."
+echo " Please read /usr/share/doc/lilypond/README.Debian to get started."

diff --git a/debian/lilypond-data.postrm b/debian/lilypond-data.postrm
new file mode 100644 (file)
index 0000000..53620a0
--- /dev/null
+++ b/debian/lilypond-data.postrm
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# postrm 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, 11 May 1999 11:16:35 -0600
+
+set -e
+
+package=lilypond
+font_supplier=public
+font_typeface=lilypond
+std_VARTEXFONTS=/var/spool/texmf
+
+#DEBHELPER#
+if [ "$1" != purge ]; then
+  VARTEXFONTS=`kpsewhich -expand-var '$VARTEXFONTS'`
+  : ${VARTEXFONTS=$std_VARTEXFONTS}
+fi
+
+case "$1" in
+    upgrade)
+       # Clear out the old TFM and PK files in case the fonts were modified
+       rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface
+       rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface
+    ;;
+
+    remove)
+       # Clear out the old TFM and PK files in case the fonts were modified
+       rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface
+       rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface
+    ;;
+
+    failed-upgrade|purge|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+       echo "postrm called with unknown argument \`$1'" >&2
+       exit 0
+    ;;
+esac

diff --git a/debian/lilypond-doc.README.Debian b/debian/lilypond-doc.README.Debian
new file mode 100644 (file)
index 0000000..cfa4cb5
--- /dev/null
+++ b/debian/lilypond-doc.README.Debian
@@ -0,0 +1,7 @@
+lilypond-doc for Debian
+-----------------------
+
+The HTML, PostScript and DVI documentation files are installed under
+`/usr/share/doc/lilypond', not `/usr/share/doc/lilypond-doc'.
+
+Anthony Fok <foka@debian.org>, Wed, 16 May 2001 01:37:00 -0600

diff --git a/debian/lilypond-doc.dirs b/debian/lilypond-doc.dirs
new file mode 100644 (file)
index 0000000..1d54e3f
--- /dev/null
+++ b/debian/lilypond-doc.dirs
@@ -0,0 +1,2 @@
+usr/share/doc/lilypond/html
+usr/share/info
\ No newline at end of file

diff --git a/debian/lilypond-doc.doc-base b/debian/lilypond-doc.doc-base
new file mode 100644 (file)
index 0000000..6c8ad6e
--- /dev/null
+++ b/debian/lilypond-doc.doc-base
@@ -0,0 +1,15 @@
+Document: lilypond
+Title: GNU LilyPond, the music typesetter
+Author: Various
+Abstract: This documentation describes LilyPond (the GNU Project music
+ typesetter), the LilyPond music input language, and the Mutopia project,
+ a.k.a. "Music To the People."
+Section: Typesetting
+
+Format: HTML
+Index: /usr/share/doc/lilypond/html/index.html
+Files: /usr/share/doc/lilypond/html/*.html /usr/share/doc/lilypond/html/Documentation/*.html  /usr/share/doc/lilypond/html/Documentation/user/*.html
+
+Format: info
+Index: /usr/share/info/lilypond.info.gz
+Files: /usr/share/info/lilypond.info* /usr/share/info/lilypond-internals.info* /usr/share/info/music-glossary.info.gz

diff --git a/debian/lilypond-doc.install b/debian/lilypond-doc.install
new file mode 100644 (file)
index 0000000..3af7214
--- /dev/null
+++ b/debian/lilypond-doc.install
@@ -0,0 +1 @@
+usr/share/info
\ No newline at end of file

diff --git a/debian/lilypond.install b/debian/lilypond.install
new file mode 100644 (file)
index 0000000..499e3a2
--- /dev/null
+++ b/debian/lilypond.install
@@ -0,0 +1,4 @@
+usr/bin
+usr/share/locale
+usr/share/man
+usr/lib

diff --git a/debian/preinst b/debian/preinst
new file mode 100644 (file)
index 0000000..bbaba25
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,49 @@
+#!/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:  Mon,  5 Apr 1999 20:30:12 -0600
+
+set -e
+
+package=lilypond
+font_supplier=public
+font_typeface=lilypond
+std_TEXMFMAIN=/usr/share/texmf
+std_VARTEXFONTS=/var/spool/texmf
+
+#DEBHELPER#
+
+TEXMFMAIN=`kpsewhich -expand-var '$TEXMFMAIN'`
+: ${TEXMFMAIN:=$std_TEXMFMAIN}
+VARTEXFONTS=`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
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+       echo "$0 called with unknown argument \`$1'" >&2
+       exit 0
+    ;;
+
+esac

diff --git a/debian/python-2.6.patch b/debian/python-2.6.patch
new file mode 100644 (file)
index 0000000..c914883
--- /dev/null
+++ b/debian/python-2.6.patch
@@ -0,0 +1,96 @@
+Index: ChangeLog
+===================================================================
+RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
+retrieving revision 1.3836.2.43
+diff -p -u -r1.3836.2.43 ChangeLog
+--- ChangeLog  23 Oct 2005 19:04:01 -0000      1.3836.2.43
++++ ChangeLog  23 Oct 2005 19:15:00 -0000
+@@ -3,6 +3,16 @@
+       * scm/lily.scm: Remove horrendous running-from-gui? kludge.
+       (lilypond-main): Redirect to gui-main if 'gui is set.
+ 
++      * scripts/midi2ly.py (datadir): Add libdir iso datadir to path,
++      for alternative installations kludging s/share/lib/g
++      LILYPONDPREFIX.
++
++      * SConstruct (libdir_package_version): Define.
++
++      * python/SConscript: 
++      * python/GNUmakefile (INSTALLATION_OUT_DIR): Install binary .so
++      module in libdir.
++
+ 2005-10-23  Erik Sandberg  <mandolaerik@gmail.com>
+ 
+       * scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson.
+Index: SConstruct
+===================================================================
+RCS file: /cvsroot/lilypond/lilypond/SConstruct,v
+retrieving revision 1.79
+diff -p -u -r1.79 SConstruct
+--- SConstruct 21 Apr 2005 14:28:31 -0000      1.79
++++ SConstruct 23 Oct 2005 19:15:00 -0000
+@@ -248,6 +248,8 @@ prefix = env['prefix']
+ bindir = os.path.join (prefix, 'bin')
+ sharedir = os.path.join (prefix, 'share')
+ libdir = os.path.join (prefix, 'lib')
++libdir_package = os.path.join (libdir, package.name)
++lidbir_package_version = os.path.join (libdir_package, version)
+ localedir = os.path.join (sharedir, 'locale')
+ sharedir_doc_package = os.path.join (sharedir, 'doc', package.name)
+ sharedir_package = os.path.join (sharedir, package.name)
+Index: python/GNUmakefile
+===================================================================
+RCS file: /cvsroot/lilypond/lilypond/python/GNUmakefile,v
+retrieving revision 1.8
+diff -p -u -r1.8 GNUmakefile
+--- python/GNUmakefile 16 Jun 2005 11:54:02 -0000      1.8
++++ python/GNUmakefile 23 Oct 2005 19:15:00 -0000
+@@ -10,7 +10,7 @@ USER_LDFLAGS=
+ INSTALLATION_OUT_SUFFIXES=1
+ 
+ INSTALLATION_OUT_FILES=$(OUT_SO_MODULES)
+-INSTALLATION_OUT_DIR=$(local_lilypond_datadir)/python
++INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python
+ 
+ INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python
+ INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)
+Index: python/SConscript
+===================================================================
+RCS file: /cvsroot/lilypond/lilypond/python/SConscript,v
+retrieving revision 1.2
+diff -p -u -r1.2 SConscript
+--- python/SConscript  18 Apr 2005 13:35:13 -0000      1.2
++++ python/SConscript  23 Oct 2005 19:15:00 -0000
+@@ -11,3 +11,4 @@ pym
+ cm
+ 
+ install (cm + pym, env['sharedir_package_version'] + '/python')
++install (cm, env['libdir_package_version'] + '/python')
+Index: scripts/midi2ly.py
+===================================================================
+RCS file: /cvsroot/lilypond/lilypond/scripts/midi2ly.py,v
+retrieving revision 1.33
+diff -p -u -r1.33 midi2ly.py
+--- scripts/midi2ly.py 6 Jun 2005 14:27:42 -0000       1.33
++++ scripts/midi2ly.py 23 Oct 2005 19:15:00 -0000
+@@ -30,12 +30,18 @@ import sys
+ ################################################################
+ # Users of python modules should include this snippet.
+ #
+-# This soon to be removed for: import lilypond.lilylib as ly
+ libdir = '@local_lilypond_libdir@'
+ if not os.path.isdir (libdir):
+        libdir = '@lilypond_libdir@'
+-sys.path.insert (0, os.path.join (libdir, 'python'))
+ 
++# ugh
++if os.environ.has_key ('LILYPONDPREFIX'):
++      datadir = os.environ['LILYPONDPREFIX']
++      while datadir[-1] == os.sep:
++              datadir= datadir[:-1]
++      libdir = datadir.replace ('/share/', '/lib/')
++
++sys.path.insert (0, os.path.join (libdir, 'python'))
+ 
+ ################################################################
+ 

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..569569f
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,177 @@
+#!/usr/bin/make -f
+# debian/rules for LilyPond in Debian.
+#
+# This is free software; see the GNU General Public Licence
+# version 2 or later for copying conditions.  There is NO warranty.
+#
+# Currently maintained by Anthony Fok <foka@debian.org>
+# for Debian GNU/Linux.
+
+package = lilypond
+
+SHELL = /bin/sh
+r = debian/$(package)
+r_data = debian/$(package)-data
+r_doc = debian/$(package)-doc
+d = usr/share/doc/$(package)
+
+# since I'm building this a few times on my 8-way machine, try to
+# build it faster
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS) CPU_COUNT=$(NUMJOBS)
+endif
+
+
+include VERSION
+VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
+
+# "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
+# But now, building lilypond.dvi requires increased pool_size (2002-02-18)
+# export pool_size = 500000
+# But now, it seems that none of the above is needed in 1.4.11  (2002-02-24)
+export MODE = ljfour
+export BDPI = 600
+export USER_CFLAGS = -DDEBIAN
+export DEB_BUILD = yes
+export MAILADDRESS = lilypond@packages.debian.org
+
+# fontconfig blows chunks if it can't write $HOME; and some buildd's
+# set it to a bogus value.
+export HOME = /tmp
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+build: build-stamp
+build-stamp:
+       dh_testdir
+
+       cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./stepmake/bin/
+       ./configure --disable-checking --enable-debugging \
+               --prefix=/usr --enable-optimising \
+               --infodir='$${prefix}/share/info' \
+               --mandir='$${prefix}/share/man'
+       $(MAKE)
+       $(MAKE) test
+
+       touch build-stamp
+
+build-doc: build build-doc-stamp
+build-doc-stamp:
+       dh_testdir
+
+       # make html
+       $(MAKE) doc WEB_TARGETS="offline"
+       # make info
+       $(MAKE) info
+
+       touch build-doc-stamp
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp build-doc-stamp
+       [ ! -f Makefile ] || $(MAKE) web-clean
+       [ ! -f Makefile ] || $(MAKE) distclean
+       rm -f lib/python
+       rm -f ./stepmake/bin/config.guess ./stepmake/bin/config.guess.sub
+
+       # Still not clean enough?  Let's use... BRUTE STRENGTH!  :-)
+       find . -type d -name 'out' -o -name 'out-www' | xargs rm -rf
+       rm -f buildscripts/*.pyc
+       rm -f lib/lilypond/python examples.html
+       rm -f debian/emacsen-startup
+       rm -f debian/lilypond1.7*.dirs debian/lilypond.dirs
+       rm -f debian/postinst debian/prerm debian/postrm
+       rm -f debian/lilypond-data.doc-base debian/lilypond.doc-base
+       rm -f GNUmakefile config.log config.make config.status config.hh
+
+       dh_clean
+
+install: DH_OPTIONS=
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+
+       # Add here commands to install the package into debian/tmp.
+       $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+
+       dh_install --sourcedir=debian/tmp --list-missing
+
+# Build architecture-independent files here.
+binary-indep: DH_OPTIONS=-i
+binary-indep: build-doc install
+       dh_testdir
+       dh_testroot
+       # Install LilyPond web documentation...
+       $(MAKE) install-doc prefix=$(CURDIR)/debian/lilypond-doc/usr/
+       # it installs a random dir-dep file for no reason
+       rm -f $(CURDIR)/debian/lilypond-doc/usr/share/info/*-dir-dep*
+
+       dh_installdocs
+       find $(CURDIR)/debian/lilypond-doc/usr/share/doc/lilypond/html \
+               -type d -empty -delete
+       dh_installemacsen
+
+       #find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \) ! -regex '.*/out-www/.*' \
+       #       -exec cp -a --parents '{}' $(r_data)/$(d)/examples ';'
+       install -m 644 debian/xiao-haizi-guai-guai.ly debian/sakura-sakura.ly \
+               $(r_data)/$(d)/examples
+       dh_installchangelogs
+
+#      mv $(r_data)/usr/share/lilypond/$(VERSION)/fonts/map/lilypond.map \
+#         $(r_data)/etc/texmf/dvips/lilypond.map
+
+       dh_link usr/share/lilypond/$(VERSION)/tex \
+                       usr/share/texmf/tex/lilypond \
+               usr/share/lilypond/$(VERSION)/fonts/source \
+                       usr/share/texmf/fonts/source/public/lilypond \
+               usr/share/lilypond/$(VERSION)/fonts/afm \
+                       usr/share/texmf/fonts/afm/public/lilypond \
+               usr/share/lilypond/$(VERSION)/fonts/tfm \
+                       usr/share/texmf/fonts/tfm/public/lilypond \
+               usr/share/lilypond/$(VERSION)/fonts/type1 \
+                       usr/share/texmf/fonts/type1/public/lilypond \
+               etc/texmf/dvips/lilypond.map \
+                       usr/share/lilypond/$(VERSION)/dvips/lilypond.map
+
+       dh_pysupport /usr/share/lilypond/${VERSION}/python
+
+       dh_compress -X$(d)/html/
+       dh_fixperms
+       dh_installdeb
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary-arch: DH_OPTIONS=-s
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installdocs AUTHORS.txt NEWS.txt README.txt \
+               DEDICATION THANKS 
+
+
+       dh_installemacsen
+       dh_installchangelogs Documentation/misc/CHANGES* Documentation/misc/ChangeLog*
+
+       dh_strip
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean install binary-indep binary-arch binary

diff --git a/debian/sakura-sakura.ly b/debian/sakura-sakura.ly
new file mode 100644 (file)
index 0000000..a604e3d
--- /dev/null
+++ b/debian/sakura-sakura.ly
@@ -0,0 +1,55 @@
+%
+% sakura-sakura.ly
+%
+
+\version "2.2.4"
+
+\header {
+  title = "さくら さくら (Sakura, sakura)"
+  composer = ""
+  copyright = ""
+  footer = ""
+  tagline = ""
+  latexpackages = "[encapsulated]CJK,[cjkjis]ucs"
+  inputencoding = "utf8"
+  fontencoding = "C42,OT1"
+  atbegindocument = "\fontfamily{min}"
+}
+
+melody = \notes \relative c'' {
+  a4 a b2 | a4 a b2 |
+  a4 b c b | a4 b8[ a] f2 |
+  e4 c e f | e4 e8[ c] b2 |
+  a'4 b c b | a4 b8[ a] f2 |
+  e4 c e f | e4 e8[ c] b2 |
+  a'4 a b2 | a4 a b2 |
+  d,4 e b'8[ a] f4 | e1 \bar "|."
+}
+
+text = \lyrics {
+  さ く ら さ く ら
+  の や ま も さ と も
+  み わ た す か ぎ り
+  か す み か く も か
+  あ さ ひ に に を う
+  さ く ら さ く ら
+  は な ざ か り
+}
+
+\score {
+  <<
+    \context Voice = one {
+      \set Staff.autoBeaming = ##f
+      \override Score.LyricText #'extra-offset = #'(1 . 0)
+      \melody
+    }
+    \lyricsto "one" \new Lyrics \text
+  >>
+  \paper { }
+}
+
+% Local Variables:
+% coding: utf-8
+% End:
+
+% EOF

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..a18e8f7
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,6 @@
+# LilyPond 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
+version=3
+http://lilypond.org/download/sources/v(\d+\.\d+)/lilypond-(.*)\.tar\.gz        debian  uupdate

diff --git a/debian/xiao-haizi-guai-guai.ly b/debian/xiao-haizi-guai-guai.ly
new file mode 100644 (file)
index 0000000..ac50d6b
--- /dev/null
+++ b/debian/xiao-haizi-guai-guai.ly
@@ -0,0 +1,57 @@
+%
+% xiao-haizi-guai-guai.ly
+%
+
+\version "2.2.4"
+
+\header {
+  title = "小孩子乖乖 (\Xiao3 \hai2\zi5 \guai1\guai1)"
+  composer = ""
+  copyright = ""
+  footer = ""
+  tagline = ""
+  latexpackages = "[encapsulated]CJK,pinyin,[cjkbg5]ucs"
+  inputencoding = "utf8"
+  fontencoding = "C00,OT1"
+  atbegindocument = "\fontfamily{bsmi}"
+}
+
+melody = \notes \relative c'' {
+  g4 c8 a g4 g |
+  e4 g8 a g4 g |
+  a4 g8 e d4 d |
+  e4 g8[ e] d[ e] c4 |
+
+  a'8 g a g e a g4 |
+  e8 g e d c4 r |
+  a8 c d e c4 r \bar "|."
+}
+
+text = \lyrics {
+  小 孩 子 乖 乖
+  把 門 兒 開 開
+  快 點 兒 開 開
+  我 要 進 來
+
+  不 開 不 開 不 能 開
+  你 是 大 野 狼
+  不 讓 你 進 來
+}
+
+\score {
+  <<
+    \context Voice = one {
+      \set Staff.autoBeaming = ##f
+      \override Score.LyricText #'extra-offset = #'(1 . 0)
+      \melody
+    }
+    \lyricsto "one" \new Lyrics \text
+  >>
+  \paper { }
+}
+
+% Local Variables:
+% coding: utf-8
+% End:
+
+% EOF

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 8b84798f6200ec454577493aed020b6dff2c0dbc..ca7e24141c14a0d1615a145c4858dd652e2671e6 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -7,7 +7,7 @@
 */
 
 #include "midi-stream.hh"
-
+#include <cstring>
 #include <cerrno>
 using namespace std;
 

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index fd141ed3710d38ca0227352311a8d3ccb4cfad63..f30442db548a7fc8782055c4fce419a37dddfbbd 100644 (file)
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -27,6 +27,7 @@
 #include "item.hh"
 
 #include "translator.icc"
+#include <cstring>
 
 #include <string.h>
 

diff --git a/lily/prob.cc b/lily/prob.cc
index 4d11d193f1b99f6068601131e75833276d15e3c6..53ce8f72be3e9ba257061a08ee71a4957cd15b90 100644 (file)
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -11,7 +11,7 @@
 #include "item.hh"
 #include "input.hh"
 #include "profile.hh"
-
+#include <cstring>
 #include "ly-smobs.icc"
 
 IMPLEMENT_SMOBS (Prob);

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 25e1daa244a287908fc65de5f8fcd1677ce089f3..67926e531cb552a5054138b5b2ed4626e652a600 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -14,8 +14,10 @@
 
 /* TODO: autoconf support */
 
+#include <ctype.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <cstring>
 
 #if HAVE_GETTEXT
 #include <libintl.h>

diff --git a/lily/source-file.cc b/lily/source-file.cc
index fc5b03483d78cc85582d04bf7ad576c9bb681a64..d5e4bcf6764a015a6adc6b6725939407e821bde1 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -13,7 +13,7 @@
 #endif /* GCC_MAJOR < 4 */
 
 #include "source-file.hh"
-
+#include <cstring>
 #include "config.hh"
 
 #if HAVE_UTF8_WCHAR_H

diff --git a/lily/translator.cc b/lily/translator.cc
index efa375549fba042301a1f4903b0c567113999573..68320f1fe0c648084c479a2f740d192ca445f609 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -7,7 +7,7 @@
 */
 
 #include "translator.hh"
-
+#include <cstring>
 #include "context-def.hh"
 #include "dispatcher.hh"
 #include "global-context.hh"

diff --git a/python/langdefs.py b/python/langdefs.py
index 6b2d79d4f1a9477cf3272927a181c05b1ec839eb..8bad480b8ecadb6949a4eb3883c2cc8123f1681f 100644 (file)
--- a/python/langdefs.py
+++ b/python/langdefs.py
@@ -15,7 +15,7 @@ def lang_file_name (p, langext, ext):
     return p + ext
 
 class LanguageDef:
-    def __init__ (self, code, name, webext=None, double_punct_char_sep='', html_filter=lambda s: s):
+    def __init__ (self, code, name, webext=None, double_punct_char_sep='', html_filter=lambda s: s, enable_ly_identifier_l10n=True):
         self.code = code
         self.name = name
         self.enabled = True
@@ -25,7 +25,7 @@ class LanguageDef:
             self.webext = webext
         self.double_punct_char_sep = double_punct_char_sep
         self.html_filter = html_filter
-    
+        self.enable_ly_identifier_l10n = enable_ly_identifier_l10n
     def file_name (self, prefix, ext):
         return lang_file_name (prefix, self.webext, ext)
 

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index ca1a16b7f6fddd60b71f708cab8cbb6a14c5d3e3..639edcabccf90cb55ae21cc51a6fdf8efbc1da01 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -90,6 +90,7 @@
  -dCompatibilityLevel=1.4\
  -dNOPAUSE\
  -dBATCH\
+ -q\
  -r1200\
  -sDEVICE=pdfwrite\
  -sOutputFile=~S\

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index cb20163c01e2062f495a7b95fa076e8975c74f5b..6c53f07849ebb45e5cd5300796f38cd9c8cb864a 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -124,6 +124,7 @@
  ~a\
  ~a\
  -dGraphicsAlphaBits=4\
+ -q\
  -dTextAlphaBits=4\
  -dNOPAUSE\
  -sDEVICE=~a\

diff --git a/stepmake/bin/config.sub b/stepmake/bin/config.sub
index c99bd1a79da510c4955cf1ef58938d2d9cab84a6..6759825a5b7fcf64476b4398dc0e30b3090b925c 100755 (executable)
--- a/stepmake/bin/config.sub
+++ b/stepmake/bin/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2002-03-07'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@ timestamp='2002-03-07'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -55,8 +57,8 @@ timestamp='2002-03-07'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTIONS] CPU-MFR-OPSYS
-       $0 [OPTIONS] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
 
 Canonicalize a configuration name.
 
@@ -70,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -83,11 +85,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )        # Use stdin as input.
@@ -99,7 +101,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,7 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,7 +148,7 @@ case $os in
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple | -axis)
+       -apple | -axis | -knuth | -cray)
                os=
                basic_machine=$1
                ;;
@@ -169,6 +173,10 @@ case $os in
        -hiux*)
                os=-hiuxwe2
                ;;
+       -sco6)
+               os=-sco5v6
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
        -sco5)
                os=-sco3.2v5
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +193,10 @@ case $os in
                # Don't forget version if it is 3.2v4 or newer.
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
+       -sco5v6*)
+               # Don't forget version if it is 3.2v4 or newer.
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
        -sco*)
                os=-sco3.2v2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,31 +240,52 @@ case $basic_machine in
        | a29k \
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+       | am33_2.0 \
+       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+       | bfin \
        | c4x | clipper \
-       | d10v | d30v | dsp16xx \
-       | fr30 \
+       | d10v | d30v | dlx | dsp16xx \
+       | fido | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
-       | m32r | m68000 | m68k | m88k | mcore \
-       | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-       | mips64vr4100 | mips64vr4100el | mips64vr4300 \
-       | mips64vr4300el | mips64vr5000 | mips64vr5000el \
-       | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-       | mipsisa32 | mipsisa64 \
+       | ip2k | iq2000 \
+       | m32c | m32r | m32rle | m68000 | m68k | m88k \
+       | maxq | mb | microblaze | mcore | mep \
+       | mips | mipsbe | mipseb | mipsel | mipsle \
+       | mips16 \
+       | mips64 | mips64el \
+       | mips64vr | mips64vrel \
+       | mips64orion | mips64orionel \
+       | mips64vr4100 | mips64vr4100el \
+       | mips64vr4300 | mips64vr4300el \
+       | mips64vr5000 | mips64vr5000el \
+       | mips64vr5900 | mips64vr5900el \
+       | mipsisa32 | mipsisa32el \
+       | mipsisa32r2 | mipsisa32r2el \
+       | mipsisa64 | mipsisa64el \
+       | mipsisa64r2 | mipsisa64r2el \
+       | mipsisa64sb1 | mipsisa64sb1el \
+       | mipsisa64sr71k | mipsisa64sr71kel \
+       | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
+       | mt \
+       | msp430 \
+       | nios | nios2 \
        | ns16k | ns32k \
-       | openrisc | or32 \
+       | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
-       | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-       | strongarm \
-       | tahoe | thumb | tic80 | tron \
+       | score \
+       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+       | sh64 | sh64le \
+       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+       | spu | strongarm \
+       | tahoe | thumb | tic4x | tic80 | tron \
        | v850 | v850e \
        | we32k \
-       | x86 | xscale | xstormy16 | xtensa \
+       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
        | z8k)
                basic_machine=$basic_machine-unknown
                ;;
@@ -263,6 +296,9 @@ case $basic_machine in
                ;;
        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
                ;;
+       ms1)
+               basic_machine=mt-unknown
+               ;;
 
        # We use `pc' rather than `unknown'
        # because (1) that's what they normally are, and
@@ -281,41 +317,66 @@ case $basic_machine in
        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-       | arm-*  | armbe-* | armle-* | armv*-* \
-       | avr-* \
-       | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c54x-* \
-       | clipper-* | cydra-* \
-       | d10v-* | d30v-* \
+       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+       | avr-* | avr32-* \
+       | bfin-* | bs2000-* \
+       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+       | clipper-* | craynv-* | cydra-* \
+       | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
-       | f30[01]-* | f700-* | fr30-* | fx80-* \
+       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
-       | m32r-* \
+       | ip2k-* | iq2000-* \
+       | m32c-* | m32r-* | m32rle-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | mcore-* \
-       | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-       | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-       | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+       | m88110-* | m88k-* | maxq-* | mcore-* \
+       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+       | mips16-* \
+       | mips64-* | mips64el-* \
+       | mips64vr-* | mips64vrel-* \
+       | mips64orion-* | mips64orionel-* \
+       | mips64vr4100-* | mips64vr4100el-* \
+       | mips64vr4300-* | mips64vr4300el-* \
+       | mips64vr5000-* | mips64vr5000el-* \
+       | mips64vr5900-* | mips64vr5900el-* \
+       | mipsisa32-* | mipsisa32el-* \
+       | mipsisa32r2-* | mipsisa32r2el-* \
+       | mipsisa64-* | mipsisa64el-* \
+       | mipsisa64r2-* | mipsisa64r2el-* \
+       | mipsisa64sb1-* | mipsisa64sb1el-* \
+       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+       | mipstx39-* | mipstx39el-* \
+       | mmix-* \
+       | mt-* \
+       | msp430-* \
+       | nios-* | nios2-* \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
-       | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-       | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-       | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+       | sparclite-* \
+       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+       | tahoe-* | thumb-* \
+       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+       | tron-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
-       | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-       | xtensa-* \
+       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+       | xstormy16-* | xtensa*-* \
        | ymp-* \
        | z8k-*)
                ;;
+       # Recognize the basic CPU types without company name, with glob match.
+       xtensa*)
+               basic_machine=$basic_machine-unknown
+               ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
        386bsd)
@@ -332,6 +393,9 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-udi
                ;;
+       abacus)
+               basic_machine=abacus-unknown
+               ;;
        adobe68k)
                basic_machine=m68010-adobe
                os=-scout
@@ -346,6 +410,12 @@ case $basic_machine in
                basic_machine=a29k-none
                os=-bsd
                ;;
+       amd64)
+               basic_machine=x86_64-pc
+               ;;
+       amd64-*)
+               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
        amdahl)
                basic_machine=580-amdahl
                os=-sysv
@@ -377,6 +447,14 @@ case $basic_machine in
                basic_machine=ns32k-sequent
                os=-dynix
                ;;
+       blackfin)
+               basic_machine=bfin-unknown
+               os=-linux
+               ;;
+       blackfin-*)
+               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
        c90)
                basic_machine=c90-cray
                os=-unicos
@@ -405,12 +483,27 @@ case $basic_machine in
                basic_machine=j90-cray
                os=-unicos
                ;;
+       craynv)
+               basic_machine=craynv-cray
+               os=-unicosmp
+               ;;
+       cr16)
+               basic_machine=cr16-unknown
+               os=-elf
+               ;;
        crds | unos)
                basic_machine=m68k-crds
                ;;
+       crisv32 | crisv32-* | etraxfs*)
+               basic_machine=crisv32-axis
+               ;;
        cris | cris-* | etrax*)
                basic_machine=cris-axis
                ;;
+       crx)
+               basic_machine=crx-unknown
+               os=-elf
+               ;;
        da30 | da30-*)
                basic_machine=m68k-da30
                ;;
@@ -433,6 +526,10 @@ case $basic_machine in
                basic_machine=m88k-motorola
                os=-sysv3
                ;;
+       djgpp)
+               basic_machine=i586-pc
+               os=-msdosdjgpp
+               ;;
        dpx20 | dpx20-*)
                basic_machine=rs6000-bull
                os=-bosx
@@ -583,6 +680,14 @@ case $basic_machine in
                basic_machine=m68k-isi
                os=-sysv
                ;;
+       m68knommu)
+               basic_machine=m68k-unknown
+               os=-linux
+               ;;
+       m68knommu-*)
+               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
        m88k-omron*)
                basic_machine=m88k-omron
                ;;
@@ -598,6 +703,10 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-mingw32
                ;;
+       mingw32ce)
+               basic_machine=arm-unknown
+               os=-mingw32ce
+               ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;
@@ -611,10 +720,6 @@ case $basic_machine in
        mips3*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                ;;
-       mmix*)
-               basic_machine=mmix-knuth
-               os=-mmixware
-               ;;
        monitor)
                basic_machine=m68k-rom68k
                os=-coff
@@ -627,6 +732,9 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-msdos
                ;;
+       ms1-*)
+               basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+               ;;
        mvs)
                basic_machine=i370-ibm
                os=-mvs
@@ -702,9 +810,12 @@ case $basic_machine in
                basic_machine=hppa1.1-oki
                os=-proelf
                ;;
-       or32 | or32-*)
+       openrisc | openrisc-*)
                basic_machine=or32-unknown
-               os=-coff
+               ;;
+       os400)
+               basic_machine=powerpc-ibm
+               os=-os400
                ;;
        OSE68000 | ose68000)
                basic_machine=m68000-ericsson
@@ -722,55 +833,75 @@ case $basic_machine in
                basic_machine=i860-intel
                os=-osf
                ;;
+       parisc)
+               basic_machine=hppa-unknown
+               os=-linux
+               ;;
+       parisc-*)
+               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
        pbd)
                basic_machine=sparc-tti
                ;;
        pbb)
                basic_machine=m68k-tti
                ;;
-        pc532 | pc532-*)
+       pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
+       pc98)
+               basic_machine=i386-pc
+               ;;
+       pc98-*)
+               basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
        pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
-       pentiumpro | p6 | 6x86 | athlon)
+       pentiumpro | p6 | 6x86 | athlon | athlon_*)
                basic_machine=i686-pc
                ;;
-       pentiumii | pentium2)
+       pentiumii | pentium2 | pentiumiii | pentium3)
                basic_machine=i686-pc
                ;;
+       pentium4)
+               basic_machine=i786-pc
+               ;;
        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        pentiumpro-* | p6-* | 6x86-* | athlon-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
-       pentiumii-* | pentium2-*)
+       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
+       pentium4-*)
+               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
        pn)
                basic_machine=pn-gould
                ;;
        power)  basic_machine=power-ibm
                ;;
        ppc)    basic_machine=powerpc-unknown
-               ;;
+               ;;
        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppcle | powerpclittle | ppc-le | powerpc-little)
                basic_machine=powerpcle-unknown
-               ;;
+               ;;
        ppcle-* | powerpclittle-*)
                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64)  basic_machine=powerpc64-unknown
-               ;;
+               ;;
        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
                basic_machine=powerpc64le-unknown
-               ;;
+               ;;
        ppc64le-* | powerpc64little-*)
                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
@@ -781,6 +912,10 @@ case $basic_machine in
                basic_machine=i586-unknown
                os=-pw32
                ;;
+       rdos)
+               basic_machine=i386-pc
+               os=-rdos
+               ;;
        rom68k)
                basic_machine=m68k-rom68k
                os=-coff
@@ -801,6 +936,20 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-udi
                ;;
+       sb1)
+               basic_machine=mipsisa64sb1-unknown
+               ;;
+       sb1el)
+               basic_machine=mipsisa64sb1el-unknown
+               ;;
+       sde)
+               basic_machine=mipsisa32-sde
+               os=-elf
+               ;;
+       sei)
+               basic_machine=mips-sei
+               os=-seiux
+               ;;
        sequent)
                basic_machine=i386-sequent
                ;;
@@ -808,6 +957,12 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
+       sh5el)
+               basic_machine=sh5le-unknown
+               ;;
+       sh64)
+               basic_machine=sh64-unknown
+               ;;
        sparclite-wrs | simso-wrs)
                basic_machine=sparclite-wrs
                os=-vxworks
@@ -866,7 +1021,7 @@ case $basic_machine in
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;
-        sv1)
+       sv1)
                basic_machine=sv1-cray
                os=-unicos
                ;;
@@ -874,10 +1029,6 @@ case $basic_machine in
                basic_machine=i386-sequent
                os=-dynix
                ;;
-       t3d)
-               basic_machine=alpha-cray
-               os=-unicos
-               ;;
        t3e)
                basic_machine=alphaev5-cray
                os=-unicos
@@ -890,6 +1041,18 @@ case $basic_machine in
                basic_machine=tic54x-unknown
                os=-coff
                ;;
+       tic55x | c55x*)
+               basic_machine=tic55x-unknown
+               os=-coff
+               ;;
+       tic6x | c6x*)
+               basic_machine=tic6x-unknown
+               os=-coff
+               ;;
+       tile*)
+               basic_machine=tile-unknown
+               os=-linux-gnu
+               ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;
@@ -903,6 +1066,10 @@ case $basic_machine in
        tower | tower-32)
                basic_machine=m68k-ncr
                ;;
+       tpf)
+               basic_machine=s390x-ibm
+               os=-tpf
+               ;;
        udi29k)
                basic_machine=a29k-amd
                os=-udi
@@ -924,8 +1091,8 @@ case $basic_machine in
                os=-vms
                ;;
        vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+               basic_machine=f301-fujitsu
+               ;;
        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks
@@ -946,11 +1113,11 @@ case $basic_machine in
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
-       windows32)
-               basic_machine=i386-pc
-               os=-windows32-msvcrt
+       xbox)
+               basic_machine=i686-pc
+               os=-mingw32
                ;;
-        xps | xps100)
+       xps | xps100)
                basic_machine=xps100-honeywell
                ;;
        ymp)
@@ -980,6 +1147,9 @@ case $basic_machine in
        romp)
                basic_machine=romp-ibm
                ;;
+       mmix)
+               basic_machine=mmix-knuth
+               ;;
        rs6000)
                basic_machine=rs6000-ibm
                ;;
@@ -996,16 +1166,13 @@ case $basic_machine in
        we32k)
                basic_machine=we32k-att
                ;;
-       sh3 | sh4 | sh3eb | sh4eb)
+       sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
                basic_machine=sh-unknown
                ;;
-       sh64)
-               basic_machine=sh64-unknown
-               ;;
-       sparc | sparcv9 | sparcv9b)
+       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
                basic_machine=sparc-sun
                ;;
-        cydra)
+       cydra)
                basic_machine=cydra-cydrome
                ;;
        orion)
@@ -1020,10 +1187,6 @@ case $basic_machine in
        pmac | pmac-mpw)
                basic_machine=powerpc-apple
                ;;
-       c4x*)
-               basic_machine=c4x-none
-               os=-coff
-               ;;
        *-unknown)
                # Make sure to match an already-canonicalized machine name.
                ;;
@@ -1079,18 +1242,23 @@ case $os in
              | -aos* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+             | -openbsd* | -solidbsd* \
+             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-             | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+             | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-             | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
+             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1102,16 +1270,21 @@ case $os in
                        ;;
                esac
                ;;
+       -nto-qnx*)
+               ;;
        -nto*)
-               os=-nto-qnx
+               os=`echo $os | sed -e 's|nto|nto-qnx|'`
                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+             | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                ;;
        -mac*)
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;
+       -linux-dietlibc)
+               os=-linux-dietlibc
+               ;;
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;
@@ -1124,6 +1297,9 @@ case $os in
        -opened*)
                os=-openedition
                ;;
+        -os400*)
+               os=-os400
+               ;;
        -wince*)
                os=-wince
                ;;
@@ -1145,6 +1321,9 @@ case $os in
        -atheos*)
                os=-atheos
                ;;
+       -syllable*)
+               os=-syllable
+               ;;
        -386bsd)
                os=-bsd
                ;;
@@ -1155,7 +1334,7 @@ case $os in
                os=-rtmk-nova
                ;;
        -ns2 )
-               os=-nextstep2
+               os=-nextstep2
                ;;
        -nsk*)
                os=-nsk
@@ -1167,6 +1346,9 @@ case $os in
        -sinix*)
                os=-sysv4
                ;;
+        -tpf*)
+               os=-tpf
+               ;;
        -triton*)
                os=-sysv3
                ;;
@@ -1194,8 +1376,17 @@ case $os in
        -xenix)
                os=-xenix
                ;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-               os=-mint
+       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+               os=-mint
+               ;;
+       -aros*)
+               os=-aros
+               ;;
+       -kaos*)
+               os=-kaos
+               ;;
+       -zvmoe)
+               os=-zvmoe
                ;;
        -none)
                ;;
@@ -1219,6 +1410,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+               os=-elf
+               ;;
+        spu-*)
+               os=-elf
+               ;;
        *-acorn)
                os=-riscix1.2
                ;;
@@ -1228,11 +1425,14 @@ case $basic_machine in
        arm*-semi)
                os=-aout
                ;;
+        c4x-* | tic4x-*)
+               os=-coff
+               ;;
        # This must come before the *-dec entry.
        pdp10-*)
                os=-tops20
                ;;
-        pdp11-*)
+       pdp11-*)
                os=-none
                ;;
        *-dec | vax-*)
@@ -1253,6 +1453,9 @@ case $basic_machine in
        m68*-cisco)
                os=-aout
                ;;
+        mep-*)
+               os=-elf
+               ;;
        mips*-cisco)
                os=-elf
                ;;
@@ -1271,9 +1474,15 @@ case $basic_machine in
        *-be)
                os=-beos
                ;;
+       *-haiku)
+               os=-haiku
+               ;;
        *-ibm)
                os=-aix
                ;;
+       *-knuth)
+               os=-mmixware
+               ;;
        *-wec)
                os=-proelf
                ;;
@@ -1325,19 +1534,19 @@ case $basic_machine in
        *-next)
                os=-nextstep3
                ;;
-        *-gould)
+       *-gould)
                os=-sysv
                ;;
-        *-highlevel)
+       *-highlevel)
                os=-bsd
                ;;
        *-encore)
                os=-bsd
                ;;
-        *-sgi)
+       *-sgi)
                os=-irix
                ;;
-        *-siemens)
+       *-siemens)
                os=-sysv4
                ;;
        *-masscomp)
@@ -1406,10 +1615,16 @@ case $basic_machine in
                        -mvs* | -opened*)
                                vendor=ibm
                                ;;
+                       -os400*)
+                               vendor=ibm
+                               ;;
                        -ptx*)
                                vendor=sequent
                                ;;
-                       -vxsim* | -vxworks*)
+                       -tpf*)
+                               vendor=ibm
+                               ;;
+                       -vxsim* | -vxworks* | -windiss*)
                                vendor=wrs
                                ;;
                        -aux*)
@@ -1433,7 +1648,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)