diff options
author | Ralph Amissah <ralph@amissah.com> | 2015-05-21 19:25:19 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2015-05-21 19:25:19 -0400 |
commit | 909d7643e093caa71c9e3e36c90d64ad56717815 (patch) | |
tree | f490a5f87d393f6dfaf70752d0c6cec2ce8ef7ba | |
parent | debian/changelog (7.1.2-1) (diff) | |
parent | constants, search, db name, period before and after db version (diff) |
Merge tag 'sisu_7.1.3' into debian/sid
SiSU 7.1.3
-rw-r--r-- | data/doc/sisu/CHANGELOG_v7 | 3 | ||||
-rw-r--r-- | data/doc/sisu/COPYRIGHT | 4 | ||||
-rw-r--r-- | data/sisu/version.yml | 6 | ||||
-rw-r--r-- | lib/sisu/cgi_sql_common.rb | 6 | ||||
-rw-r--r-- | lib/sisu/constants.rb | 4 | ||||
-rw-r--r-- | man/man1/sisu.1 | 2 | ||||
-rw-r--r-- | setup/sisu_version.rb | 2 |
7 files changed, 15 insertions, 12 deletions
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7 index 3a5724b2..811a47b7 100644 --- a/data/doc/sisu/CHANGELOG_v7 +++ b/data/doc/sisu/CHANGELOG_v7 @@ -20,6 +20,9 @@ Reverse Chronological: --- HEAD --- +* sisu_7.1.3.orig.tar.xz (Open commit window: 2015-05-20; Pre-Release)) + http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.3 + * 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 diff --git a/data/doc/sisu/COPYRIGHT b/data/doc/sisu/COPYRIGHT index c77a68f1..d969011a 100644 --- a/data/doc/sisu/COPYRIGHT +++ b/data/doc/sisu/COPYRIGHT @@ -9,7 +9,7 @@ Source: http://sisudoc.org/sisu/archive/pool/main/s/sisu/ git://git.sisudoc.org/git/code/sisu.git Files: SiSU * -Copyright: 1997, 2014, Ralph Amissah +Copyright: 1997, 2015, Ralph Amissah License: GPL-3+ Files: data/sisu/v*/conf/editor-syntax-etc/emacs/sisu-mode.el @@ -30,7 +30,7 @@ License: LGPL-2.1 Files: debian/* Copyright: 2005, Ralph Amissah <ralph.amissah@gmail.com> - 2014, SiSU Project Debian, Ralph Amissah + 2015, SiSU Project Debian, Ralph Amissah License: GPL-3+ License: GPL-3+ diff --git a/data/sisu/version.yml b/data/sisu/version.yml index 6309ee65..32a431e5 100644 --- a/data/sisu/version.yml +++ b/data/sisu/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 7.1.2 -:date_stamp: 2015w20/1 -:date: "2015-05-18" +:version: 7.1.3_pre_rel +:date_stamp: 2015w20/3 +:date: "2015-05-20" diff --git a/lib/sisu/cgi_sql_common.rb b/lib/sisu/cgi_sql_common.rb index 2d599bf4..b0013a88 100644 --- a/lib/sisu/cgi_sql_common.rb +++ b/lib/sisu/cgi_sql_common.rb @@ -76,7 +76,7 @@ module SiSU_CGI_SQL * Author: Ralph Amissah - * Copyright: (C) 1997 - 2014, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2015, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -541,7 +541,7 @@ module SiSU_CGI_SQL <br> <a href="http://www.sisudoc.org" > <b>#{v.project}</b></a> <sup>©</sup> Ralph Amissah - 1993, current 2014. + 1993, current 2015. All Rights Reserved. <br> #{v.project} is software for document structuring, publishing and search, @@ -579,7 +579,7 @@ module SiSU_CGI_SQL <br>Standard SiSU meta-markup syntax, and the <br>Standard SiSU <u>object citation numbering</u> and system, (object/text identifying/locating system) <br> - <sup>©</sup> Ralph Amissah 1997, current 2014. + <sup>©</sup> Ralph Amissah 1997, current 2015. All Rights Reserved. </font></p> </td></tr> diff --git a/lib/sisu/constants.rb b/lib/sisu/constants.rb index d6978a09..96cc0bca 100644 --- a/lib/sisu/constants.rb +++ b/lib/sisu/constants.rb @@ -55,7 +55,7 @@ =end #Ax,Xx,Mx,Rx,Hx,Dx,Px,Ep,Db,Gt,Tex=Array.new(11){{}} -YEAR='2014' +YEAR='2015' Sfx={ txt: '.txt', txt_textile: '.textile', @@ -271,7 +271,7 @@ else } end Db={ - name_prefix: "SiSU#{SiSU_is.version_major?}a_", + name_prefix: "SiSU.#{SiSU_is.version_major?}a.", name_prefix_db: "sisu_#{SiSU_is.version_major?}a_", col_title: 800, col_title_part: 400, diff --git a/man/man1/sisu.1 b/man/man1/sisu.1 index c5935310..ca46ef99 100644 --- a/man/man1/sisu.1 +++ b/man/man1/sisu.1 @@ -1,4 +1,4 @@ -.TH "sisu" "1" "2014-02-05" "7.1.0" "SiSU" +.TH "sisu" "1" "2015-05-21" "7.1.3" "SiSU" .br .SH NAME .br diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb index a569fff8..a6d63316 100644 --- a/setup/sisu_version.rb +++ b/setup/sisu_version.rb @@ -1,6 +1,6 @@ #% constants module SiSUversion - SiSU_version = '7.1.2' + SiSU_version = '7.1.3' end module Dev GPGpubKey = '1BB4B289' |