Merge tag 'sisu_7.0.0' into debian/sid

SiSU 7.0.0

1 files changed, 26 insertions, 55 deletions

diff --git a/qi b/qi
index ef67bbf6..33cd8e59 100755
--- a/qi
+++ b/qi
@@ -66,7 +66,6 @@ module SiSUconf
       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] \
@@ -183,64 +182,37 @@ module SiSUconf
         #end
       end
     end
-    desc 'gem --create --build --install --stable --unstable',
+    desc 'gem --create --build --install',
       'gem create build and install'
     options \
-      :stable => :boolean,
-      :unstable => :boolean,
       :create => :boolean,
       :build => :boolean,
       :install => :boolean,
+      :git_version_number => :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
-          puts 'created gemspec, version: unstable' \
-            if options[:verbose]
-        end
-        if options[:build]
-          Gemspecs::Current.build_unstable
-          #Gemspecs::Next.build_unstable
-          puts 'built gem, version: unstable' \
-            if options[:verbose]
-        end
-        if options[:install]
-          Gemspecs::Current.install_unstable
-          #Gemspecs::Next.install_unstable
-          puts 'installed gem, version: unstable' \
-            if options[:verbose]
-        end
+      if options[:is]
+        puts Version_info.version_number_info_stable
       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
-          puts 'created gemspec, version: stable' \
-            if options[:verbose]
-        end
-        if options[:build]
-          Gemspecs::Current.build_stable
-          #Gemspecs::Next.build_stable
-          puts 'built gem, version: stable' \
-            if options[:verbose]
-        end
-        if options[:install]
-          Gemspecs::Current.install_stable
-          #Gemspecs::Next.install_stable
-          puts 'installed gem, version: stable' \
-            if options[:verbose]
-        end
+      if options[:create]
+        version=(options[:git_version_number]) \
+        ? :version_git
+        : :version_standard
+        Gemspecs::Current.create_stable(version)
+        puts 'created gemspec' \
+          if options[:verbose]
+      end
+      if options[:build]
+        Gemspecs::Current.build_stable
+        puts 'built gem' \
+          if options[:verbose]
+      end
+      if options[:install]
+        Gemspecs::Current.install_stable
+        puts 'installed gem, version: stable' \
+          if options[:verbose]
       end
-      if options.length < 2
+      unless options.length > 0
         system("#{$called_as} help gem")
       end
     end
@@ -256,23 +228,22 @@ module SiSUconf
     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[:open_version]
+        Version_info::Update.update_documentation
         Version_info::Update.update_stable(:pre_release)
-        Version_info::Update.update_unstable(:pre_release)
+        Version_info::Update.update_pkgbuild_stable(: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_documentation
         Version_info::Update.update_stable(:release)
-        Version_info::Update.update_unstable(:release)
+        Version_info::Update.update_pkgbuild_stable(: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