From e5be411e7c179a4ab8636a120c71978c57fe55e9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 22 Mar 2010 20:20:07 -0400 Subject: sha256 (2.0.3) --- CHANGELOG_v2 | 6 +++--- data/doc/sisu/v2/CHANGELOG | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 5d5c0556..a4e408cd 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -14,9 +14,9 @@ Reverse Chronological: %% 2.0.3.orig.tar.gz (2010-03-22:12/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz - sisu_2.0.3.orig.tar.gz - sisu_2.0.3-1.dsc - sisu_2.0.3-1.diff.gz + 5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz + 4e09d9f39e4365493c8633d4c577201694fa6d1d36fdc3fba998bb65f8e01bb5 1145 sisu_2.0.3-1.dsc + c30e3dc32f824360e411a37a969f1d997cc20671ca119c302192735a8f650037 275394 sisu_2.0.3-1.diff.gz * bug fixes odf, xml, texpdf, bulleted group, clean diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index fdc6ce80..de4d0bfc 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -14,9 +14,9 @@ Reverse Chronological: %% 2.0.3.orig.tar.gz (2010-03-22:12/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz - sisu_2.0.3.orig.tar.gz - sisu_2.0.3-1.dsc - sisu_2.0.3-1.diff.gz + 5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz + 4e09d9f39e4365493c8633d4c577201694fa6d1d36fdc3fba998bb65f8e01bb5 1145 sisu_2.0.3-1.dsc + c30e3dc32f824360e411a37a969f1d997cc20671ca119c302192735a8f650037 275394 sisu_2.0.3-1.diff.gz * bug fixes odf, xml, texpdf, bulleted group, clean -- cgit v1.2.3 From f5ea5dbea7e43a67680acad29fa428f829053406 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 23 Mar 2010 19:21:06 -0400 Subject: correct method call for md.title.full a number of places * [in db_import, results in failure of doc import when called] --- lib/sisu/v2/concordance.rb | 6 +++--- lib/sisu/v2/db_import.rb | 2 +- lib/sisu/v2/manifest.rb | 4 ++-- lib/sisu/v2/shared_txt.rb | 2 +- lib/sisu/v2/xml_fictionbook.rb | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/sisu/v2/concordance.rb b/lib/sisu/v2/concordance.rb index 06cc3056..74338e98 100644 --- a/lib/sisu/v2/concordance.rb +++ b/lib/sisu/v2/concordance.rb @@ -111,7 +111,7 @@ module SiSU_Concordance @fnb=@md.fnb @lex_button=%{SiSU home -->} @doc_details =< 

#{@md.full_title}

#{@md.author}

+
 

#{@md.title.full}

#{@md.author}

WOK end def create @@ -123,11 +123,11 @@ WOK - SiSU created WordIndex for: #{@md.full_title} + SiSU created WordIndex for: #{@md.title.full} - + diff --git a/lib/sisu/v2/db_import.rb b/lib/sisu/v2/db_import.rb index e5c05040..1f795e68 100644 --- a/lib/sisu/v2/db_import.rb +++ b/lib/sisu/v2/db_import.rb @@ -224,7 +224,7 @@ module SiSU_DB_import @md=SiSU_Param::Parameters.new(@opt).get if defined? @md.title.full \ and @md.title.full=~/\S+/ # DublinCore 1 - title - @tp[:title]=@md.title.all + @tp[:title]=@md.title.full special_character_escape(@tp[:title]) @tp[:title_f],@tp[:title_i]='title, ',"'#{@tp[:title]}', " sql='SELECT MAX(tid) FROM metadata' diff --git a/lib/sisu/v2/manifest.rb b/lib/sisu/v2/manifest.rb index 680a7abf..c1da4ccb 100644 --- a/lib/sisu/v2/manifest.rb +++ b/lib/sisu/v2/manifest.rb @@ -598,7 +598,7 @@ WOK -SiSU manifest: #{@md.full_title} +SiSU manifest: #{@md.title.full} @@ -613,7 +613,7 @@ SiSU manifest: #{@md.full_title}

#{@translate.manifest_description}

-

#{@md.full_title}

+

#{@md.title.full}

#{@md.author}

  Document, Available Filetypes diff --git a/lib/sisu/v2/shared_txt.rb b/lib/sisu/v2/shared_txt.rb index 90de5ef5..9d35743b 100644 --- a/lib/sisu/v2/shared_txt.rb +++ b/lib/sisu/v2/shared_txt.rb @@ -162,7 +162,7 @@ module SiSU_text_utils end def start_is_match meta=case @p - when /^#{Mx[:meta_o]}(title)#{Mx[:meta_c]}\s*(.+?)$/; header($1,@md.full_title,'meta','dc') #dc 1 + when /^#{Mx[:meta_o]}(title)#{Mx[:meta_c]}\s*(.+?)$/; header($1,@md.title.full,'meta','dc') #dc 1 when /^#{Mx[:meta_o]}(creator|author)#{Mx[:meta_c]}\s*(.+?)$/; header('creator',$2,'meta','dc') #dc 2 when /^#{Mx[:meta_o]}(subject)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'meta','dc') #dc 3 when /^#{Mx[:meta_o]}(description)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'meta','dc') #dc 4 diff --git a/lib/sisu/v2/xml_fictionbook.rb b/lib/sisu/v2/xml_fictionbook.rb index 129dabd3..045fdb93 100644 --- a/lib/sisu/v2/xml_fictionbook.rb +++ b/lib/sisu/v2/xml_fictionbook.rb @@ -123,7 +123,7 @@ module SiSU_XML_Fictionbook *** *** - #{@md.full_title} + #{@md.title.full} yyyy -- cgit v1.2.3 From fa5c94ebda4571125a49f9c4c7db11b15201b5b0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 23 Mar 2010 19:22:06 -0400 Subject: free_as_in_freedom, link, additional material, minor --- ...richard_stallman_crusade_for_free_software.sam_williams.sst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst index 9b8c2b93..78a383eb 100644 --- a/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst +++ b/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst @@ -6,11 +6,11 @@ @creator: Williams, Sam @rights: - :copyright: Copyright (C) Sam Williams 2002. - :license: Published under the GNU Free Documentation License. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Document License, Version 1.1 or any later version published by the Free Software Foundation; with the Invariant Sections being no invariant sections, with the Front-Cover Texts being no invariant sections, and with the Back-Cover Texts being no invariant sections. A copy of the license is included in Appendix C, GNU Free Documentation License. All images are to be included verbatim when the document is copied, distributed, or modified under the terms of the GFDL. + :copyright: Copyright (C) Sam Williams 2002. + :license: Published under the GNU Free Documentation License. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Document License, Version 1.1 or any later version published by the Free Software Foundation; with the Invariant Sections being no invariant sections, with the Front-Cover Texts being no invariant sections, and with the Back-Cover Texts being no invariant sections. A copy of the license is included in Appendix C, GNU Free Documentation License. All images are to be included verbatim when the document is copied, distributed, or modified under the terms of the GFDL. @classify: - :topic_register: SiSU:markup sample:book;copyright;GNU/Linux:GPL|copyleft|free software;free software;Software:Software Libré;GPL;Linux:GNU|Software Libré;book:biography + :topic_register: SiSU:markup sample:book;copyright;GNU/Linux:GPL|copyleft|free software;free software;Software:Software Libré;GPL;Linux:GNU|Software Libré;book:biography;programming @date: :published: 2002 @@ -30,8 +30,10 @@ {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty {Free For All, Peter Wayner @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner - {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig {The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond + {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig + {CONTENT, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/content.cory_doctorow + {Little Brother, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/little_brother.cory_doctorow @make: :skin: skin_rms -- cgit v1.2.3 From f43fcebe8e48be88e015782f2b0464eb752a3155 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 23 Mar 2010 19:45:56 -0400 Subject: update: changelog, version (2.0.4) --- CHANGELOG_v2 | 20 ++++++++++++++++---- conf/sisu/v2/version.yml | 6 +++--- data/doc/sisu/v2/CHANGELOG | 20 ++++++++++++++++---- .../sisu_manual/sisu_download.ssi | 22 +++++++++++----------- 4 files changed, 46 insertions(+), 22 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index a4e408cd..48c6c0fc 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,6 +12,18 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.0.4.orig.tar.gz (2010-03-23:12/2) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz + sisu_2.0.4.orig.tar.gz + sisu_2.0.4-1.dsc + sisu_2.0.4-1.diff.gz + + * bug fixes + * correct method call for md.title.full a number of places [in db_import, + results in failure of doc import when called] + + * free_as_in_freedom, additional links to available material + %% 2.0.3.orig.tar.gz (2010-03-22:12/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz 5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz @@ -19,10 +31,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz c30e3dc32f824360e411a37a969f1d997cc20671ca119c302192735a8f650037 275394 sisu_2.0.3-1.diff.gz * bug fixes - odf, xml, texpdf, bulleted group, clean - odf, metadata line break - prevent from breaking document [potential odf - breakage] - xml_dom, behaviours fixes + * odf, xml, texpdf, bulleted group, clean + * odf, metadata line break - prevent from breaking document [potential odf + breakage] + * xml_dom, behaviours fixes %% 2.0.2.orig.tar.gz (2010-03-21:11/7) http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml index 8afd183e..c908e9cc 100644 --- a/conf/sisu/v2/version.yml +++ b/conf/sisu/v2/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.0.3 -:date_stamp: 2010w12/1 -:date: "2010-03-22" +:version: 2.0.4 +:date_stamp: 2010w12/2 +:date: "2010-03-23" :project: SiSU diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index de4d0bfc..c6a4af68 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,6 +12,18 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.0.4.orig.tar.gz (2010-03-23:12/2) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz + sisu_2.0.4.orig.tar.gz + sisu_2.0.4-1.dsc + sisu_2.0.4-1.diff.gz + + * bug fixes + * correct method call for md.title.full a number of places [in db_import, + results in failure of doc import when called] + + * free_as_in_freedom, additional links to available material + %% 2.0.3.orig.tar.gz (2010-03-22:12/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz 5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz @@ -19,10 +31,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz c30e3dc32f824360e411a37a969f1d997cc20671ca119c302192735a8f650037 275394 sisu_2.0.3-1.diff.gz * bug fixes - odf, xml, texpdf, bulleted group, clean - odf, metadata line break - prevent from breaking document [potential odf - breakage] - xml_dom, behaviours fixes + * odf, xml, texpdf, bulleted group, clean + * odf, metadata line break - prevent from breaking document [potential odf + breakage] + * xml_dom, behaviours fixes %% 2.0.2.orig.tar.gz (2010-03-21:11/7) http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi index 369ade1a..61d3af36 100644 --- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi +++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi @@ -16,7 +16,7 @@ :issued: 2002-11-12 :available: 2002-11-12 :published: 2009-01-18 - :modified: 2010-03-06 + :modified: 2010-03-23 @make: :num_top: 1 @@ -57,7 +57,7 @@ Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report
http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~ -_* {~^ sisu_2.0.3.orig.tar.gz (of 2010-03-22:12/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz +_* {~^ sisu_2.0.4.orig.tar.gz (2010-03-22:12/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz _* {~^ sisu-markup-samples_1.0.10.orig.tar.gz (of 2008-10-09:40/4 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.10.orig.tar.gz ~{
1e769b5c2c2d6135c3f5a14ede1d019f77588c7024168c756c7093510145c7dc 3442966 }~ *~sisu-markup-samples @@ -104,11 +104,11 @@ group{ *{Source}* -{~^ sisu_2.0.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz +{~^ sisu_2.0.4.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz -{~^ sisu_2.0.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3-1.diff.gz +{~^ sisu_2.0.4-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4-1.diff.gz -{~^ sisu_2.0.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3-1.dsc +{~^ sisu_2.0.4-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4-1.dsc }group @@ -116,15 +116,15 @@ group{ *{Debs}* -{~^ sisu_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.0.3-1_all.deb ~{
sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies
Depends: ruby (>=1.8.2), libwebrick-ruby
Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~ +{~^ sisu_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.0.4-1_all.deb ~{
sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies
Depends: ruby (>=1.8.2), libwebrick-ruby
Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~ -{~^ sisu-complete_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.0.3-1_all.deb ~{
a package that pulls in other packages to build the whole of sisu (excluding sisu-examples)
Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu
Recommends: sisu-examples }~ +{~^ sisu-complete_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.0.4-1_all.deb ~{
a package that pulls in other packages to build the whole of sisu (excluding sisu-examples)
Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu
Recommends: sisu-examples }~ -{~^ sisu-pdf_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.0.3-1_all.deb ~{
dependencies used by sisu to produce pdf from LaTeX generated
Depends: sisu, tetex-bin, tetex-extra, latex-ucs
Suggests: evince, xpdf }~ +{~^ sisu-pdf_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.0.4-1_all.deb ~{
dependencies used by sisu to produce pdf from LaTeX generated
Depends: sisu, tetex-bin, tetex-extra, latex-ucs
Suggests: evince, xpdf }~ -{~^ sisu-postgresql_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.0.3-1_all.deb ~{
dependencies used by sisu to populate postgresql database (further configuration is necessary)
Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby
Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~ +{~^ sisu-postgresql_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.0.4-1_all.deb ~{
dependencies used by sisu to populate postgresql database (further configuration is necessary)
Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby
Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~ -{~^ sisu-sqlite_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.0.3-1_all.deb ~{
dependencies used by sisu to populate sqlite database
Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby
Suggests: libdbd-sqlite }~ +{~^ sisu-sqlite_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.0.4-1_all.deb ~{
dependencies used by sisu to populate sqlite database
Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby
Suggests: libdbd-sqlite }~ }group @@ -154,7 +154,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/ sudo rpm -i [package name] -_* {~^ sisu-2.0.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.0.3-2.noarch.rpm ~{
created using alien }~ +_* {~^ sisu-2.0.4-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.0.4-2.noarch.rpm ~{
created using alien }~ _* {~^ sisu-markup-samples_1.0.10.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{
http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.10-1_all.deb
created using: alien -r sisu_0.70.5-1_all.deb }~ -- cgit v1.2.3