update from Debian

diff --git a/debian/changelog b/debian/changelog
index c318fa081a960ce76c14120ce9fba9ec99502037..7b8c5aec6dd12f733d8e4455773d0510eef26c2e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+lilypond (1.9.9-jcn1) unstable; urgency=low
+
+  * Testing.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Tue, 23 Sep 2003 23:06:05 +0200
+
+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.  :-)
@@ -765,7 +786,6 @@ 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
 

diff --git a/debian/control b/debian/control
index d6ea2f009d98390aa6fb1bd8c0987ffedfff8a26..fb529529cee26e601a94845a190cb79bf3e6cd85 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Build-Depends-Indep: gs | gs-aladdin, netpbm (>= 2:9.10-1)
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 3.5.10
+Standards-Version: 3.6.0
 
 Package: lilypond
 Architecture: any
@@ -35,7 +35,7 @@ Architecture: arm i386 m68k powerpc sparc
 Depends: lilypond (>= ${Source-Version})
 Description: Dummy package for transition to new stable lilypond
  This dummy package provides a transition from the previous lilypond1.3
- package back to a newer lilypond because the stable 1.4/1.6 series
+ package back to a newer lilypond because the stable 1.4/1.6/1.8 series
  have arrived.
  .
  Please feel free to remove this dummy package after you have upgraded

diff --git a/debian/control.foka b/debian/control.foka
index 53623715124c44f49931d67235518bcc9c425276..fb529529cee26e601a94845a190cb79bf3e6cd85 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -1,10 +1,10 @@
 Source: lilypond
-Build-Depends: debhelper (>= 4.0.0), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison (<< 1:1.50) | bison (>= 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), pfaedit (>= 0.0.20020312-1), autotrace (>= 0.29-1.4), t1utils
+Build-Depends: debhelper (>= 4.0.0), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python-dev, guile-1.6-dev | libguile-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14) | flex-old, bison (<< 1:1.50) | bison (>> 1:1.75-1), texinfo (>= 4.6-1), groff, m4, gettext (>= 0.10.36-1), mftrace (>= 1.0.17-1), pfaedit (>= 0.0.20020312-1), autotrace (>= 0.29-1.4), t1utils
 Build-Depends-Indep: gs | gs-aladdin, netpbm (>= 2:9.10-1)
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
-Standards-Version: 3.5.10
+Standards-Version: 3.6.0
 
 Package: lilypond
 Architecture: any
@@ -35,7 +35,7 @@ Architecture: arm i386 m68k powerpc sparc
 Depends: lilypond (>= ${Source-Version})
 Description: Dummy package for transition to new stable lilypond
  This dummy package provides a transition from the previous lilypond1.3
- package back to a newer lilypond because the stable 1.4/1.6 series
+ package back to a newer lilypond because the stable 1.4/1.6/1.8 series
  have arrived.
  .
  Please feel free to remove this dummy package after you have upgraded

diff --git a/debian/copyright b/debian/copyright
index aab2254e3c864c7c10eef6e5f8f0d21e6cab1b3d..33836d1778d18f225e534d4aa1c5dcdffecf95d8 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,16 +7,10 @@ but was merged back into the lilypond package
 as of Mon, 16 Apr 2001 21:58:42 -0600
 
 It was downloaded from
-      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/
-
-It is also available at: 
-      ftp://ftp.lilypond.org/pub/LilyPond/
+    ftp://ftp.lilypond.org/pub/LilyPond/
 
 For more information about GNU LilyPond, please visit:
-      http://www.cs.uu.nl/~hanwen/lilypond/
-  or  http://www.xs4all.nl/~jantien/
-  or  http://www.lilypond.org/
-  or  http://sca.uwaterloo.ca/lilypond/
+    http://www.lilypond.org/
 
 Authors:
       Han-Wen Nienhuys <hanwen@cs.uu.nl>
@@ -24,7 +18,7 @@ Authors:
  
 Copyright:
 
-  GNU LilyPond is Copyright (C) 1996-2002
+  GNU LilyPond is Copyright (C) 1996-2003
   Jan Nieuwenhuizen & Han-Wen Nienhuys
 
     This program is free software; you can redistribute it and/or modify

diff --git a/debian/watch b/debian/watch
index c52667ae0d0a6dffb3cface5a319206ddf5e92a8..7f3b86469e31b55317d5669f9bfdd35d2b620f87 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,4 @@
 # 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
-ftp.lilypond.org       /pub/LilyPond/v1.7      lilypond-*.tar.gz       debian  uupdate
+ftp.lilypond.org       /pub/LilyPond/v1.9      lilypond-*.tar.gz       debian  uupdate