diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 7 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 7 | ||||
| -rw-r--r-- | data/sisu/v5/v/version.yml | 6 | ||||
| -rw-r--r-- | data/sisu/v6/v/version.yml | 6 | ||||
| -rw-r--r-- | rbuild | 31 |
5 files changed, 36 insertions, 21 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index f6c18141..a1f293e9 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -31,6 +31,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 5.5.2.orig.tar.xz (2014-07-22:29/2) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.2 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.2-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.2.orig.tar.xz + sisu_5.5.2.orig.tar.xz + sisu_5.5.2-1.dsc + %% 5.5.1.orig.tar.xz (2014-07-15:28/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.1 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.1-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index ddf381fd..0c6b7311 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -21,6 +21,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 6.1.2.orig.tar.xz (2014-07-22:29/2) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.2 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.2-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.2.orig.tar.xz + sisu_6.1.2.orig.tar.xz + sisu_6.1.2-1.dsc + %% 6.1.1.orig.tar.xz (2014-07-15:28/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.1 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.1-1 diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index 189cbba6..af2b37c3 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 5.5.1 -:date_stamp: 2014w28/2 -:date: "2014-07-15" +:version: 5.5.2 +:date_stamp: 2014w29/2 +:date: "2014-07-22" diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml index 035d57f7..426aff5d 100644 --- a/data/sisu/v6/v/version.yml +++ b/data/sisu/v6/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 6.1.1 -:date_stamp: 2014w28/2 -:date: "2014-07-15" +:version: 6.1.2 +:date_stamp: 2014w29/2 +:date: "2014-07-22" @@ -37,8 +37,8 @@ #require 'mkmf' #create_makefile("sisu") #% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file) -SiSU_version_next_stable = '5.5.1' #% set version -SiSU_version_next_unstable = '6.1.1' #% set version +SiSU_version_next_stable = '5.5.2' #% set version +SiSU_version_next_unstable = '6.1.2' #% set version #% rake file SiSU_version_generic_next_stable = '5.4.x' SiSU_version_generic_next_unstable = '6.0.x' @@ -148,11 +148,11 @@ module Utils resp='redo' print ask + " ['yes', 'no' or 'quit']: " resp=File.new('/dev/tty').gets.strip #resp=gets.strip - if resp == 'yes'; true - elsif resp == 'no'; false - elsif resp =~/^quit|exit$/; exit - else puts "[please type: 'yes', 'no' or 'quit']" - answer?(ask) + if resp == 'yes' then true + elsif resp == 'no' then false + elsif resp =~/^quit|exit$/ then exit + else puts "[please type: 'yes', 'no' or 'quit']" + answer?(ask) end end def self.default_notice @@ -297,14 +297,15 @@ with: #{vi_content_next} proceed? } resp=Utils.answer?(ans) - exit unless resp - fn="#{Dir.pwd}/#{filename}" - if File.writable?("#{Dir.pwd}/.") - file_version=File.new(fn,'w+') - file_version << vi_content_next - file_version.close - else - puts %{*WARN* is the file or directory writable? could not create #{filename}} + if resp + fn="#{Dir.pwd}/#{filename}" + if File.writable?("#{Dir.pwd}/.") + file_version=File.new(fn,'w+') + file_version << vi_content_next + file_version.close + else + puts %{*WARN* is the file or directory writable? could not create #{filename}} + end end end def self.update_stable |