*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 1ef0ec47351c7c373e2e565be0e328da23b52f20..13f0e78e508c10274a0843e90ebb55c36d893f5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
  
 2004-06-22  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * debian/GNUmakefile (#OUTCONF_FILES): update file list.
+
        * lily/stencil.cc (interpret_stencil_expression): bugfix 
 
 2004-06-21  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 5ccb40a1bfb300c43d72159f3b0cf608ab889bd9..bc6f0bdd45ef9fc96c045f2c02b4284c69c5a927 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -3439,8 +3439,6 @@ The definition of lyrics mode is too complex.
 @subsection  The Lyrics context
 
 
-@c TODO: document \newlyrics
-
 Lyrics are printed by interpreting them in a @internalsref{Lyrics} context
 @example
  \context Lyrics \lyrics @dots{}

diff --git a/debian/GNUmakefile b/debian/GNUmakefile
index 1239828f36c8c52338c3873b6632f5e922f78557..ddc7f137a6f4b0ac03c93fc3f24ef1c54e541531 100644 (file)
--- a/debian/GNUmakefile
+++ b/debian/GNUmakefile
@@ -7,13 +7,12 @@ at-dir = $(outdir)/
 at-ext =
 
 CONF_FILES = changelog control copyright emacsen-startup \
-       preinst postinst postrm prerm rules watch
+       preinst  rules watch
 EXTRA_DIST_FILES = README.Debian $(CONF_FILES) \
        control.foka control.potato \
-       lilypond.dirs lilypond.doc-base \
+       lilypond.doc-base \
        lilypond-doc.dirs lilypond-doc.doc-base lilypond-doc.README.Debian \
        lilypond1.3.copyright \
-       lilypond1.7.dirs lilypond1.7-doc.dirs
 #OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES)
 OUTCONF_FILES = $(OUTIN_FILES)
 OUT_DIST_FILES = $(OUTIN_FILES)