CVSROOT:        /cvsroot/lilypond
Module name:    installers
Branch:         
Changes by:     Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/08/14 07:49:59

Modified files:
        windows/mknetrel: split 
        windows        : GNUmakefile ChangeLog 
        linux/autopackage/specs/lilypond: lilypond.applications.in 
                                          default.apspec.in 
        linux/autopackage: GNUmakefile 
Added files:
        iso            : README.unix.in README.joliet.in README.hfs.in 
                         GNUmakefile 

Log message:
        

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/mknetrel/split.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/GNUmakefile.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/ChangeLog.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/lilypond/lilypond.applications.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/lilypond/default.apspec.in.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/GNUmakefile.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/iso/README.unix.in?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/iso/README.joliet.in?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/iso/README.hfs.in?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/iso/GNUmakefile?rev=1.1

Patches:
Index: installers/linux/autopackage/GNUmakefile
diff -u installers/linux/autopackage/GNUmakefile:1.14 
installers/linux/autopackage/GNUmakefile:1.15
--- installers/linux/autopackage/GNUmakefile:1.14       Tue Jul 19 12:51:24 2005
+++ installers/linux/autopackage/GNUmakefile    Sun Aug 14 07:49:59 2005
@@ -1,5 +1,6 @@
 
 ARCH = x86
+ASSUME_OLD = touch -d '1970-1-1 01:00:00' $@
 
 # 1.0.3 has a regression leading to 1.0.4; with sudo installs unasked in
 #       /usr, clobbering system packages.
Index: installers/linux/autopackage/specs/lilypond/default.apspec.in
diff -u installers/linux/autopackage/specs/lilypond/default.apspec.in:1.17 
installers/linux/autopackage/specs/lilypond/default.apspec.in:1.18
--- installers/linux/autopackage/specs/lilypond/default.apspec.in:1.17  Wed Jun 
15 14:59:17 2005
+++ installers/linux/autopackage/specs/lilypond/default.apspec.in       Sun Aug 
14 07:49:59 2005
@@ -27,7 +27,6 @@
 #etf2ly
 #lilypond-book
 #lilypond-invoke-editor
-#lilypond-pdfpc-helper
 #lilypond-ps2png
 #midi2ly
 #mup2ly
@@ -67,7 +66,6 @@
 etf2ly
 lilypond-book
 lilypond-invoke-editor
-lilypond-pdfpc-helper
 lilypond-ps2png
 midi2ly
 mup2ly
@@ -139,7 +137,6 @@
 etf2ly
 lilypond-book
 lilypond-invoke-editor
-lilypond-pdfpc-helper
 lilypond-ps2png
 midi2ly
 mup2ly
@@ -205,7 +202,7 @@
 #safeSed share/lilypond/@VERSION@/misc/lilypond.desktop 
"s!Exec=!Exec=$bin_dir/!"
 #copyFiles share/lilypond/@VERSION@/misc/lilypond.desktop 
"$PREFIX/share/applications"
 
-safeSed share/lilypond/@VERSION@/misc/examples.desktop 
"s!/usr/share/doc!$PREFIX/share/doc!"
+safeSed share/lilypond/@VERSION@/misc/examples.desktop 
"s!/usr/share/doc!file://$PREFIX/share/doc!"
 
 # FIXME: How to create a nice LilyPond submenu?
 installDesktop "Applications/Music/Notation/LilyPond" 
share/lilypond/@VERSION@/misc/lilypond.desktop
Index: installers/linux/autopackage/specs/lilypond/lilypond.applications.in
diff -u 
installers/linux/autopackage/specs/lilypond/lilypond.applications.in:1.3 
installers/linux/autopackage/specs/lilypond/lilypond.applications.in:1.4
--- installers/linux/autopackage/specs/lilypond/lilypond.applications.in:1.3    
Tue Jun  7 14:53:08 2005
+++ installers/linux/autopackage/specs/lilypond/lilypond.applications.in        
Sun Aug 14 07:49:59 2005
@@ -6,3 +6,17 @@
        requires_terminal=false
        supported_uri_schemes=file
        mime_types=text/x-lilypond
+examples
+       command=nautilus
+       name=LilyPond Examples
+       can_open_multiple_files=true
+       expects_uris=non-file
+       requires_terminal=false
+       supported_uri_schemes=file
+mutopia
+       command=firefox
+       name=Music in Mutopia
+       can_open_multiple_files=true
+       expects_uris=non-file
+       requires_terminal=false
+       supported_uri_schemes=http
Index: installers/windows/ChangeLog
diff -u installers/windows/ChangeLog:1.37 installers/windows/ChangeLog:1.38
--- installers/windows/ChangeLog:1.37   Mon Aug  1 20:43:47 2005
+++ installers/windows/ChangeLog        Sun Aug 14 07:49:59 2005
@@ -1,3 +1,10 @@
+2005-08-04  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+       * mknetrel/split (ldesc): Hint generate fixes.
+
+       * GNUmakefile (nsis-packages-upgrade): Add guile, libguile16.  We
+       want to pull in the --without-theads build.
+
 2005-08-01  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
 
        * GNUmakefile (nsis-packages-upgrade): Add lilypad.
Index: installers/windows/GNUmakefile
diff -u installers/windows/GNUmakefile:1.29 installers/windows/GNUmakefile:1.30
--- installers/windows/GNUmakefile:1.29 Mon Aug  1 20:43:47 2005
+++ installers/windows/GNUmakefile      Sun Aug 14 07:49:59 2005
@@ -8,7 +8,7 @@
 
 # Keeping lilypad and gs-ncsb in there, for first time upgraders
 #nsis-packages-upgrade = lilypond lilypad gs-ncsb guile libguile16
-nsis-packages-upgrade = lilypond lilypad
+nsis-packages-upgrade = lilypond lilypad guile libguile16
 
 packages =\
  mingw\
Index: installers/windows/mknetrel/split
diff -u installers/windows/mknetrel/split:1.6 
installers/windows/mknetrel/split:1.7
--- installers/windows/mknetrel/split:1.6       Sun May 29 09:44:38 2005
+++ installers/windows/mknetrel/split   Sun Aug 14 07:49:59 2005
@@ -124,8 +124,8 @@
        cp $shint $hint
     else
        cat > $hint <<EOF
-sdesc: "$subname"
-ldesc: "$subname - no description (missing $package/$(dirname $shint) file)"
+sdesc: "$name"
+ldesc: "$name - no description (missing $package/$(basename $shint) file)"
 EOF
     fi
     grep ^requires: $hint || echo "requires: $depends" >> $hint
@@ -174,6 +174,7 @@
     echo creating $tarstem.tar.bz2
     cd $inst || exit 1
 
+    name=$base
     shint=$src/$cygwin/setup.hint
     hint=$uploads/setup.hint
     hint
@@ -189,6 +190,7 @@
        depends=$(eval echo '$'${i}_depends)
        mkdir -p $subload || exit 1
        echo creating $subtarstem.tar.bz2
+       name=$subname
        hint
        grep ^external-source: $hint || echo "external-source: $base" >> $hint
        cd $inst-$i


_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to