lilypond-1.3.130

diff --git a/debian/changelog b/debian/changelog
index 6d558f8a7c8cf1d1b4623860ffa51fd5f7d5b7ee..215774e68d3c143773cbbdf4c1d66f266850323b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+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.

diff --git a/debian/control b/debian/control
index 182166b1f1f8f1af3a446d1bdebdda7904bcff32..d50d51b55fb56142b723cbf6d6770b3c0336cf24 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: lilypond1.3
-Build-Depends: debhelper (>= 2.0.72), python-base (>= 1.5.2-4), libguile9-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), bibtex2html, groff, gs, netpbm, pnmtopng, m4, gettext (>= 0.10.35-13)
+Build-Depends: debhelper (>= 2.0.72), python-base (>= 1.5.2-4), libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), bibtex2html, groff, gs, netpbm, pnmtopng, m4, gettext (>= 0.10.35-13)
+Build-Conflicts: lilypond, lilypond1.3
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
@@ -9,7 +10,7 @@ Package: lilypond1.3
 Architecture: any
 Replaces: lilypond
 Provides: lilypond
-Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python-base (>= 1.5.2-4), guile
+Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python-base (>= 1.5.2-4), guile1.4
 Recommends: tetex-extra (>= 1.0-1)
 Conflicts: lilypond, musixtex-fonts
 Description: A program for printing sheet music.

diff --git a/debian/emacsen-startup b/debian/emacsen-startup
index 2a3812eeed7edb3f819604c9acec4080273ebdb9..0ce6460c08cd3c0760110578ff1a446b68d3fe7e 100644 (file)
--- a/debian/emacsen-startup
+++ b/debian/emacsen-startup
@@ -1,3 +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)))
+(autoload 'LilyPond-mode "lilypond-mode" nil t)
+(setq auto-mode-alist (append '(("\\.ly$" . LilyPond-mode) auto-mode-alist)))
+(add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock)))

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 9b997bf350d9f3b6bb67d0a39aa493cf3617ddf7..49a0f6dd129dbec51bae32312951f13ec8592417 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -9,7 +9,7 @@ $(outdir)/%.latex: %.doc
        chmod -w $@
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
-# it is not, for --scrdir builds
+# it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
        rm -f $@
        LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I $(pwd) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ --dependencies --format=texi $<