From b62b612e3a20eb7d60ce28854b23a8c350b2e2b2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 20 Aug 2014 18:29:29 -0400 Subject: v5 v6: version & changelog (& rakefile) --- data/doc/sisu/CHANGELOG_v5 | 7 +++++++ data/doc/sisu/CHANGELOG_v6 | 7 +++++++ data/sisu/v5/v/version.yml | 6 +++--- data/sisu/v6/v/version.yml | 6 +++--- rbuild | 7 ++++--- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 899855eb..d482d65d 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.6.2.orig.tar.xz (2014-08-20:33/3) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.2 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.2-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.2.orig.tar.xz + sisu_5.6.2.orig.tar.xz + sisu_5.6.2-1.dsc + %% 5.6.1.orig.tar.xz (2014-08-12:32/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.1 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.1-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 479f823c..d1ddc7d5 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.2.3.orig.tar.xz (2014-08-20:33/3) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.3 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.3-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.3.orig.tar.xz + sisu_6.2.3.orig.tar.xz + sisu_6.2.3-1.dsc + %% 6.2.2.orig.tar.xz (2014-08-12:32/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.2 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.2-1 diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index ec730471..59668da0 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 5.6.1 -:date_stamp: 2014w32/2 -:date: "2014-08-12" +:version: 5.6.2 +:date_stamp: 2014w33/3 +:date: "2014-08-20" diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml index 8f74a7e0..5697c2df 100644 --- a/data/sisu/v6/v/version.yml +++ b/data/sisu/v6/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 6.2.2 -:date_stamp: 2014w32/2 -:date: "2014-08-12" +:version: 6.2.3 +:date_stamp: 2014w33/3 +:date: "2014-08-20" diff --git a/rbuild b/rbuild index 94db4416..ab2e040a 100644 --- a/rbuild +++ b/rbuild @@ -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.6.1' #% set version -SiSU_version_next_unstable = '6.2.2' #% set version +SiSU_version_next_stable = '5.6.2' #% set version stable current +SiSU_version_next_unstable = '6.2.3' #% set version unstable dev #% rake file SiSU_version_generic_next_stable = '5.4.x' SiSU_version_generic_next_unstable = '6.0.x' @@ -148,7 +148,7 @@ module Utils resp='redo' print ask + " ['yes', 'no' or 'quit']: " resp=File.new('/dev/tty').gets.strip #resp=gets.strip - if resp == 'yes' then true + if resp == 'yes' then true elsif resp == 'no' then false elsif resp =~/^quit|exit$/ then exit else puts "[please type: 'yes', 'no' or 'quit']" @@ -504,6 +504,7 @@ desc "Setup/Install #{Project_details.name}: bin, lib, conf & data" task :setup_with_data=> [:setup_base,:setup_data] desc "check package version" task :sisuversion => [:sisu_version] + task :version => [:sisu_version] #desc "set package version" task :sisuversionset => [:sisu_version_set,:changelog_headers] desc "check gemspec info" -- cgit v1.2.3