From: Don Armstrong Date: Tue, 11 Sep 2012 22:30:13 +0000 (-0700) Subject: remove useless cruft in the debian directory X-Git-Tag: debian/2.16.0-1_exp+1~30 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d5dabca4a816f5c9d0d26bf8c1e7ff48d35e1e47;p=lilypond.git remove useless cruft in the debian directory --- diff --git a/debian/gui-2.6.patch b/debian/gui-2.6.patch deleted file mode 100644 index e30b1b4521..0000000000 --- a/debian/gui-2.6.patch +++ /dev/null @@ -1,110 +0,0 @@ -Index: ChangeLog -=================================================================== -RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v -retrieving revision 1.3836.2.42 -diff -p -u -r1.3836.2.42 ChangeLog ---- ChangeLog 23 Oct 2005 15:58:39 -0000 1.3836.2.42 -+++ ChangeLog 23 Oct 2005 19:03:38 -0000 -@@ -1,3 +1,8 @@ -+2005-10-23 Jan Nieuwenhuizen -+ -+ * scm/lily.scm: Remove horrendous running-from-gui? kludge. -+ (lilypond-main): Redirect to gui-main if 'gui is set. -+ - 2005-10-23 Erik Sandberg - - * scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson. -Index: lily/lily-parser-scheme.cc -=================================================================== -RCS file: /cvsroot/lilypond/lilypond/lily/lily-parser-scheme.cc,v -retrieving revision 1.16 -diff -p -u -r1.16 lily-parser-scheme.cc ---- lily/lily-parser-scheme.cc 22 Jun 2005 15:06:05 -0000 1.16 -+++ lily/lily-parser-scheme.cc 23 Oct 2005 19:02:10 -0000 -@@ -8,15 +8,16 @@ - - #include - -+#include "file-name-map.hh" - #include "file-name.hh" - #include "file-path.hh" --#include "main.hh" --#include "lily-parser.hh" --#include "warn.hh" --#include "source.hh" - #include "lily-lexer.hh" -+#include "lily-parser.hh" - #include "ly-module.hh" --#include "file-name-map.hh" -+#include "main.hh" -+#include "program-option.hh" -+#include "source.hh" -+#include "warn.hh" - - /* Do not append `!' suffix, since 1st argument is not modified. */ - LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click", -@@ -52,7 +53,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file - - /* When running from gui, generate output in .ly source directory. */ - if (output_name_global.is_empty () -- && scm_call_0 (ly_lily_module_constant ("running-from-gui?")) == SCM_BOOL_T) -+ && ly_get_option (ly_symbol2scm ("gui")) == SCM_BOOL_T) - { - File_name f (file); - f.base_ = ""; -Index: scm/lily.scm -=================================================================== -RCS file: /cvsroot/lilypond/lilypond/scm/lily.scm,v -retrieving revision 1.367.2.3 -diff -p -u -r1.367.2.3 lily.scm ---- scm/lily.scm 1 Aug 2005 15:14:46 -0000 1.367.2.3 -+++ scm/lily.scm 23 Oct 2005 19:02:10 -0000 -@@ -348,6 +348,9 @@ The syntax is the same as `define*-publi - (define-public (lilypond-main files) - "Entry point for LilyPond." - -+ (if (ly:get-option 'gui) -+ (gui-main files)) -+ - (if (null? files) - (no-files-handler)) - -@@ -385,29 +388,12 @@ The syntax is the same as `define*-publi - - (use-modules (scm editor)) - --(define-public (running-from-gui?) -- (let ((have-tty? (isatty? (current-input-port)))) -- ;; If no TTY and not using safe, assume running from GUI. -- (cond -- ((eq? PLATFORM 'windows) -- ;; Always write to .log file. -- (if DOS #t -- ;; This only works for i586-mingw32msvc-gcc -mwindows -- (not (string-match "standard input" -- (format #f "~S" (current-input-port)))))) -- ;; FIXME: using -dgui would be nice, but it does not work -- ((eq? PLATFORM 'foo-windows) -- (ly:get-option 'gui)) -- ((eq? PLATFORM 'darwin) #f) -- (else -- (not have-tty?))))) -- - (define-public (gui-main files) - (if (null? files) - (gui-no-files-handler)) - (let* ((base (basename (car files) ".ly")) - (log-name (string-append base ".log"))) -- (if (not (running-from-gui?)) -+ (if (not (ly:get-option 'gui)) - (ly:message (_ "Redirecting output to ~a...") log-name)) - (ly:stderr-redirect log-name "w") - (ly:message "# -*-compilation-*-") -@@ -430,7 +416,3 @@ The syntax is the same as `define*-publi - (ly:message (_ "Invoking `~a'...") cmd) - (system cmd) - (exit 1))) -- --(or (not (running-from-gui?)) -- (ly:get-option 'safe) -- (define lilypond-main gui-main)) diff --git a/debian/python-2.6.patch b/debian/python-2.6.patch deleted file mode 100644 index c91488323b..0000000000 --- a/debian/python-2.6.patch +++ /dev/null @@ -1,96 +0,0 @@ -Index: ChangeLog -=================================================================== -RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v -retrieving revision 1.3836.2.43 -diff -p -u -r1.3836.2.43 ChangeLog ---- ChangeLog 23 Oct 2005 19:04:01 -0000 1.3836.2.43 -+++ ChangeLog 23 Oct 2005 19:15:00 -0000 -@@ -3,6 +3,16 @@ - * scm/lily.scm: Remove horrendous running-from-gui? kludge. - (lilypond-main): Redirect to gui-main if 'gui is set. - -+ * scripts/midi2ly.py (datadir): Add libdir iso datadir to path, -+ for alternative installations kludging s/share/lib/g -+ LILYPONDPREFIX. -+ -+ * SConstruct (libdir_package_version): Define. -+ -+ * python/SConscript: -+ * python/GNUmakefile (INSTALLATION_OUT_DIR): Install binary .so -+ module in libdir. -+ - 2005-10-23 Erik Sandberg - - * scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson. -Index: SConstruct -=================================================================== -RCS file: /cvsroot/lilypond/lilypond/SConstruct,v -retrieving revision 1.79 -diff -p -u -r1.79 SConstruct ---- SConstruct 21 Apr 2005 14:28:31 -0000 1.79 -+++ SConstruct 23 Oct 2005 19:15:00 -0000 -@@ -248,6 +248,8 @@ prefix = env['prefix'] - bindir = os.path.join (prefix, 'bin') - sharedir = os.path.join (prefix, 'share') - libdir = os.path.join (prefix, 'lib') -+libdir_package = os.path.join (libdir, package.name) -+lidbir_package_version = os.path.join (libdir_package, version) - localedir = os.path.join (sharedir, 'locale') - sharedir_doc_package = os.path.join (sharedir, 'doc', package.name) - sharedir_package = os.path.join (sharedir, package.name) -Index: python/GNUmakefile -=================================================================== -RCS file: /cvsroot/lilypond/lilypond/python/GNUmakefile,v -retrieving revision 1.8 -diff -p -u -r1.8 GNUmakefile ---- python/GNUmakefile 16 Jun 2005 11:54:02 -0000 1.8 -+++ python/GNUmakefile 23 Oct 2005 19:15:00 -0000 -@@ -10,7 +10,7 @@ USER_LDFLAGS= - INSTALLATION_OUT_SUFFIXES=1 - - INSTALLATION_OUT_FILES=$(OUT_SO_MODULES) --INSTALLATION_OUT_DIR=$(local_lilypond_datadir)/python -+INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python - - INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python - INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES) -Index: python/SConscript -=================================================================== -RCS file: /cvsroot/lilypond/lilypond/python/SConscript,v -retrieving revision 1.2 -diff -p -u -r1.2 SConscript ---- python/SConscript 18 Apr 2005 13:35:13 -0000 1.2 -+++ python/SConscript 23 Oct 2005 19:15:00 -0000 -@@ -11,3 +11,4 @@ pym - cm - - install (cm + pym, env['sharedir_package_version'] + '/python') -+install (cm, env['libdir_package_version'] + '/python') -Index: scripts/midi2ly.py -=================================================================== -RCS file: /cvsroot/lilypond/lilypond/scripts/midi2ly.py,v -retrieving revision 1.33 -diff -p -u -r1.33 midi2ly.py ---- scripts/midi2ly.py 6 Jun 2005 14:27:42 -0000 1.33 -+++ scripts/midi2ly.py 23 Oct 2005 19:15:00 -0000 -@@ -30,12 +30,18 @@ import sys - ################################################################ - # Users of python modules should include this snippet. - # --# This soon to be removed for: import lilypond.lilylib as ly - libdir = '@local_lilypond_libdir@' - if not os.path.isdir (libdir): - libdir = '@lilypond_libdir@' --sys.path.insert (0, os.path.join (libdir, 'python')) - -+# ugh -+if os.environ.has_key ('LILYPONDPREFIX'): -+ datadir = os.environ['LILYPONDPREFIX'] -+ while datadir[-1] == os.sep: -+ datadir= datadir[:-1] -+ libdir = datadir.replace ('/share/', '/lib/') -+ -+sys.path.insert (0, os.path.join (libdir, 'python')) - - ################################################################ - diff --git a/debian/sakura-sakura.ly b/debian/sakura-sakura.ly deleted file mode 100644 index a604e3d0b6..0000000000 --- a/debian/sakura-sakura.ly +++ /dev/null @@ -1,55 +0,0 @@ -% -% sakura-sakura.ly -% - -\version "2.2.4" - -\header { - title = "さくら さくら (Sakura, sakura)" - composer = "" - copyright = "" - footer = "" - tagline = "" - latexpackages = "[encapsulated]CJK,[cjkjis]ucs" - inputencoding = "utf8" - fontencoding = "C42,OT1" - atbegindocument = "\fontfamily{min}" -} - -melody = \notes \relative c'' { - a4 a b2 | a4 a b2 | - a4 b c b | a4 b8[ a] f2 | - e4 c e f | e4 e8[ c] b2 | - a'4 b c b | a4 b8[ a] f2 | - e4 c e f | e4 e8[ c] b2 | - a'4 a b2 | a4 a b2 | - d,4 e b'8[ a] f4 | e1 \bar "|." -} - -text = \lyrics { - さ く ら さ く ら - の や ま も さ と も - み わ た す か ぎ り - か す み か く も か - あ さ ひ に に を う - さ く ら さ く ら - は な ざ か り -} - -\score { - << - \context Voice = one { - \set Staff.autoBeaming = ##f - \override Score.LyricText #'extra-offset = #'(1 . 0) - \melody - } - \lyricsto "one" \new Lyrics \text - >> - \paper { } -} - -% Local Variables: -% coding: utf-8 -% End: - -% EOF diff --git a/debian/xiao-haizi-guai-guai.ly b/debian/xiao-haizi-guai-guai.ly deleted file mode 100644 index ac50d6b942..0000000000 --- a/debian/xiao-haizi-guai-guai.ly +++ /dev/null @@ -1,57 +0,0 @@ -% -% xiao-haizi-guai-guai.ly -% - -\version "2.2.4" - -\header { - title = "小孩子乖乖 (\Xiao3 \hai2\zi5 \guai1\guai1)" - composer = "" - copyright = "" - footer = "" - tagline = "" - latexpackages = "[encapsulated]CJK,pinyin,[cjkbg5]ucs" - inputencoding = "utf8" - fontencoding = "C00,OT1" - atbegindocument = "\fontfamily{bsmi}" -} - -melody = \notes \relative c'' { - g4 c8 a g4 g | - e4 g8 a g4 g | - a4 g8 e d4 d | - e4 g8[ e] d[ e] c4 | - - a'8 g a g e a g4 | - e8 g e d c4 r | - a8 c d e c4 r \bar "|." -} - -text = \lyrics { - 小 孩 子 乖 乖 - 把 門 兒 開 開 - 快 點 兒 開 開 - 我 要 進 來 - - 不 開 不 開 不 能 開 - 你 是 大 野 狼 - 不 讓 你 進 來 -} - -\score { - << - \context Voice = one { - \set Staff.autoBeaming = ##f - \override Score.LyricText #'extra-offset = #'(1 . 0) - \melody - } - \lyricsto "one" \new Lyrics \text - >> - \paper { } -} - -% Local Variables: -% coding: utf-8 -% End: - -% EOF