aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-11-02 22:04:10 -0500
committerRalph Amissah <ralph@amissah.com>2014-11-02 22:04:10 -0500
commit50c16e307e865717acf8e84d470086bd41fb244a (patch)
tree2fe3fb45333bf0162272414dacaa8ceeb514547d
parentdebian/changelog (5.7.1-2) (diff)
added patch jessie_bugfix_767761debian/sisu_5.7.1-2
-rw-r--r--debian/patches/jessie_bugfix_76776182
-rw-r--r--debian/patches/series1
2 files changed, 83 insertions, 0 deletions
diff --git a/debian/patches/jessie_bugfix_767761 b/debian/patches/jessie_bugfix_767761
new file mode 100644
index 00000000..846320d6
--- /dev/null
+++ b/debian/patches/jessie_bugfix_767761
@@ -0,0 +1,82 @@
+Description: bugfix 767761 for Jessie
+ .
+ sisu (5.7.1-2) unstable; urgency=medium
+ .
+ * [e206fef] 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)
+Author: Ralph Amissah <ralph@amissah.com>
+Bug-Debian: https://bugs.debian.org/767761
+Origin: upstream, http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=commitdiff;h=e206fef8ba35e5061c7da11b1a294d9897de22e9
+
+--- sisu-5.7.1.orig/lib/sisu/v5/ao_composite.rb
++++ sisu-5.7.1/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
+--- sisu-5.7.1.orig/lib/sisu/v6/ao_composite.rb
++++ sisu-5.7.1/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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..994af2e4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+jessie_bugfix_767761