Bug#768399: unblock: sisu/5.7.1-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package sisu
It includes 2 rather small but significant cleanup bug fixes made for
Jessie.
* bugreports:
#767761
* bug report & closure:
Subject: sisu: Irritating terminal reporting bug, re composite
documents & verbose mode
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767761
Reported by: Ralph Amissah <ralph.amissah@gmail.com>
Severity: normal
Tags: upstream
Found in version sisu/5.7.1-1
Fixed in version sisu/5.7.1-2
Done: Ralph Amissah <ralph@amissah.com>
#767776
* bug report & closure:
Subject: debian/changelog improvements (grammatical etc.) proposed
for Jessie
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767776
Reported by: Ralph Amissah <ralph.amissah@gmail.com>
Severity: minor
Found in version sisu/5.7.1-1
Fixed in version sisu/5.7.1-2
Done: Ralph Amissah <ralph@amissah.com>
* relevant debian/changelog entries:
#767761
* 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)
#767776
* debian/control sisu description, minor refinement
* (Closes: #767776)
full debian/changelog:
http://sources.debian.net/src/sisu/5.7.1-2/debian/changelog/
Note other upstream changes provided by 5.7.2 are not included in the
Debian package 5.7.1-2 as is shown by the attached debdiff
debdiff sisu_5.7.1-1.dsc sisu_5.7.1-2.dsc \
> sisu_5.7.1-2.dsc.diff
unblock sisu/5.7.1-2
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru sisu-5.7.1/debian/changelog sisu-5.7.1/debian/changelog
--- sisu-5.7.1/debian/changelog 2014-10-19 21:23:24.000000000 -0400
+++ sisu-5.7.1/debian/changelog 2014-11-02 22:04:10.000000000 -0500
@@ -1,3 +1,31 @@
+sisu (5.7.1-2) unstable; urgency=medium
+
+ * [b6e6eb5] 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-*
+ * [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)
+ * [a45079f] version & changelog (revert to 5.7.1 state, minimize 5.7.1-2 diff)
+ * [3ea8131] debian/control sisu description, minor refinement
+ * (Closes: #767776)
+ * [f3cd973] .gitignore ignore .pc quilt dir
+
+ -- Ralph Amissah <ralph@amissah.com> Sun, 02 Nov 2014 21:40:58 -0500
+
sisu (5.7.1-1) unstable; urgency=medium
[ Ralph Amissah ]
diff -Nru sisu-5.7.1/debian/control sisu-5.7.1/debian/control
--- sisu-5.7.1/debian/control 2014-10-19 21:23:24.000000000 -0400
+++ sisu-5.7.1/debian/control 2014-11-02 22:04:10.000000000 -0500
@@ -22,21 +22,22 @@
structuring, publishing and search framework for document collections.
.
With minimal preparation of a plain-text (UTF-8) file, using sisu markup
- syntax in your text editor of choice, SiSU can generate various document
+ syntax in a text editor of your choice, SiSU can generate various document
formats (most of which share a common object numbering system for locating
content), including plain text, HTML, XHTML, XML, EPUB, OpenDocument text
(ODF:ODT), LaTeX, PDF files, and populate an SQL database with objects
(roughly paragraph-sized chunks) so searches may be performed and matches
returned with that degree of granularity. Think being able to finely match
- text in documents across different output formats and across languages if you
- have translations of the same document, using common object numbers.
- Additionally for search, your criteria is met by these documents at these
- locations within each document (equally relevant across different output
- formats and languages). To be clear (if obvious) page numbers provide none of
- this functionality. Object numbering is particularly suitable for "published"
- works (finalized texts as opposed to works that are frequently changed or
- updated) for which it provides a fixed means of reference of content. Document
- outputs also share semantic meta-data provided.
+ text in documents, using object numbers, across different output formats and
+ across languages if you have translations of the same document. Search results
+ can be an index of documents and object numbers within them, your criteria is
+ met by these documents at these locations within each document (equally
+ relevant across different output formats and languages). To be clear (if
+ obvious) page numbers provide none of this functionality. Object numbering is
+ particularly suitable for "published" works (finalized texts as opposed to
+ works that are frequently changed or updated) for which it provides a fixed
+ means of reference of content. Document outputs can also share provided
+ semantic meta-data.
.
SiSU also provides concordance files, document content certificates and
manifests of generated output. SiSU provides the means to make book indexes
@@ -50,7 +51,7 @@
The package sisu-complete installs the whole of SiSU.
.
Additional document markup samples are provided in the package
- sisu-markup-samples which is found in the non-free archive the licenses for
+ sisu-markup-samples which is found in the non-free archive. The licenses for
the substantive content of the marked up documents provided is that provided
by the author or original publisher.
.
diff -Nru sisu-5.7.1/debian/patches/jessie_bugfix_767761 sisu-5.7.1/debian/patches/jessie_bugfix_767761
--- sisu-5.7.1/debian/patches/jessie_bugfix_767761 1969-12-31 19:00:00.000000000 -0500
+++ sisu-5.7.1/debian/patches/jessie_bugfix_767761 2014-11-02 22:04:10.000000000 -0500
@@ -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 -Nru sisu-5.7.1/debian/patches/series sisu-5.7.1/debian/patches/series
--- sisu-5.7.1/debian/patches/series 1969-12-31 19:00:00.000000000 -0500
+++ sisu-5.7.1/debian/patches/series 2014-11-02 22:04:10.000000000 -0500
@@ -0,0 +1 @@
+jessie_bugfix_767761
Reply to: