Merge tag 'sisu_5.8.0' into debian/sid

SiSU 5.8.0

Conflicts:
	.gitignore
	data/doc/sisu/CHANGELOG_v5
	data/doc/sisu/CHANGELOG_v6
	data/sisu/v5/v/version.yml
	data/sisu/v6/v/version.yml
	setup/sisu_version.rb

1 files changed, 19 insertions, 14 deletions

diff --git a/setup/rbuild_libs.rb b/setup/rbuild_libs.rb
index 8389c836..5345631b 100644
--- a/setup/rbuild_libs.rb
+++ b/setup/rbuild_libs.rb
@@ -137,14 +137,14 @@ module Utils
 end
 module Install
                                                            #%% using a directory and its mapping
-  def self.setup_find_create(dir_get,dir_put,exclude_files=[''])               #primary,
+  def self.setup_find_create(dir_get,dir_put,exclude_files=['\*'],act)               #primary,
     begin
       Find.find("#{Project_details.dir.pwd}/#{dir_get}") do |f|
         stub=f.scan(/#{Project_details.dir.pwd}\/#{dir_get}\/(\S+)/).join
         place="#{dir_put}/#{stub}"
         action=case
         when File.file?(f)
-          unless f =~/#{exclude_files.inspect}/
+          unless f =~/#{exclude_files.join("|")}/
             cp(f,place)
             Utils.chmod_file(place)
             "->  #{dir_put}/"
@@ -192,7 +192,7 @@ module Version_info
   end
   module Current
     def self.yml_file_path(version)
-      "data/sisu/#{version}/v/version.yml"
+      "data/sisu/version/#{version}.yml"
     end
     def self.settings(file)
       v="#{Dir.pwd}/#{file}"
@@ -208,10 +208,16 @@ module Version_info
       yml_file_path(SiSU_version_dir_unstable)
     end
     def self.setting_stable
-      settings(file_stable)
+      hsh=settings(file_stable)
+      hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+        match(hsh[:version])[1]
+      hsh
     end
     def self.setting_unstable
-      settings(file_unstable)
+      hsh=settings(file_unstable)
+      hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+        match(hsh[:version])[1]
+      hsh
     end
     def self.content_stable
       Version_info.contents(setting_stable)
@@ -284,7 +290,7 @@ proceed? }
     end
     def self.changelog_header(vi)
       <<-WOK
-%% #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
+** #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]}
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz
@@ -373,7 +379,7 @@ module Gemspecs
     puts <<-WOK
 --
 name:       #{vi[:project].downcase}
-version:    #{vi[:version]}
+version:    #{vi[:version_number]}
 date:       #{vi[:date]}
 summary:    #{vi[:project]}
     WOK
@@ -382,14 +388,14 @@ summary:    #{vi[:project]}
     <<-WOK
 Gem::Specification.new do |s|
   s.name           = '#{vi[:project].downcase}'
-  s.version        = '#{vi[:version]}'
+  s.version        = '#{vi[:version_number]}'
   s.date           = '#{vi[:date]}'
   s.summary        = '#{vi[:project]}'
   s.description    = '#{Project_details.name} gem'
   s.authors        = ["Ralph Amissah"]
   s.email          = 'ralph.amissah@gmail.com'
   s.files          = Dir['lib/#{Project_details.name.downcase}/#{version}/*.rb'] +
-                     Dir['data/#{Project_details.name.downcase}/#{version}/v/version.yml'] +
+                     Dir['data/#{Project_details.name.downcase}/#{version}/version.yml'] +
                      Dir['data/#{Project_details.name.downcase}/image/*'] +
                      Dir['bin/#{Project_details.name.downcase}gem'] +
                      Dir['bin/#{Project_details.name.downcase}']
@@ -420,12 +426,12 @@ end
     def self.filename_stable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Current.setting_stable[:version]
+      + Version_info::Current.setting_stable[:version_number]
     end
     def self.filename_unstable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Current.setting_unstable[:version]
+      + Version_info::Current.setting_unstable[:version_number]
     end
     def self.info_stable
       Gemspecs.info(Version_info::Current.setting_stable)
@@ -476,12 +482,12 @@ end
     def self.filename_stable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Next.setting_stable[:version]
+      + Version_info::Next.setting_stable[:version_number]
     end
     def self.filename_unstable
       Project_details.name.downcase \
       + '-' \
-      + Version_info::Next.setting_unstable[:version]
+      + Version_info::Next.setting_unstable[:version_number]
     end
     def self.setting_stable
       Gemspecs.contents(
@@ -515,4 +521,3 @@ end
     end
   end
 end
-