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, 115 insertions, 66 deletions

diff --git a/qi b/qi
index 6bfddf62..ef67bbf6 100755
--- a/qi
+++ b/qi
@@ -1,41 +1,20 @@
 #!/usr/bin/env ruby
 =begin
- Common Rakefile, Rantfile installer for SiSU
-   softlink Rakefile and Rantfile to this file
 
- * Homepage: <http://www.jus.uio.no/sisu/SiSU>
-             <http://search.sisudoc.org>
- * Download: <http://www.jus.uio.no/sisu/download>
-
- Copyright (C) 2007 Ralph Amissah
-
- * License: LGPL - GNU Lesser General Public License
-     [same license as Rant provided within the Rant package]
+**  Description: 
 
- * Ralph Amissah <ralph@amissah.com>
-   Ralph Amissah <ralph.amissah@gmail.com>
-
- Rake is a Ruby build program by Jim Weirich
- * Rake may be downloaded and installed from:
-     <http://rake.rubyforge.org/>
+**  Homepage: <http://www.jus.uio.no/sisu/SiSU>
+             <http://search.sisudoc.org>
+**  Download: <http://www.jus.uio.no/sisu/download>
 
- Rant is a Ruby build program by Stefan Lang
- * Rant may be downloaded and installed from:
-     <http://make.rubyforge.org/>
+**  Copyright: (C) 2007 - 2015 Ralph Amissah
 
- Notes on use:
-   [if rake is preferred and installed]
-     rake -T
-   [if rant is preferred and installed]
-     rant -T
+**  License: 
 
- SiSU can also be Setup/Installation using:
- * Minero Aoki's setup.rb, provided along with SiSU, or
+**  Ralph Amissah <ralph@amissah.com>
+  Ralph Amissah <ralph.amissah@gmail.com>
 
 =end
-#%% produce a makefile suitable for the target platform
-#require 'mkmf'
-#create_makefile("sisu")
 #% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
 begin
   require 'thor'
@@ -59,7 +38,7 @@ require 'yaml'
 module SiSUconf
   class Configure < Thor
     class_option :verbose, :type => :boolean
-    desc 'setup --all --bin --lib --conf --data --alt',
+    desc 'setup --all --bin --lib --conf --data --alt --dryrun',
       'setup sisu'
     options \
       :all => :boolean,
@@ -70,7 +49,9 @@ module SiSUconf
       :share => :boolean,
       :man => :boolean,
       :vim => :boolean,
-      :alt => :boolean
+      :alt => :boolean,
+      :dryrun => :boolean,
+      :is => :boolean
     def setup
       unless options.length >= 1 \
       and not (options[:bin] \
@@ -82,73 +63,118 @@ module SiSUconf
       or options[:vim])
         puts 'setup --all --bin --lib --conf --data --share --man --vim'
       end
+      act=(options[:dryrun]) ? (:dryrun) : (:action)
+      if options[:is]
+        puts Version_info.version_number_info_stable
+        puts Version_info.version_number_info_unstable
+      end
       if not options[:alt]
         if options[:all] \
         or options[:bin]
           exclude_files=['sisugem']
-          Install.setup_find_create('bin',Project_details.dir.bin,exclude_files) \
-            if File.directory?('bin')
+          Install.setup_find_create(
+            'bin',
+            Project_details.dir.bin,
+            exclude_files,
+            act
+          ) if File.directory?('bin')
         end
         if options[:all] \
         or options[:lib]
-          Install.setup_find_create('lib',Project_details.dir.lib) \
-            if File.directory?('lib')
+          Install.setup_find_create(
+            'lib',
+            Project_details.dir.lib,
+            act
+          ) if File.directory?('lib')
         end
         if options[:all] \
         or options[:conf]
-          Install.setup_find_create('conf',Project_details.dir.conf) \
-            if File.directory?('conf')
+          Install.setup_find_create(
+            'conf',
+            Project_details.dir.conf,
+            act
+          ) if File.directory?('conf')
         end
         if options[:all] \
         or options[:data]
-          Install.setup_find_create('data',Project_details.dir.data) \
-            if File.directory?('data')
+          Install.setup_find_create(
+            'data',
+            Project_details.dir.data,
+            act
+          ) if File.directory?('data')
         end
         if options[:all] \
         or options[:share]
-          Install.setup_find_create('data/sisu',Project_details.dir.share) \
-            if File.directory?('data/sisu')
+          Install.setup_find_create(
+            'data/sisu',
+            Project_details.dir.share,
+            act
+          ) if File.directory?('data/sisu')
         end
         if options[:all] \
         or options[:man]
-          Install.setup_find_create('man',Project_details.dir.man) \
-            if File.directory?('man')
+          Install.setup_find_create(
+            'man',
+            Project_details.dir.man,
+            act
+          ) if File.directory?('man')
         end
         if options[:all] \
         or options[:vim]
-          Install.setup_find_create('data/vim',Project_details.dir.vim) \
-            if File.directory?('data/vim')
+          Install.setup_find_create(
+            'data/vim',
+            Project_details.dir.vim,
+            act
+          ) if File.directory?('data/vim')
         end
       else
         if options[:all] \
         or options[:bin]
-          Install.setup_find_cp_r('bin',Project_details.dir.bin) \
-            if File.directory?('bin')
+          Install.setup_find_cp_r(
+            'bin',
+            Project_details.dir.bin,
+            act
+          ) if File.directory?('bin')
         end
         if options[:all] \
         or options[:bin]
-          Install.setup_find_cp_r('lib',Project_details.dir.lib) \
-            if File.directory?('lib')
+          Install.setup_find_cp_r(
+            'lib',
+            Project_details.dir.lib,
+            act
+          ) if File.directory?('lib')
         end
         if options[:all] \
         or options[:conf]
-          Install.setup_find_cp_r('conf',Project_details.dir.conf) \
-            if File.directory?('conf')
+          Install.setup_find_cp_r(
+            'conf',
+            Project_details.dir.conf,
+            act
+          ) if File.directory?('conf')
         end
         if options[:all] \
         or options[:data]
-          Install.setup_find_cp_r('data',Project_details.dir.data) \
-            if File.directory?('data')
+          Install.setup_find_cp_r(
+            'data',
+            Project_details.dir.data,
+            act
+          ) if File.directory?('data')
         end
         if options[:all] \
         or options[:share]
-          Install.setup_find_cp_r('data/sisu',Project_details.dir.share) \
-            if File.directory?('data/sisu') #
+          Install.setup_find_cp_r(
+            'data/sisu',
+            Project_details.dir.share,
+            act
+          ) if File.directory?('data/sisu') #
         end
         if options[:all] \
         or options[:man]
-          Install.setup_find_cp_r('man',Project_details.dir.man) \
-            if File.directory?('man')
+          Install.setup_find_cp_r(
+            'man',
+            Project_details.dir.man,
+            act
+          ) if File.directory?('man')
         end
         #if options[:all] \
         #or options[:vim]
@@ -164,9 +190,13 @@ module SiSUconf
       :unstable => :boolean,
       :create => :boolean,
       :build => :boolean,
-      :install => :boolean
+      :install => :boolean,
+      :is => :boolean
     def gem
       if options[:unstable]
+        if options[:is]
+          puts Version_info.version_number_info_unstable
+        end
         if options[:create]
           Gemspecs::Current.create_unstable
           #Gemspecs::Next.create_unstable
@@ -188,6 +218,9 @@ module SiSUconf
       end
       if options[:stable] \
       or not options[:unstable]
+        if options[:is]
+          puts Version_info.version_number_info_stable
+        end
         if options[:create]
           Gemspecs::Current.create_stable
           #Gemspecs::Current.create_unstable
@@ -212,19 +245,35 @@ module SiSUconf
       end
     end
     desc 'pkg',
-      'package maintenance tasks, of no general interest (maintainer specific for package maintainer\'s convenience)'
+      'package maintenance tasks, ' \
+       + 'of no general interest ' \
+       + '(maintainer specific for package maintainer\'s convenience)'
     options \
-      :update_version=> :boolean,
-      :tip => :boolean
+      :open_version=> :boolean,
+      :version_and_tag_for_release=> :boolean,
+      :tip => :boolean,
+      :is => :boolean
     def pkg
+      if options[:is]
+        puts Version_info.version_number_info_stable
+        puts Version_info.version_number_info_unstable
+      end
       if options[:tip]
         Package.sequence
       end
-      if options[:update_version]
-        Version_info::Update.update_stable
-        Version_info::Update.update_unstable
-        puts "\n" + Version_info::Update.changelog_header_stable
-        puts "\n" + Version_info::Update.changelog_header_unstable
+      if options[:open_version]
+        Version_info::Update.update_stable(:pre_release)
+        Version_info::Update.update_unstable(:pre_release)
+        Version_info::Update.changelog_header_stable_pre_release
+        Version_info::Update.changelog_header_unstable_pre_release
+        Version_info::Update.changelog_header_commit(:pre_release)
+      end
+      if options[:version_and_tag_for_release]
+        Version_info::Update.update_stable(:release)
+        Version_info::Update.update_unstable(:release)
+        Version_info::Update.changelog_header_stable
+        Version_info::Update.changelog_header_unstable
+        Version_info::Update.changelog_header_commit_tag_upstream(:release)
       end
       if options.length == 0
         system("#{$called_as} help pkg")