From cafd1e68beb885eedd284641cff8d55295c49e2a Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 20 Sep 2002 11:53:25 +0000
Subject: [PATCH] * cygwin: Cygwin updates.

---
 ChangeLog                     |  4 ++++
 cygwin/README.in              | 10 +++++-----
 cygwin/bug-lilypond-cygwin.sh |  1 +
 cygwin/changelog              | 12 ++++++++++++
 cygwin/lilypond.hint          |  2 +-
 cygwin/mknetrel               | 14 +++++++-------
 6 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e631ace1b8..c975b7a2ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-20  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* cygwin: Cygwin updates.
+
 2002-09-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* Documentation/windows/installing.texi (Top): version for python,
diff --git a/cygwin/README.in b/cygwin/README.in
index 8afb8882cf..8db0f9e9a2 100644
--- a/cygwin/README.in
+++ b/cygwin/README.in
@@ -14,7 +14,7 @@ When it all works, head straight to the tutorial:
 
 Runtime requirements:
   cygwin-1.3.10 or newer
-  libguile14
+  libguile12
   bash
   libiconv2
   libintl2
@@ -38,15 +38,15 @@ Build requirements:
   binutils-20011102 or newer
   gcc-2.95.3-5 or newer
   bison-1.35 or newer
-  guile-devel-1.5.6-5 or newer
+  guile-devel-1.6.0-1 or newer
   fileutils
   flex-2.5.4 or newer
-  libguile14-1.5.6-5 or newer
-  libkpathsea3-20020530-2 or newer
+  libguile12-1.6.0-1 or newer
+  libkpathsea3-20020911-1 or newer
   python-2.2 or newer
   sed-3.02 or newer
   sh-utils
-  tetex-devel-20020530-2 or newer
+  tetex-devel-20020911-1 or newer
   texinfo-4.2 or newer
 
 Website/documentation build requirements (lilypond-doc package):
diff --git a/cygwin/bug-lilypond-cygwin.sh b/cygwin/bug-lilypond-cygwin.sh
index 0db601ea82..1c61929e58 100644
--- a/cygwin/bug-lilypond-cygwin.sh
+++ b/cygwin/bug-lilypond-cygwin.sh
@@ -41,6 +41,7 @@ type -p lilypond.exe
 type -p python.exe
 
 lilypond --version
+python -V
 ly2dvi --version
 
 
diff --git a/cygwin/changelog b/cygwin/changelog
index 5a87f40af7..5e16059d7b 100644
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,3 +1,15 @@
+lilypond (1.6.3-1) stable; urgency=low
+
+  * New upstream release.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Thu, 19 Sep 2002 11:35:34 +0200
+
+lilypond (1.6.0-1) stable; urgency=low
+
+  * New upstream release.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Mon, 19 Aug 2002 16:03:02 +0200
+
 lilypond (1.5.73-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint
index 4e9dcf9a37..e8c3ac0757 100644
--- a/cygwin/lilypond.hint
+++ b/cygwin/lilypond.hint
@@ -1,6 +1,6 @@
 sdesc: "A program for printing sheet music"
 category: Publishing
-requires: bash libguile14 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny
+requires: bash libguile12 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny
 #requires: tetex-bin, tetex-tiny | tetex-base
 #suggests: emacs gsview lilypond-doc rxvt tetex-x11 XFree86-serv
 ldesc: "A program for printing sheet music.
diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index b5698171fe..b2f32622b2 100644
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -1,16 +1,16 @@
 # -*- shell-script -*-
 
-# stable LilyPond releases: lilypond-1.4
-# archive=ftp://lilypond.org/pub/LilyPond/v1.4
+# stable LilyPond releases: lilypond-1.6
+# archive=ftp://lilypond.org/pub/LilyPond/v1.6
 
-# LilyPond development: lilypond-1.5
-# archive=ftp://lilypond.org/pub/LilyPond/v1.5
+# LilyPond development: lilypond-1.7
+# archive=ftp://lilypond.org/pub/LilyPond/v1.7
 
 # Guile specific mknetrel overrides
 # To use this, do something like:
 cat >/dev/null <<EOC
 
-   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.5/lilypond-1.5.72.tar.gz
+   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.6/lilypond-1.6.3.tar.gz
    rm -rf /home/netrel/src/lilypond-*
    mkdir -p /home/netrel/src && cd /home/netrel/src
    ## TODO: look at pimport
@@ -257,7 +257,7 @@ preconfig () { # aka libtool_woes ()
 
     cd $build || exit 1
 
-    GUILE=1.5.6
+    GUILE=1.6.0
     cat > guile-config <<EOF
 #!/bin/sh
 [ "\$1" == "--version" ] && echo "guile-config - Guile version $GUILE"
@@ -277,7 +277,7 @@ postconfig () {
     # Configure for build, for generating doc
     rm -f config.cache
     (PATH="$old_path" \
-	PATH="$HOME/usr/pkg/guile-1.5.6/bin:$PATH" \
+	PATH="$HOME/usr/pkg/guile-1.6.0/bin:$PATH" \
 	CFLAGS="-O2 -g" \
 	$src/configure --prefix=/usr --enable-config=for-build)
 }
-- 
2.39.5