From 108142f5a3b85ddbcd10b3b7c302b5ae2f1da818 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 25 May 2014 09:55:33 -0400 Subject: v5 v6: version & changelog (& rakefile) * will merge v6 into v5, 5.4 version bump --- 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 | 6 +++--- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 08796bbe..fe2834c2 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.4.0.orig.tar.xz (2014-05-25:20/7) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.0 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.0-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.0.orig.tar.xz + sisu_5.4.0.orig.tar.xz + sisu_5.4.0-1.dsc + %% 5.3.6.orig.tar.xz (2014-05-18:19/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.6 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.6-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index b39da757..d58762a9 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.0.7.orig.tar.xz (2014-05-25:20/7) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.7 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.7-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.7.orig.tar.xz + sisu_6.0.7.orig.tar.xz + sisu_6.0.7-1.dsc + %% 6.0.6.orig.tar.xz (2014-05-18:19/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.6 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.6-1 diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index 698bd43a..959947ba 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 5.3.6 -:date_stamp: 2014w19/7 -:date: "2014-05-18" +:version: 5.4.0 +:date_stamp: 2014w20/7 +:date: "2014-05-25" diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml index bdb428f0..098c97b5 100644 --- a/data/sisu/v6/v/version.yml +++ b/data/sisu/v6/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 6.0.6 -:date_stamp: 2014w19/7 -:date: "2014-05-18" +:version: 6.0.7 +:date_stamp: 2014w20/7 +:date: "2014-05-25" diff --git a/rbuild b/rbuild index 7e17f554..9ee18775 100644 --- a/rbuild +++ b/rbuild @@ -37,10 +37,10 @@ #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.3.6' -SiSU_version_next_unstable = '6.0.6' +SiSU_version_next_stable = '5.4.0' +SiSU_version_next_unstable = '6.0.7' #% rake file -SiSU_version_generic_next_stable = '5.3.x' +SiSU_version_generic_next_stable = '5.4.x' SiSU_version_generic_next_unstable = '6.0.x' SiSU_version_dir_stable = 'v5' SiSU_version_dir_unstable = 'v6' -- cgit v1.2.3