summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2015-04-25 18:20:27 +0000
committerRalph Amissah <ralph@amissah.com>2015-04-25 18:20:27 +0000
commitf98fa23c828380698008b542cd6abf20774a48b0 (patch)
treeaa61abc3e6c87c1b0f128959b38049e275aafd37 /debian
parentdebian/copyright date (diff)
downloadsisu-f98fa23c828380698008b542cd6abf20774a48b0.zip
sisu-f98fa23c828380698008b542cd6abf20774a48b0.tar.xz
remove debian/patches prepared during Debian Jessie freeze
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/jessie_bugfix_76776182
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 83 deletions
diff --git a/debian/patches/jessie_bugfix_767761 b/debian/patches/jessie_bugfix_767761
deleted file mode 100644
index 846320d..0000000
--- a/debian/patches/jessie_bugfix_767761
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
index 994af2e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-jessie_bugfix_767761