CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/10/11 18:06:36

Modified files:
        cygwin         : postinstall-lilypond.sh lilypond.hint changelog 
                         GNUmakefile 
Removed files:
        cygwin         : postremove-lilypond.sh 

Log message:
        

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/postinstall-lilypond.sh.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/lilypond.hint.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/changelog.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/GNUmakefile.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: lilypond/cygwin/GNUmakefile
diff -u lilypond/cygwin/GNUmakefile:1.16 lilypond/cygwin/GNUmakefile:1.17
--- lilypond/cygwin/GNUmakefile:1.16    Thu Jun 30 20:13:38 2005
+++ lilypond/cygwin/GNUmakefile Tue Oct 11 18:06:36 2005
@@ -18,14 +18,11 @@
 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
 
@@ -33,9 +30,6 @@
 etc=$(patsubst %/, %, $(dir $(prefix)))/etc
 INSTALLATION_DIR=$(etc)/postinstall
 INSTALLATION_FILES=$(OUT_POSTINSTALLS)
-
-INSTALLATION_OUT_DIR1=$(etc)/postremove
-INSTALLATION_OUT_FILES1=$(OUT_POSTREMOVES)
 
 endif
 
Index: lilypond/cygwin/changelog
diff -u lilypond/cygwin/changelog:1.15 lilypond/cygwin/changelog:1.16
--- lilypond/cygwin/changelog:1.15      Sat Feb 26 09:03:07 2005
+++ lilypond/cygwin/changelog   Tue Oct 11 18:06:36 2005
@@ -1,3 +1,10 @@
+lilypond (2.6.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * New Cygwin maintainer.
+
+ -- Jan Nieuwenhuizen <[EMAIL PROTECTED]>  Mon, 10 Oct 2005 21:30:49 +0200
+
 lilypond (2.5.12-1) unstable; urgency=low
 
   * New upstream release.
Index: lilypond/cygwin/lilypond.hint
diff -u lilypond/cygwin/lilypond.hint:1.19 lilypond/cygwin/lilypond.hint:1.20
--- lilypond/cygwin/lilypond.hint:1.19  Mon Apr 25 16:02:36 2005
+++ lilypond/cygwin/lilypond.hint       Tue Oct 11 18:06:36 2005
@@ -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
Index: lilypond/cygwin/postinstall-lilypond.sh
diff -u lilypond/cygwin/postinstall-lilypond.sh:1.3 
lilypond/cygwin/postinstall-lilypond.sh:1.4
--- lilypond/cygwin/postinstall-lilypond.sh:1.3 Mon Sep 29 20:29:41 2003
+++ lilypond/cygwin/postinstall-lilypond.sh     Tue Oct 11 18:06:36 2005
@@ -16,16 +16,6 @@
 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 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
[EMAIL PROTECTED] off
-#rem run-lily-wins.bat - Invoke /usr/bin/lily-wins from explorer
-#$ROOT\\bin\\bash.exe --login -c "/usr/bin/lily-wins '%1%'"
-#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


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to