From 062ca5934f8d38c5efe600e146d26024810085bd Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 30 Aug 2014 14:47:41 -0400
Subject: v5 v6: version & changelog (& rakefile)
---
data/doc/sisu/CHANGELOG_v5 | 7 +++++++
data/doc/sisu/CHANGELOG_v6 | 7 +++++++
data/sisu/v5/v/version.yml | 6 +++---
data/sisu/v6/v/version.yml | 6 +++---
setup/sisu_version.rb | 4 ++--
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 93631a50..dd228b5f 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
+%% 5.6.4.orig.tar.xz (2014-08-30:34/6)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.4-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.4.orig.tar.xz
+ sisu_5.6.4.orig.tar.xz
+ sisu_5.6.4-1.dsc
+
%% 5.6.3.orig.tar.xz (2014-08-29:34/5)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.3
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.3-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 346332a5..496ebe42 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,6 +21,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
+%% 6.2.5.orig.tar.xz (2014-08-30:34/6)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.5
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.5-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.5.orig.tar.xz
+ sisu_6.2.5.orig.tar.xz
+ sisu_6.2.5-1.dsc
+
%% 6.2.4.orig.tar.xz (2014-08-29:34/5)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.4
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.4-1
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index fa57b9ab..edf95bcf 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
---
:project: SiSU
-:version: 5.6.3
-:date_stamp: 2014w34/5
-:date: "2014-08-29"
+:version: 5.6.4
+:date_stamp: 2014w34/6
+:date: "2014-08-30"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index b03690af..1d01007a 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
---
:project: SiSU
-:version: 6.2.4
-:date_stamp: 2014w34/5
-:date: "2014-08-29"
+:version: 6.2.5
+:date_stamp: 2014w34/6
+:date: "2014-08-30"
diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb
index 1cb8adb9..768eb7db 100644
--- a/setup/sisu_version.rb
+++ b/setup/sisu_version.rb
@@ -1,7 +1,7 @@
#% constants
module SiSUversion
- SiSU_version_next_stable = '5.6.3' #% set version stable current
- SiSU_version_next_unstable = '6.2.4' #% set version unstable dev
+ SiSU_version_next_stable = '5.6.4' #% set version stable current
+ SiSU_version_next_unstable = '6.2.5' #% set version unstable dev
#% qi quick install file
SiSU_version_generic_next_stable = '5.4.x'
SiSU_version_generic_next_unstable = '6.0.x'
--
cgit v1.2.3
From 81c7c3ff5b33e3b57d91acc3eb6c2739e0008e17 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 1 Sep 2014 23:11:39 -0400
Subject: v5 v6: cgi_sqlite, expansion of variable (default db name), double
quotes, fix
---
data/doc/sisu/CHANGELOG_v5 | 4 +++-
data/doc/sisu/CHANGELOG_v6 | 4 +++-
lib/sisu/v5/cgi_sqlite.rb | 2 +-
lib/sisu/v6/cgi_sqlite.rb | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index dd228b5f..474da965 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,13 +31,15 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
-%% 5.6.4.orig.tar.xz (2014-08-30:34/6)
+%% 5.6.4.orig.tar.xz (2014-09-01:35/1)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.4
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.4.orig.tar.xz
sisu_5.6.4.orig.tar.xz
sisu_5.6.4-1.dsc
+* cgi_sqlite, allow expansion of variable (default db name), double quotes, fix
+
%% 5.6.3.orig.tar.xz (2014-08-29:34/5)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.3
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.3-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 496ebe42..29136e1f 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,13 +21,15 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
-%% 6.2.5.orig.tar.xz (2014-08-30:34/6)
+%% 6.2.5.orig.tar.xz (2014-09-01:35/1)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.5
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.5.orig.tar.xz
sisu_6.2.5.orig.tar.xz
sisu_6.2.5-1.dsc
+* cgi_sqlite, allow expansion of variable (default db name), double quotes, fix
+
%% 6.2.4.orig.tar.xz (2014-08-29:34/5)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.4
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.4-1
diff --git a/lib/sisu/v5/cgi_sqlite.rb b/lib/sisu/v5/cgi_sqlite.rb
index 4644dbc0..9cd91676 100644
--- a/lib/sisu/v5/cgi_sqlite.rb
+++ b/lib/sisu/v5/cgi_sqlite.rb
@@ -112,7 +112,7 @@ module SiSU_CGI_SQLite #% database building doc
serve.each do |x|
f3 << %{ when /#{Db[:name_prefix]}#{x}/ then "#{@env.path.webserv}/#{x}/\#{db_name}"\n}
end
- f3 << %{ else '#{@env.path.webserv}/#{serve[0]}/\#{db_name}'\n end\n}
+ f3 << %{ else "#{@env.path.webserv}/#{serve[0]}/\#{db_name}"\n end\n}
if FileTest.writable?('.')
output=File.open(@cgi_file_name,'w')
output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << f3 << dbi_connect << @common.main2 << @common.dir_structure << @common.main3
diff --git a/lib/sisu/v6/cgi_sqlite.rb b/lib/sisu/v6/cgi_sqlite.rb
index 722d9033..8559b7a8 100644
--- a/lib/sisu/v6/cgi_sqlite.rb
+++ b/lib/sisu/v6/cgi_sqlite.rb
@@ -112,7 +112,7 @@ module SiSU_CGI_SQLite #% database building doc
serve.each do |x|
f3 << %{ when /#{Db[:name_prefix]}#{x}/ then "#{@env.path.webserv}/#{x}/\#{db_name}"\n}
end
- f3 << %{ else '#{@env.path.webserv}/#{serve[0]}/\#{db_name}'\n end\n}
+ f3 << %{ else "#{@env.path.webserv}/#{serve[0]}/\#{db_name}"\n end\n}
if FileTest.writable?('.')
output=File.open(@cgi_file_name,'w')
output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << f3 << dbi_connect << @common.main2 << @common.dir_structure << @common.main3
--
cgit v1.2.3
From 48ed4030f41a9cc1c5534373dd7870eb6c93c726 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 1 Sep 2014 23:15:14 -0400
Subject: v5 v6: misc, for when external dependencies unmet
---
lib/sisu/v5/html_tune.rb | 3 +--
lib/sisu/v5/manifest.rb | 1 +
lib/sisu/v5/qrcode.rb | 1 +
lib/sisu/v5/se_info_env.rb | 2 +-
lib/sisu/v6/html_tune.rb | 3 +--
lib/sisu/v6/manifest.rb | 1 +
lib/sisu/v6/qrcode.rb | 1 +
lib/sisu/v6/se_info_env.rb | 2 +-
8 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/v5/html_tune.rb
index 3e8c2d68..1ccd3cf2 100644
--- a/lib/sisu/v5/html_tune.rb
+++ b/lib/sisu/v5/html_tune.rb
@@ -129,9 +129,8 @@ module SiSU_HTML_Tune
def initialize(data,md)
@data,@md=data,md
@vz=SiSU_Viz::Defaults.new
- @env=SiSU_Env::InfoEnv.new(@md.fns)
@sys=SiSU_Env::SystemCall.new
- @env=SiSU_Env::InfoEnv.new(@md.fns)
+ @env=SiSU_Env::InfoEnv.new(@md.fns,@md)
@brace_url=SiSU_Viz::Defaults.new.url_decoration
end
def songsheet
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index 0b4f79a4..f19f8b38 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -189,6 +189,7 @@ module SiSU_Manifest
sys.md5("#{pth}/#{file}")
else
end
+ dgst=dgst ? dgst : [ '', 'n/a' ]
if (@md.opt.act[:verbose][:set]==:on \
|| @md.opt.act[:verbose_plus][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
diff --git a/lib/sisu/v5/qrcode.rb b/lib/sisu/v5/qrcode.rb
index 3a7d9406..448de004 100644
--- a/lib/sisu/v5/qrcode.rb
+++ b/lib/sisu/v5/qrcode.rb
@@ -189,6 +189,7 @@ WOK
else
(sys.sha256("#{pth}/#{file}"))
end
+ dgst=dgst ? dgst : [ '', 'n/a' ]
if (@md.opt.act[:verbose][:set]==:on \
|| @md.opt.act[:verbose_plus][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
diff --git a/lib/sisu/v5/se_info_env.rb b/lib/sisu/v5/se_info_env.rb
index 777644d7..c460195c 100644
--- a/lib/sisu/v5/se_info_env.rb
+++ b/lib/sisu/v5/se_info_env.rb
@@ -1785,7 +1785,7 @@ WOK
path.image_source_include
else
if @@local_image==true
- cmd=@selections.str ? @selections.str : ''
+ cmd=@md.opt.selections.str ? @md.opt.selections.str : ''
SiSU_Screen::Ansi.new(
cmd,
"WARNING - no local image directory or images:",
diff --git a/lib/sisu/v6/html_tune.rb b/lib/sisu/v6/html_tune.rb
index d9245a30..10b5b964 100644
--- a/lib/sisu/v6/html_tune.rb
+++ b/lib/sisu/v6/html_tune.rb
@@ -129,9 +129,8 @@ module SiSU_HTML_Tune
def initialize(data,md)
@data,@md=data,md
@vz=SiSU_Viz::Defaults.new
- @env=SiSU_Env::InfoEnv.new(@md.fns)
@sys=SiSU_Env::SystemCall.new
- @env=SiSU_Env::InfoEnv.new(@md.fns)
+ @env=SiSU_Env::InfoEnv.new(@md.fns,@md)
@brace_url=SiSU_Viz::Defaults.new.url_decoration
end
def songsheet
diff --git a/lib/sisu/v6/manifest.rb b/lib/sisu/v6/manifest.rb
index 6f22eefb..a0d4102f 100644
--- a/lib/sisu/v6/manifest.rb
+++ b/lib/sisu/v6/manifest.rb
@@ -189,6 +189,7 @@ module SiSU_Manifest
sys.md5("#{pth}/#{file}")
else
end
+ dgst=dgst ? dgst : [ '', 'n/a' ]
if (@md.opt.act[:verbose][:set]==:on \
|| @md.opt.act[:verbose_plus][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
diff --git a/lib/sisu/v6/qrcode.rb b/lib/sisu/v6/qrcode.rb
index aa31236c..4c752963 100644
--- a/lib/sisu/v6/qrcode.rb
+++ b/lib/sisu/v6/qrcode.rb
@@ -189,6 +189,7 @@ WOK
else
(sys.sha256("#{pth}/#{file}"))
end
+ dgst=dgst ? dgst : [ '', 'n/a' ]
if (@md.opt.act[:verbose][:set]==:on \
|| @md.opt.act[:verbose_plus][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
diff --git a/lib/sisu/v6/se_info_env.rb b/lib/sisu/v6/se_info_env.rb
index abd46542..76e0d17d 100644
--- a/lib/sisu/v6/se_info_env.rb
+++ b/lib/sisu/v6/se_info_env.rb
@@ -1785,7 +1785,7 @@ WOK
path.image_source_include
else
if @@local_image==true
- cmd=@selections.str ? @selections.str : ''
+ cmd=@md.opt.selections.str ? @md.opt.selections.str : ''
SiSU_Screen::Ansi.new(
cmd,
"WARNING - no local image directory or images:",
--
cgit v1.2.3
From c7da8f76d5ae681d2b4121c7ef1eff6e488c51bf Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 1 Sep 2014 23:17:22 -0400
Subject: v5 v6: version, touch date
---
data/sisu/v5/v/version.yml | 4 ++--
data/sisu/v6/v/version.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index edf95bcf..2f531540 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
---
:project: SiSU
:version: 5.6.4
-:date_stamp: 2014w34/6
-:date: "2014-08-30"
+:date_stamp: 2014w35/1
+:date: "2014-09-01"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index 1d01007a..0239fe45 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
---
:project: SiSU
:version: 6.2.5
-:date_stamp: 2014w34/6
-:date: "2014-08-30"
+:date_stamp: 2014w35/1
+:date: "2014-09-01"
--
cgit v1.2.3