diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-07-01 11:42:40 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-07-01 11:42:40 +0100 |
commit | 548defe7ace11e0f368b7a88a651e7d57ae4a93f (patch) | |
tree | c56192560115ca8f63ff74dd4a4209c618bd5df7 | |
parent | Merge branch 'upstream' into debian/sid (diff) |
Updated sisu-0.55.0debian/0.55.0-1
-rw-r--r-- | conf/sisu/version.yml | 8 | ||||
-rw-r--r-- | data/doc/sisu/CHANGELOG | 58 | ||||
-rw-r--r-- | debian/changelog | 10 | ||||
-rw-r--r-- | debian/copyright | 8 |
4 files changed, 62 insertions, 22 deletions
diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml index aafda39f..a2f50d4c 100644 --- a/conf/sisu/version.yml +++ b/conf/sisu/version.yml @@ -1,5 +1,5 @@ --- -:date_stamp: 2007w24/5 -:date: "2007-06-15" -:version: 0.54.1 -:project: SiSU +:date_stamp: 2007w26/0 +:date: "2007-07-01" +:project: +:version: 0.55.0 diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG index db80b9d1..bb82dcba 100644 --- a/data/doc/sisu/CHANGELOG +++ b/data/doc/sisu/CHANGELOG @@ -6,16 +6,46 @@ Reverse Chronological: %% STABLE MANIFEST -%% sisu_0.54.1.orig.tar.gz (2007-06-15::24/5) +%% sisu_0.55.0.orig.tar.gz (2007-07-01:26/7) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.0.orig.tar.gz + sisu_0.55.0.orig.tar.gz + sisu_0.55.0-1.dsc + sisu_0.55.0-1.diff.gz + + * GPL 3 related changes + * LICENSE update/change: GPL v3 or later. + * document markup samples added GPL 3 + * images added GPL 3 + + * default skin, info re-arranged/redesign, (some content dropped else much + the same apart from reference to GPL v3) + + * html, do not make link to concordance file in html output even if it exists + if document has over 300,000 words (as concordance would be a large file), + if generated will be listed in manifest (maximum number of words to + prevent its generation can be set in sisurc.yml, (default is currently + set to 260,000)) + + * odf, url match bug fix + + * dal, text block fix, space follows url before <br> + + * minor + * cosmetic changes to html and digest code + * man page and html (note concordance word limit) + + * debian make lib available to ruby1.9 + +%% sisu_0.54.1.orig.tar.gz (2007-06-15:24/5) http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.1.orig.tar.gz - sisu_0.54.1.orig.tar.gz - sisu_0.54.1-1.dsc - sisu_0.54.1-1.diff.gz + 716601a80e8942d8cdc953e5cfa33237 1258642 sisu_0.54.1.orig.tar.gz + a095bf0e84858e2e31a6fe474d1ab2b3 606 sisu_0.54.1-1.dsc + 8696690cc0dc9776b374754fa12777b8 150532 sisu_0.54.1-1.diff.gz * cgi script (for search matching), fix (imperfect), match highlighting is now ignored in paragraphs with urls -%% sisu_0.54.0.orig.tar.gz (2007-06-14::24/4) +%% sisu_0.54.0.orig.tar.gz (2007-06-14:24/4) http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.0.orig.tar.gz e1a98feb15d72e669d3726dbc9cc81da 1258857 sisu_0.54.0.orig.tar.gz 0be75fc5cdf10fdf7d8073490bec4fe6 606 sisu_0.54.0-1.dsc @@ -42,7 +72,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.0.orig.tar.gz * conversion script in data/sisu/conf/convert/sisu_convert -%% sisu_0.53.0.orig.tar.gz (2007-06-02::22/6) +%% sisu_0.53.0.orig.tar.gz (2007-06-02:22/6) http://www.jus.uio.no/sisu/pkg/src/sisu_0.53.0.orig.tar.gz b8f28c2cade1f95956f5cdaef7af7fbd 1254059 sisu_0.53.0.orig.tar.gz 2a741d1fbe95f25a06b6d10ee709514a 606 sisu_0.53.0-1.dsc @@ -63,7 +93,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.53.0.orig.tar.gz (from a combination of mercurial and dars + darcs-buildpackage, [don't ask, it served me quite well though]) -%% sisu_0.52.7.orig.tar.gz (2007-05-17::20/4) +%% sisu_0.52.7.orig.tar.gz (2007-05-17:20/4) http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.7.orig.tar.gz a9513dea06487a4e588f160f3d2491e8 1283842 sisu_0.52.7.orig.tar.gz 5e0cfa4abf66318161819331d6b0f5af 606 sisu_0.52.7-1.dsc @@ -71,7 +101,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.7.orig.tar.gz * texpdf, related to special characters -%% sisu_0.52.6.orig.tar.gz (2007-05-14::20/1) +%% sisu_0.52.6.orig.tar.gz (2007-05-14:20/1) http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.6.orig.tar.gz 3255ec945b0583a01af963dde3f76f1d 1283482 sisu_0.52.6.orig.tar.gz f466b68b3093e2c95fed13e4ebf0d495 606 sisu_0.52.6-1.dsc @@ -79,7 +109,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.6.orig.tar.gz * texpdf, a url representation fix, escape of special characters -%% sisu_0.52.5.orig.tar.gz (2007-05-10::19/4) +%% sisu_0.52.5.orig.tar.gz (2007-05-10:19/4) http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.5.orig.tar.gz e01dd9390785e8b087140a7166cc6a5e 1283393 sisu_0.52.5.orig.tar.gz 1bc960b5ce02d58153579d32bfbb2bd0 606 sisu_0.52.5-1.dsc @@ -97,7 +127,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.5.orig.tar.gz sisurc.yml (check what the correct value should be [on my system the default was set to 5433 for 8.2, "ls -la /var/run/postgresql/" may help]) -%% sisu_0.52.4.orig.tar.gz (2007-05-05::18/6) +%% sisu_0.52.4.orig.tar.gz (2007-05-05:18/6) http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.4.orig.tar.gz 8712a6162633f27dce36f57bc60599a5 1282392 sisu_0.52.4.orig.tar.gz fd5618da795883fbeb1d53076783f80a 606 sisu_0.52.4-1.dsc @@ -113,7 +143,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.4.orig.tar.gz * [very rough wiki text output/assist (-g), may remove, not documented] -%% sisu_0.52.3.orig.tar.gz (2007-04-26::17/4) +%% sisu_0.52.3.orig.tar.gz (2007-04-26:17/4) http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.3.orig.tar.gz d71332c68a8ed6b01f358f1e5ae45875 1279017 sisu_0.52.3.orig.tar.gz 4dd90c7e7790ea75be3017577759a128 606 sisu_0.52.3-1.dsc @@ -128,7 +158,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.3.orig.tar.gz both versions of postgresql were installed, 0.52.2 was not uploaded to the debian repository] -%% sisu_0.52.2.orig.tar.gz (2007-04-21::16/6) +%% sisu_0.52.2.orig.tar.gz (2007-04-21:16/6) http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.2.orig.tar.gz 96a2d9628e14e997bd93edd817b04996 1278391 sisu_0.52.2.orig.tar.gz b3ed14988e1deed59ba13e0cfaae0b35 606 sisu_0.52.2-1.dsc @@ -140,7 +170,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.2.orig.tar.gz * debian/control, postgresql dependency update, [intended to close: #419294] [thank you for report Martin Pitt] -%% sisu_0.52.1.orig.tar.gz (2007-04-14::15/6) +%% sisu_0.52.1.orig.tar.gz (2007-04-14:15/6) http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.1.orig.tar.gz 24faea8c8565af2a24fb02c4499cb287 1280993 sisu_0.52.1.orig.tar.gz 46a488ef619227fd02426a7311e86927 606 sisu_0.52.1-1.dsc @@ -150,7 +180,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.1.orig.tar.gz * cleanup of some unused code, re-introduce if needed -%% sisu_0.52.0.orig.tar.gz (2007-04-07::14/6) +%% sisu_0.52.0.orig.tar.gz (2007-04-07:14/6) http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.0.orig.tar.gz e8767ea85c9e4f0941a8019f184031f3 1273211 sisu_0.52.0.orig.tar.gz 991acda3465d5a8a043da7f327d8d020 606 sisu_0.52.0-1.dsc diff --git a/debian/changelog b/debian/changelog index d163fb1e..e5624b63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +sisu (0.55.0-1) unstable; urgency=low + + * License change - GPL v3 or later + + * make lib available to ruby 1.9 + + * New upstream including some fixes, see changelog + + -- Ralph Amissah <ralph@amissah.com> Sun, 01 Jul 2007 11:41:09 +0100 + sisu (0.54.1-1) unstable; urgency=low * new upstream, with fix in cgi-search related to match highlighting, see diff --git a/debian/copyright b/debian/copyright index 06b9f0e1..c15699c4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,13 +11,13 @@ The original source can always be found at: Copyright (C) 1997, 1998, 1999, 2000, 20001, 2002, 2003, 2004, 2005 Ralph Amissah -License: GPL 2 or later +License: GPL v3 or later - GPL2 summary: + GPL3 summary: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -34,7 +34,7 @@ License: GPL 2 or later available from these locations: <http://www.fsf.org/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl2.fsf> + <http://www.jus.uio.no/sisu/gpl3.fsf> On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. |