*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index bbb56f585bb70f0ac9671cecf80885653871af4c..7538e6c56dff199dbdacd41357db2ec6b71ceb75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-11  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * cygwin/postinstall-lilypond.sh: Remove cruft.
+
+       * cygwin/postremove-lilypond.sh: Remove.
+
+       * cygwin/GNUmakefile (default): Remove postremove rules.
+
 2005-10-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/hara-kiri-group-spanner.cc (consider_suicide): only

diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile
index 60a27e095cb03735de02be324491378ad3a1a57c..37b06524883f607937431f35fb9d49978484b7fa 100644 (file)
--- a/cygwin/GNUmakefile
+++ b/cygwin/GNUmakefile
@@ -18,14 +18,11 @@ include $(stepdir)/executable-targets.make
 POSTINSTALLS=$(wildcard postinstall*.sh)
 OUT_POSTINSTALLS=$(POSTINSTALLS:%=$(outdir)/%)
 
-POSTREMOVES=$(wildcard postremove*.sh)
-OUT_POSTREMOVES=$(POSTREMOVES:%=$(outdir)/%)
-
 $(outdir)/%.sh: %.sh $(config_make)
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-default: $(OUT_POSTINSTALLS) $(OUT_POSTREMOVES) $(OUTIN_FILES) 
+default: $(OUT_POSTINSTALLS) $(OUTIN_FILES) 
 
 INSTALLATION_OUT_SUFFIXES=1
 
@@ -34,8 +31,5 @@ etc=$(patsubst %/, %, $(dir $(prefix)))/etc
 INSTALLATION_DIR=$(etc)/postinstall
 INSTALLATION_FILES=$(OUT_POSTINSTALLS)
 
-INSTALLATION_OUT_DIR1=$(etc)/postremove
-INSTALLATION_OUT_FILES1=$(OUT_POSTREMOVES)
-
 endif
 

diff --git a/cygwin/changelog b/cygwin/changelog
index ed95ab0164ee0556ed3bacf905de8ac3178911d3..51e772e07eb43257949a7defdf19c441e64751ad 100644 (file)
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,3 +1,10 @@
+lilypond (2.6.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * New Cygwin maintainer.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Mon, 10 Oct 2005 21:30:49 +0200
+
 lilypond (2.5.12-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint
index c30b0630ba54e1d02f11ec48f009030b86228b62..bfa4cf8bd51efa64c50e7db701a2bec43b2b40f1 100644 (file)
--- a/cygwin/lilypond.hint
+++ b/cygwin/lilypond.hint
@@ -1,7 +1,6 @@
 sdesc: "A program for printing sheet music"
 category: Publishing
-requires: bash coreutils cygwin findutils ghostscript glib2-runtime libfontconfig1 libfreetype2 libguile12 libiconv2 libintl2 pango-runtime python _update-info-dir
-#requires: tetex-bin, tetex-tiny | tetex-base
+requires: bash coreutils cygwin findutils ghostscript glib2-runtime libfontconfig1 libfreetype2 libguile12 libiconv2 libintl3 pango-runtime python _update-info-dir
 #suggests: emacs gsview lilypond-doc rxvt tetex-x11 xorg-x11-base libkpathsea4
 ldesc: "A program for printing sheet music.
 LilyPond prints beautiful sheet music.  It produces music notation

diff --git a/cygwin/postinstall-lilypond.sh b/cygwin/postinstall-lilypond.sh
index b7b4b50947ededfa79f4491f4e0bd4390305ec56..c56894e8741c548322e814a18e0c8f5057740ac7 100644 (file)
--- a/cygwin/postinstall-lilypond.sh
+++ b/cygwin/postinstall-lilypond.sh
@@ -16,16 +16,6 @@ regtool add '/root/LilyPond/shell'
 regtool add '/root/LilyPond/shell/open'
 regtool add '/root/LilyPond/shell/open/command'
 
-# old ideas - discarded for now
-# regtool set '/root/LilyPond/shell/open/command/' $ROOT'\bin\python /usr/bin/lily-wins %1'
-# invoking python directly does not work
-# regtool set '/root/LilyPond/shell/open/command/' $ROOT'\bin\run-lily-wins.bat %1'
-# we now use generated run-lily-wins.bat in /
-# regtool set '/root/LilyPond/shell/open/command/' $ROOT'\run-lily-wins.bat %1'
-# the direct bash route:
-
-# TODO: should 'open' run LilyPond?
-#       should 'open' also start PDF viewer?
 regtool set '/root/LilyPond/shell/open/command/' $ROOT'\bin\bash.exe --login -c '"'"'/usr/bin/lily-wins "%1"'"'"
 regtool add '/root/LilyPond/shell/edit'
 regtool set '/root/LilyPond/shell/edit/' '&Edit source in Notepad ...'
@@ -34,26 +24,4 @@ regtool set '/root/LilyPond/shell/edit/command/' '%SystemRoot%\system32\notepad.
 regtool add '/root/LilyPond/shell/generate'
 regtool set '/root/LilyPond/shell/generate/' '&Generate PDF ...'
 regtool add '/root/LilyPond/shell/generate/command'
-# regtool set '/root/LilyPond/shell/generate/command/' $ROOT'\bin\python /usr/bin/lily-wins %1'
 regtool set '/root/LilyPond/shell/generate/command/' $ROOT'\bin\bash.exe --login -c '"'"'/usr/bin/lily-wins "%1"'"'"
-
-# static run-lily-wins.bat, does not work.
-# @echo off
-# rem run-lily-wins.bat - Invoke /usr/bin/lily-wins from explorer
-# rem cd %~dp0%
-# rem bash.exe --login -c "/usr/bin/lily-wins '%1%'"
-# rem only works in Windows NT
-# rem %~dp0~bin\bash.exe --login -c "/usr/bin/lily-wins '%1%'"
-
-# generate run-lily-wins.bat - not necessary: direct bash route
-# how to handle \r\n endings? text/bin mode?
-#cat > /run-lily-wins.bat <<EOF
-#@echo off\r
-#rem run-lily-wins.bat - Invoke /usr/bin/lily-wins from explorer\r
-#$ROOT\\bin\\bash.exe --login -c "/usr/bin/lily-wins '%1%'"\r
-#EOF
-
-# cleanup old fonts
-touch /tmp/.lilypond-install
-rm $(find /var/lib/texmf /var/spool/texmf /var/cache/fonts -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm')
-rm -f /tmp/.lilypond-install

diff --git a/cygwin/postremove-lilypond.sh b/cygwin/postremove-lilypond.sh
deleted file mode 100644 (file)
index d7ab762..0000000
--- a/cygwin/postremove-lilypond.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!@SHELL@
-# /etc/postremove/lilypond.sh -- Remove all traces of LilyPond
-
-regtool remove '/root/.ly'
-regtool remove '/root/LilyPond/shell/open/command'
-regtool remove '/root/LilyPond/shell/open'
-regtool remove '/root/LilyPond/shell/edit/command'
-regtool remove '/root/LilyPond/shell/edit'
-regtool remove '/root/LilyPond/shell/generate/command'
-regtool remove '/root/LilyPond/shell/generate'
-regtool remove '/root/LilyPond/shell'
-regtool remove '/root/LilyPond'
-
-# cleanup old fonts
-touch /tmp/.lilypond-install
-rm $(find /var/lib/texmf /var/spool/texmf /var/cache/fonts -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm')
-rm -f /tmp/.lilypond-install