v5 v6: param, metadata add 'Copyright:' tag to output related to copyright

* (Closes: #744381) syntax: inconsistency \:copyright: and \:license:

5 files changed, 17 insertions, 3 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 7c079186..7447e4fc 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -46,6 +46,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz
 * composite (inserts), missing includes doesn't give an error, fix
   (Closes: #744379) see sisu.org for comment
 
+* param, metadata add 'Copyright:' tag to output related to copyright
+  (Closes: #744381) syntax: inconsistency \:copyright: and \:license:
+
 * metadata, pdf, remove link to manifest page where --no-manifest is used
   (Closes: #744378)
 
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 4c2bf375..3def58df 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -36,6 +36,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz
 * composite (inserts), missing includes doesn't give an error, fix
   (Closes: #744379) see sisu.org for comment
 
+* param, metadata add 'Copyright:' tag to output related to copyright
+  (Closes: #744381) syntax: inconsistency \:copyright: and \:license:
+
 * metadata, pdf, remove link to manifest page where --no-manifest is used
   (Closes: #744378)
 
diff --git a/lib/sisu/v5/param.rb b/lib/sisu/v5/param.rb
index ba75bfb0..1167d5ee 100644
--- a/lib/sisu/v5/param.rb
+++ b/lib/sisu/v5/param.rb
@@ -568,7 +568,7 @@ module SiSU_Param
             and copyright.text \
             and not copyright.text.empty?
               v=sep(copyright.text)
-              s +=copyright.text + v
+              s +='Copyright: ' + copyright.text + v
             end
             if defined? copyright.translation \
             and copyright.translation \
diff --git a/lib/sisu/v6/param.rb b/lib/sisu/v6/param.rb
index 9d310f7c..7cbb6ba7 100644
--- a/lib/sisu/v6/param.rb
+++ b/lib/sisu/v6/param.rb
@@ -568,7 +568,7 @@ module SiSU_Param
             and copyright.text \
             and not copyright.text.empty?
               v=sep(copyright.text)
-              s +=copyright.text + v
+              s +='Copyright: ' + copyright.text + v
             end
             if defined? copyright.translation \
             and copyright.translation \
diff --git a/sisu.org b/sisu.org
index 63b82949..2c6795f4 100644
--- a/sisu.org
+++ b/sisu.org
@@ -1390,7 +1390,7 @@ the following is written within the text output:
 
 "<< foo.ssi [ERROR test.ssm requires an invalid or non-existent file: foo.ssi]"
 
-**** TODO [#D] #744381 [w|u] sisu syntax: inconsistency \:copyright: and \:license:
+**** DONE (5.3.5::6.0.5) [#D] #744381 [w|u] sisu syntax: inconsistency \:copyright: and \:license: :metadata:
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744381https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744381>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -1411,6 +1411,14 @@ or neither should have one (i'd prefere the latter).
 Regards,
 Daniel
 
+***** NOTES/COMMENTS
+
+Under rights there are a series of sub-categories starting with copyright, that
+need to be distinguished. Until now started distinguishing after after
+Copyright. For consistency have add the prefix 'Copyright' to the output.
+Preference to omit noted, but this solution is consistent with options
+provided. Bug closed, re-open if necessary.
+
 **** TODO [#B] #744383 [w|u] sisu syntax: :B and :C result in the same formatting
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744383>