Merge tag 'sisu_6.5.0' into debian/sid

SiSU 6.5.0

1 files changed, 20 insertions, 20 deletions

diff --git a/lib/sisu/current/shared_metadata.rb b/lib/sisu/current/shared_metadata.rb
index 92d32dda..1aa0a728 100644
--- a/lib/sisu/current/shared_metadata.rb
+++ b/lib/sisu/current/shared_metadata.rb
@@ -280,13 +280,13 @@ module SiSU_Metadata
         @tag,@inf=%{<b><u>Generated</u></b>},''
         meta << self.meta_para
       end
-      if defined? @md.sisu_version \
-      and @md.sisu_version[:version]=~/\S+/
+      if defined? @md.project_details \
+      and @md.project_details.version=~/\S+/
         v="#{tr.sisu_version}: " +
-          "#{@md.sisu_version[:project]} " +
-          "#{@md.sisu_version[:version]} " +
-          "of #{@md.sisu_version[:date_stamp]} " +
-          "(#{@md.sisu_version[:date]})"
+          "#{@md.project_details.project} " +
+          "#{@md.project_details.version} " +
+          "of #{@md.project_details.date_stamp} " +
+          "(#{@md.project_details.date})"
         @tag,@inf,@class='Generated by',v,'ver'
         meta << self.meta_para
       end
@@ -461,7 +461,7 @@ module SiSU_Metadata
         def language
           if defined? @md.title.language \
           and @md.title.language
-            ' :language: ' + @md.title.language.join(', ')
+            ' :language: ' + @md.title.language
           else nil
           end
         end
@@ -674,13 +674,13 @@ module SiSU_Metadata
 #         end
           nil
         end
-        def identifier
-          if defined? @md.classify.identifier \
-          and @md.classify.identifier
-            ' :identifier: ' + @md.classify.identifier
-          else nil
-          end
-        end
+        #def identifier
+        #  if defined? @md.classify.identifier \
+        #  and @md.classify.identifier
+        #    ' :identifier: ' + @md.classify.identifier
+        #  else nil
+        #  end
+        #end
         def loc
           if defined? @md.classify.loc \
           and @md.classify.loc
@@ -1216,13 +1216,13 @@ WOK
         tag,inf=tr.last_generated,@md.generated
         meta << meta_para(tag,inf)
       end
-      if defined? @md.sisu_version \
-      and @md.sisu_version[:version]=~/\S+/
+      if defined? @md.project_details \
+      and @md.project_details.version=~/\S+/
         tag=tr.sisu_version
-        inf="#{@md.sisu_version[:project]} " +
-          "#{@md.sisu_version[:version]} " +
-          "of #{@md.sisu_version[:date_stamp]} " +
-          "(#{@md.sisu_version[:date]})"
+        inf="#{@md.project_details.project} " +
+          "#{@md.project_details.version} " +
+          "of #{@md.project_details.date_stamp} " +
+          "(#{@md.project_details.date})"
         meta << meta_para(tag,inf)
       end
       if defined? @md.ruby_version \