lilypond-1.2.6

diff --git a/Documentation/BLURB.in b/Documentation/BLURB.in
index 6933b58e2e7fd60d3effe6dba849144d46f99966..52e0ef5c757379930fbaa1c3cd890d0a208d02b9 100644 (file)
--- a/Documentation/BLURB.in
+++ b/Documentation/BLURB.in
@@ -1,4 +1,3 @@
 LilyPond is a music typesetter.  It produces beautiful sheet music
 using a high level description file as input.  LilyPond is part of 
 the GNU Project.
-

diff --git a/debian/changelog b/debian/changelog
index 81437d0d42bd2ad354df96128d6976c662994fce..3236080537098cbc7ad8167d3efcf339994535d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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.

diff --git a/debian/control.foka b/debian/control.foka
index 9161ab70bfb159e1be227d729e9cb66fe3fb986e..3ea6fd643d9b9db79e6bdeed31aa64a994539c03 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -7,15 +7,12 @@ Standards-Version: 3.0.0
 Package: lilypond
 Architecture: any
 Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1)
-Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1)
+Recommends: python-base (>= 1.5.2-4), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
-Description: The GNU Project music typesetter.
- LilyPond is the GNU Project music typesetter.  This program can print
- beautiful sheet music from a music definition file.  It can also play
- mechanical performances to a MIDI file.  Features include multiple
- staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,
- beams, slurs, triplets, named chords, transposing, formatting scores, 
- part extraction.  It includes a nice font of musical symbols.
+Description: A program for printing sheet music.
+ LilyPond is a music typesetter.  It produces beautiful sheet music
+ using a high level description file as input.  LilyPond is part of
+ the GNU Project.
  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/

diff --git a/debian/control.in b/debian/control.in
index 262d03e3cefad85b222d14abddd830b5407603af..47e33d963d6e52d781b97f471bbfa228870c0f7f 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,14 +2,14 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 2.5.0.0
+Standards-Version: 3.0.0
 
 Package: lilypond
 Architecture: any
-Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
-Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.990310-1)
+Recommends: python-base (>= 1.5.2-4), tetex-base (>= 0.9.990311-1), tetex-extra (>= 0.9.990311-1)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
-Description: The GNU Project music typesetter.@BLURB@
+Description: A program for printing sheet music.@BLURB@
  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/

diff --git a/debian/copyright b/debian/copyright
index 9fcb608cd03c6577ac927c9cce322ab718693bf0..dd39bc69a088fb37600db9dece228e92fcc92132 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,10 @@ This package was Debianized by Anthony Fok <foka@debian.org> on
 Wed,  6 Aug 1997 04:30:28 -0600
 
 It was downloaded from
-      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.1.53.tar.gz
+      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.2.2.tar.gz
 
 It is also available at:
-      ftp://ftp.lilypond.org/pub/LilyPond/v1.1/lilypond-1.1.53.tar.gz
+      ftp://ftp.lilypond.org/pub/LilyPond/v1.2/lilypond-1.2.2.tar.gz
 
 For more information about GNU LilyPond, please visit:
       http://www.cs.uu.nl/~hanwen/lilypond/

diff --git a/debian/rules b/debian/rules
index 6dc437471401d2163c16a8ca8aa7ae110b7c878c..ad265c71ffe814ea32d68a938be1b5fe1ab63900 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -92,8 +92,8 @@ binary-arch: build install
                Documentation/pictures/out/*.png \
                Documentation/out/*.txt \
                Documentation/tex/*.doc \
-               Documentation/tex/*.bib \
-               Documentation/tex/out/*.dvi
+               Documentation/tex/out/*.dvi 
+#              Documentation/tex/*.bib
 #      dh_installexamples input
        cp -aP `find input mutopia \( -name '*.ly' -o -name '*.tex' -o -name 'TODO' \)` \
                $(r)/$(d)/examples

diff --git a/lily/command-request.cc b/lily/command-request.cc
index 34b517297ad589b3e41d204d22cb44afffa4ed8b..e682c8a4f603d8e3e7d3a6314dee26cd2b7c9a45 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -21,7 +21,7 @@ Cadenza_req::do_print () const
 bool
 Cadenza_req::do_equal_b (Request const *r) const
 {
-  Cadenza_req*cad =  dynamic_cast <Cadenza_req const *> (r);
+  Cadenza_req const*cad =  dynamic_cast <Cadenza_req const *> (r);
   return cad && cad->on_b_ == on_b_;
 }
 
@@ -35,7 +35,7 @@ Cadenza_req::Cadenza_req (bool b)
 bool
 Bar_req::do_equal_b (Request const *r) const
 {
-  Bar_req * b = dynamic_cast <Bar_req const *> (r);
+  Bar_req  const* b = dynamic_cast <Bar_req const *> (r);
   return b && type_str_ == b->type_str_;
 }
 
@@ -60,7 +60,7 @@ Partial_measure_req::Partial_measure_req (Moment m)
 bool
 Partial_measure_req::do_equal_b (Request const* r) const
 {
-  Partial_measure_req *p = dynamic_cast <Partial_measure_req  const*> (r);
+  Partial_measure_req  const*p = dynamic_cast <Partial_measure_req  const*> (r);
 
   return p&& p->length_mom_ == length_mom_;
 }
@@ -68,7 +68,7 @@ Partial_measure_req::do_equal_b (Request const* r) const
 bool
 Barcheck_req::do_equal_b (Request const *r) const
 {
-  Barcheck_req *b = dynamic_cast<Barcheck_req const*> (r);
+  Barcheck_req  const*b = dynamic_cast<Barcheck_req const*> (r);
   return b;
 }
 
@@ -102,7 +102,7 @@ Time_signature_change_req::do_print () const
 bool
 Time_signature_change_req::do_equal_b (Request const *r) const
 {
-  Time_signature_change_req * m
+  Time_signature_change_req  const* m
     = dynamic_cast <Time_signature_change_req  const*> (r);
 
   return m && m->beats_i_ == beats_i_
@@ -132,7 +132,7 @@ Tempo_req::do_print () const
 bool
 Tempo_req::do_equal_b (Request const *r) const
 {
-  Tempo_req *t = dynamic_cast <Tempo_req const*> (r);
+  Tempo_req const *t = dynamic_cast <Tempo_req const*> (r);
 
   return t&& t->dur_.length_mom ()== dur_.length_mom () && metronome_i_ == t->metronome_i_;
 }