From 624f72b8b200bba4ab06ecbceb362838d1c8151f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 26 Apr 2011 20:30:55 -0400 Subject: v2 v3: sysenv, refer to lowriter, update * v2 lowriter instead of oowriter * v3 lowriter instead of libreoffice --- data/doc/sisu/CHANGELOG_v2 | 2 ++ data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v2/sysenv.rb | 2 +- lib/sisu/v3/sysenv.rb | 6 +++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 0002cdf3..880e35af 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -18,6 +18,8 @@ http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.8-1 * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet * improved ruby version check + * sysenv, lowriter (instead of oowriter) + %% 2.9.2.orig.tar.gz (2011-04-20:16/3) [see 3.0.7] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.7-1 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 29de6ddd..41c7619c 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -23,6 +23,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet * improved ruby version check + * sysenv, lowriter (instead of libreoffice) + %% 3.0.7.orig.tar.gz (2011-04-20:16/3) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.7-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 72b1ffc7..d3152947 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -1983,7 +1983,7 @@ WOK ((defined? @rc['program_select']['odf_viewer']) \ && @rc['program_select']['odf_viewer'] =~/\S\S+/) \ ? @rc['program_select']['odf_viewer'] \ - : 'oowriter' #'odf-viewer','oowriter' + : 'lowriter' #'odf-viewer','oowriter' end def manpage_viewer 'man' diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index 6f69296a..1b621c61 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -2091,7 +2091,7 @@ WOK elsif defined? @rc['program_select']['console_web_browser'] \ and @rc['program_select']['console_web_browser'] =~/\S\S+/ @rc['program_select']['console_web_browser'] - else 'console-www-browser' #'lynx' 'links2' 'elinks' 'epiphany' + else 'console-www-browser' #'lynx' 'links' 'links2' 'elinks' 'w3m' end end def console_www_browser @@ -2104,7 +2104,7 @@ WOK elsif defined? @rc['program_select']['epub_viewer'] \ and @rc['program_select']['epub_viewer'] =~/\S\S+/ @rc['program_select']['epub_viewer'] - else 'ebook-viewer' #'calibre' 'fbreader' + else 'ebook-viewer' #'calibre' 'fbreader' end end def xml_viewer @@ -2120,7 +2120,7 @@ WOK ((defined? @rc['program_select']['odf_viewer']) \ && @rc['program_select']['odf_viewer'] =~/\S\S+/) \ ? @rc['program_select']['odf_viewer'] \ - : 'libreoffice' #'odf-viewer','oowriter' + : 'lowriter' #'odf-viewer','oowriter' end def manpage_viewer 'man' -- cgit v1.2.3