diff options
author | Ralph Amissah <ralph@amissah.com> | 2010-05-26 19:18:48 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2010-05-26 19:18:48 -0400 |
commit | 95c75e73f9c0074a3e44fd9999661dc732f30080 (patch) | |
tree | 840a970c68e5ffd1937d5729d7c3149528d62eb6 /data/doc | |
parent | debian/changelog (2.4.0-1) (diff) | |
parent | update: changelog, version (2.4.1) (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'data/doc')
-rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 19 | ||||
-rw-r--r-- | data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi | 20 |
2 files changed, 26 insertions, 13 deletions
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 358c3762..06674687 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,11 +12,24 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.4.1.orig.tar.gz (2010-05-26:21/3) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz + sisu_2.4.1.orig.tar.gz + sisu_2.4.1-1.dsc + sisu_2.4.1-1.diff.gz + + * regex match, a number of http: matches needed to be extended to include + https: + * epub & odf, regex matching of http: should also match https: + * texpdf, https: url match with tilde, fix + * general extension of regex matches for http: to include https: + * dal_syntax fix, no auto-bold or italics on relative or internal links + %% 2.4.0.orig.tar.gz (2010-05-26:21/3) http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz - sisu_2.4.0.orig.tar.gz - sisu_2.4.0-1.dsc - sisu_2.4.0-1.diff.gz + 5a7ca024e36d9d08653e2cfe335e83345305c16e531de361d84ba3315739303b 2764579 sisu_2.4.0.orig.tar.gz + 33097b5afccfff9cfea9b08acea55741482ae6f6eca5aa9d2fd8d90661708e83 1145 sisu_2.4.0-1.dsc + e794c110c0ece2c08d6f0243142e7c941eb696ae5b1f649b9f01d44ad4b3533a 276166 sisu_2.4.0-1.diff.gz * sisu markup syntax added to, related to internal document links and relative links, see note on additions to vim syntax highlighting (version 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 5eb85969..2deb37c0 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 @@ -55,7 +55,7 @@ 3~source- Source (tarball tar.gz) -_* {~^ sisu_2.4.0.orig.tar.gz (2010-05-26:21/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz +_* {~^ sisu_2.4.1.orig.tar.gz (2010-05-26:21/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz _* {~^ sisu-markup-samples_2.0.3.orig.tar.gz (of 2010-05-01:17/6 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.3.orig.tar.gz *~sisu-markup-samples @@ -102,11 +102,11 @@ group{ *{Source}* -{~^ sisu_2.4.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz +{~^ sisu_2.4.1.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz -{~^ sisu_2.4.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0-1.diff.gz +{~^ sisu_2.4.1-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1-1.diff.gz -{~^ sisu_2.4.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0-1.dsc +{~^ sisu_2.4.1-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1-1.dsc }group @@ -114,15 +114,15 @@ group{ *{Debs}* -{~^ sisu_2.4.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.4.0-1_all.deb ~{ <br>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 <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~ +{~^ sisu_2.4.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.4.1-1_all.deb ~{ <br>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 <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~ -{~^ sisu-complete_2.4.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.4.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~ +{~^ sisu-complete_2.4.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.4.1-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~ -{~^ sisu-pdf_2.4.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.4.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~ +{~^ sisu-pdf_2.4.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.4.1-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~ -{~^ sisu-postgresql_2.4.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.4.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~ +{~^ sisu-postgresql_2.4.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.4.1-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~ -{~^ sisu-sqlite_2.4.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.4.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~ +{~^ sisu-sqlite_2.4.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.4.1-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~ }group @@ -152,7 +152,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/ sudo rpm -i [package name] -_* {~^ sisu-2.4.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.4.0-2.noarch.rpm ~{ <br>created using alien }~ +_* {~^ sisu-2.4.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.4.1-2.noarch.rpm ~{ <br>created using alien }~ _* {~^ sisu-markup-samples_2.0.3.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_2.0.3.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.3-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~ |