From b6e6eb5c7d9e3e56eb05b50830a15973356c92a6 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 2 Nov 2014 19:34:34 -0500 Subject: v5 v6: version & changelog (Frozen: bugfix & documentation changes only) * NOTE: sisu is in development freeze mirroring the Debian release cycle; bugfix & documentation update only, pending the release of Debian Jessie * (as sisu upstream) the cleanest git workflow solution to the Debian freeze appears to be to follow the Debian freeze with respect to upstream alterations of sisu (bugfix & documentation only), incrementing upstream version number as usual, whilst building package as required for Debian freeze version of sisu 5.7.1-* --- data/doc/sisu/CHANGELOG_v5 | 11 +++++++++++ data/doc/sisu/CHANGELOG_v6 | 11 +++++++++++ data/sisu/v5/v/version.yml | 6 +++--- data/sisu/v6/v/version.yml | 6 +++--- setup/sisu_version.rb | 4 ++-- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index dba95639..d805b7c4 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -31,6 +31,17 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +--- SiSU "UnFrozen" --- Debian Freeze over - ^^ post Jessie ^^ + +%% 5.7.2.orig.tar.xz (2014-11-02:43/7) +http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.7.2 +http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.7.2-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.2.orig.tar.xz + sisu_5.7.2.orig.tar.xz + sisu_5.7.2-1.dsc + +--- SiSU Frozen --- Debian Freeze - ^^ pre Jessie ^^ + %% 5.7.1.orig.tar.xz (2014-10-19:41/7) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.7.1 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.7.1-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 3dfdc850..00c1249d 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -21,6 +21,17 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +--- SiSU "UnFrozen" --- Debian Freeze over - ^^ post Jessie ^^ + +%% 6.3.2.orig.tar.xz (2014-11-02:43/7) +http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.3.2 +http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.3.2-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_6.3.2.orig.tar.xz + sisu_6.3.2.orig.tar.xz + sisu_6.3.2-1.dsc + +--- SiSU Frozen --- Debian Freeze - ^^ pre Jessie ^^ + %% 6.3.1.orig.tar.xz (2014-10-19:41/7) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.3.1 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.3.1-1 diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index 225033c4..5904ee86 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 5.7.1 -:date_stamp: 2014w41/7 -:date: "2014-10-19" +:version: 5.7.2 +:date_stamp: 2014w43/7 +:date: "2014-11-02" diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml index 33916d04..a2c374ca 100644 --- a/data/sisu/v6/v/version.yml +++ b/data/sisu/v6/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 6.3.1 -:date_stamp: 2014w41/7 -:date: "2014-10-19" +:version: 6.3.2 +:date_stamp: 2014w43/7 +:date: "2014-11-02" diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb index bc90bc71..2d777c03 100644 --- a/setup/sisu_version.rb +++ b/setup/sisu_version.rb @@ -1,7 +1,7 @@ #% constants module SiSUversion - SiSU_version_next_stable = '5.7.1' #% set version stable current - SiSU_version_next_unstable = '6.3.1' #% set version unstable dev + SiSU_version_next_stable = '5.7.2' #% set version stable current + SiSU_version_next_unstable = '6.3.2' #% 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 e206fef8ba35e5061c7da11b1a294d9897de22e9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 2 Nov 2014 19:37:45 -0500 Subject: v5 v6: ao, composite documents, on --verbose report loading of .sst files, fix * without fix sisu reports loading of .ssm & .ssi files but not .sst (sub-documents are imported correctly and resulting document outputs are correct and unaffected, but unless aware of this bug it would seem otherwise until the correct operation of sisu was manually verified e.g. by examining documents produced); (issue somewhat mitigated by not being the most common sisu operation) * sisu is in development freeze, this fix is provided for Debian Jessie (Closes: #767761) --- data/doc/sisu/CHANGELOG_v5 | 10 ++++++++++ data/doc/sisu/CHANGELOG_v6 | 10 ++++++++++ lib/sisu/v5/ao_composite.rb | 16 +++++++++------- lib/sisu/v6/ao_composite.rb | 16 +++++++++------- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index d805b7c4..54a28ae0 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -40,6 +40,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.2.orig.tar.xz sisu_5.7.2.orig.tar.xz sisu_5.7.2-1.dsc +* ao, composite documents, --verbose report to terminal on loading of *.sst, fix + without fix sisu reports loading of .ssm & .ssi files but not .sst + (sub-documents are imported correctly and resulting document outputs are + correct and unaffected, but unless aware of this bug it would seem otherwise + until the correct operation of sisu was manually verified e.g. by examining + documents produced); (issue somewhat mitigated by not being the most common + sisu operation) + sisu is in development freeze, this fix is provided for Debian Jessie + (Closes: #767761) + --- SiSU Frozen --- Debian Freeze - ^^ pre Jessie ^^ %% 5.7.1.orig.tar.xz (2014-10-19:41/7) diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 00c1249d..c42e087c 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -30,6 +30,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.3.2.orig.tar.xz sisu_6.3.2.orig.tar.xz sisu_6.3.2-1.dsc +* ao, composite documents, --verbose report to terminal on loading of *.sst, fix + without fix sisu reports loading of .ssm & .ssi files but not .sst + (sub-documents are imported correctly and resulting document outputs are + correct and unaffected, but unless aware of this bug it would seem otherwise + until the correct operation of sisu was manually verified e.g. by examining + documents produced); (issue somewhat mitigated by not being the most common + sisu operation) + sisu is in development freeze, this fix is provided for Debian Jessie + (Closes: #767761) + --- SiSU Frozen --- Debian Freeze - ^^ pre Jessie ^^ %% 6.3.1.orig.tar.xz (2014-10-19:41/7) diff --git a/lib/sisu/v5/ao_composite.rb b/lib/sisu/v5/ao_composite.rb index a81e3003..c570d05f 100644 --- a/lib/sisu/v5/ao_composite.rb +++ b/lib/sisu/v5/ao_composite.rb @@ -133,7 +133,7 @@ module SiSU_Assemble begin if FileTest.file?(loadfilename) insert_array=IO.readlines(loadfilename,'') - if loadfilename =~/\S+?\.ss[im]$/ + if loadfilename =~/\S+?\.ss[itm]$/ if (@opt.act[:verbose][:set]==:on \ || @opt.act[:verbose_plus][:set]==:on \ || @opt.act[:maintenance][:set]==:on) @@ -143,12 +143,14 @@ module SiSU_Assemble loadfilename, ).txt_grey end - insert_array.each do |para| - tuned_file << insert?(para) - end - elsif loadfilename =~/\S+?\.sst$/ - insert_array.each do |para| - tuned_file << para + if loadfilename =~/\S+?\.ss[im]$/ + insert_array.each do |para| + tuned_file << insert?(para) + end + elsif loadfilename =~/\S+?\.sst$/ + insert_array.each do |para| + tuned_file << para + end end end end diff --git a/lib/sisu/v6/ao_composite.rb b/lib/sisu/v6/ao_composite.rb index 64c6c11f..1cf7b45d 100644 --- a/lib/sisu/v6/ao_composite.rb +++ b/lib/sisu/v6/ao_composite.rb @@ -133,7 +133,7 @@ module SiSU_Assemble begin if FileTest.file?(loadfilename) insert_array=IO.readlines(loadfilename,'') - if loadfilename =~/\S+?\.ss[im]$/ + if loadfilename =~/\S+?\.ss[itm]$/ if (@opt.act[:verbose][:set]==:on \ || @opt.act[:verbose_plus][:set]==:on \ || @opt.act[:maintenance][:set]==:on) @@ -143,12 +143,14 @@ module SiSU_Assemble loadfilename, ).txt_grey end - insert_array.each do |para| - tuned_file << insert?(para) - end - elsif loadfilename =~/\S+?\.sst$/ - insert_array.each do |para| - tuned_file << para + if loadfilename =~/\S+?\.ss[im]$/ + insert_array.each do |para| + tuned_file << insert?(para) + end + elsif loadfilename =~/\S+?\.sst$/ + insert_array.each do |para| + tuned_file << para + end end end end -- cgit v1.2.3