diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-04-25 13:50:40 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-04-25 13:50:40 -0400 |
| commit | aeb7754510ffacc207b17e5d7512ff5f14debcc3 (patch) | |
| tree | e2f17e3ad2ee4e1ea81287febe5049ce6fb82147 /setup/qi_libs_base.rb | |
| parent | added patch jessie_bugfix_767761 (diff) | |
| parent | version & changelog, tag for release (diff) | |
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
Diffstat (limited to 'setup/qi_libs_base.rb')
| -rw-r--r-- | setup/qi_libs_base.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/setup/qi_libs_base.rb b/setup/qi_libs_base.rb index ec01af19..4126fa3f 100644 --- a/setup/qi_libs_base.rb +++ b/setup/qi_libs_base.rb @@ -142,7 +142,7 @@ module Version_info end module Current def self.yml_file_path(version) - "data/sisu/#{version}/v/version.yml" + "data/sisu/version/#{version}.yml" end def self.settings(file) v="#{Dir.pwd}/#{file}" @@ -234,12 +234,10 @@ proceed? } end def self.changelog_header(vi) <<-WOK -%% #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')}) +** #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')}) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]} -http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1 http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz sisu_#{vi[:version]}.orig.tar.xz - sisu_#{vi[:version]}-1.dsc WOK end def self.changelog_header_stable |