diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-05-18 18:40:01 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-05-18 18:40:01 -0400 |
| commit | cceb5a730c6028a6b67577d11f7f183e144e96cd (patch) | |
| tree | 5ba5725b2e00a2285a1e95cbb7edb0d2a1492df3 | |
| parent | debian/changelog (7.1.1-1) (diff) | |
| parent | version & changelog, tag for release (diff) | |
Merge tag 'sisu_7.1.2' into debian/sid
SiSU 7.1.2
| -rwxr-xr-x | bin/sisu | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v7 | 3 | ||||
| -rw-r--r-- | data/sisu/version.yml | 6 | ||||
| -rw-r--r-- | setup/sisu_version.rb | 2 |
4 files changed, 8 insertions, 5 deletions
@@ -115,7 +115,7 @@ class Orient end end def sisu_this_lib - if not Gem::Specification.find_by_name("sisu").nil? \ + if Gem::Specification.any? \ and processing.sisu_runtime_path =~/\/gems\// \ and processing.sisu_runtime_path \ =~ /\/#{processing.gem_regex}\// diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7 index 5d15cab7..3a5724b2 100644 --- a/data/doc/sisu/CHANGELOG_v7 +++ b/data/doc/sisu/CHANGELOG_v7 @@ -20,6 +20,9 @@ Reverse Chronological: --- HEAD --- +* sisu_7.1.2.orig.tar.xz (2015-05-18:20/1) + http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.2 + * sisu_7.1.1.orig.tar.xz (2015-05-17:19/7) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.1 diff --git a/data/sisu/version.yml b/data/sisu/version.yml index ae875481..6309ee65 100644 --- a/data/sisu/version.yml +++ b/data/sisu/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 7.1.1 -:date_stamp: 2015w19/7 -:date: "2015-05-17" +:version: 7.1.2 +:date_stamp: 2015w20/1 +:date: "2015-05-18" diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb index 106089d2..a569fff8 100644 --- a/setup/sisu_version.rb +++ b/setup/sisu_version.rb @@ -1,6 +1,6 @@ #% constants module SiSUversion - SiSU_version = '7.1.1' + SiSU_version = '7.1.2' end module Dev GPGpubKey = '1BB4B289' |