Merge branch 'upstream' into debian/sid

3 files changed, 39 insertions, 30 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 9a134932..246cf38a 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,12 +13,21 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.4.orig.tar.gz (2011-03-11:10/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.4-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.4.orig.tar.gz
+  sisu_3.0.4.orig.tar.gz
+  sisu_3.0.4-1.dsc
+  sisu_3.0.4-1.debian.tar.gz
+
+  * sisu_manual, sisu_download, remove references to versions of sisu
+
 %% 3.0.3.orig.tar.gz (2011-03-11:10/5)
-http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.3-1
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.3-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz
-  sisu_3.0.3.orig.tar.gz
-  sisu_3.0.3-1.dsc
-  sisu_3.0.3-1.debian.tar.gz
+  a48f327ccf025582a5301a8e6a754891ff56c154843f5992d6b9d1cac97247be 1920600 sisu_3.0.3.orig.tar.gz
+  1546cd20167f21ad6cfe06246f059f5476f206ca393bf4bc32e41d65bb20b688 1216 sisu_3.0.3-1.dsc
+  d5f3c7631b3d81b7effec10fd188ebdb3ea21c88daff1c881c6a42967b76164e 281938 sisu_3.0.3-1.debian.tar.gz
 
   * dal_syntax and affected downstream output modules, revised pattern match
     for mail, (removes occasional interference with urls having embedded email
@@ -61,7 +70,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz
     * vim cleaning sisu.vim
 
 %% 3.0.2.orig.tar.gz (2011-03-05:09/6)
-http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.2-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz
   5211dcb37ab8aeb0889e3faaf567367f40f3b121a60cc6fd01fd78fe5adcd00d 1918497 sisu_3.0.2.orig.tar.gz
   b680fc9409d25149928a2b2067b60b610d0500ed93799e7d35f1b62642621f49 1216 sisu_3.0.2-1.dsc
@@ -105,7 +114,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz
     doc/skin_sisu.rb
 
 %% 3.0.1.orig.tar.gz (2011-02-16:07/3)
-http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.1-1
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.1-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.1.orig.tar.gz
   881a1fa51154c706c053c6cf136fbaa7c1f3abe96dd203dc649d42875dd55482 2716285 sisu_3.0.1.orig.tar.gz
   9320cf50485fdc05a7c1b12d1f85257a9d8b8cdbb31786589ec79e5aea5935bd 1216 sisu_3.0.1-1.dsc
@@ -121,7 +130,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.1.orig.tar.gz
   * sysenv & sisurc.yml: libreoffice, default odf reader
 
 %% 3.0.0.orig.tar.gz (2011-02-07:06/1)
-http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.0-1
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.0-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.0.orig.tar.gz
   53b9629bde5d27c504005ebc02c722d5d7d6cc3556e9dbfd1802dac682c52856 2716588 sisu_3.0.0.orig.tar.gz
   7cd26f5d70bb5bfac33d74dc69eb0d00bf5d3864612c984f5db3e1c2058635cb 1222 sisu_3.0.0-1.dsc
diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi
index e028a3cf..98000627 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi
@@ -13,7 +13,7 @@
  :issued: 2002-11-12
  :available: 2002-11-12
  :published: 2009-01-18
- :modified: 2011-02-07
+ :modified: 2011-03-11
 
 :A~? @title @creator
 
@@ -27,11 +27,9 @@
 
 3~source- Source (tarball tar.gz)
 
-_* {~^ sisu_2.5.1.orig.tar.gz (2010-06-12:23/6) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
+_* {~^ sisu_[version].orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/
 
-_* {~^ 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
-
-For installation notes see http://sisudoc.org/sisu/sisu_manual/installation.html
+_* {~^ sisu-markup-samples_[version].orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/
 
 For more general use see http://sisudoc.org/sisu/sisu_manual
 
@@ -70,47 +68,49 @@ deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
 
 }code
 
-group{
+*{Source}* available from
 
-*{Source}*
+http://www.jus.uio.no/sisu/pkg/src/
 
-{~^ sisu_2.5.1.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
+http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/
 
-{~^ sisu_2.5.1-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1-1.diff.gz
+http://www.sisudoc.org/sisu/archive/pool/main/s/sisu/
 
-{~^ sisu_2.5.1-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1-1.dsc
+sisu_[version].orig.tar.gz
 
-}group
+sisu_[version].debian.tar.gz
+
+sisu_[version].dsc
 
 group{
 
 *{Debs}*
 
-{~^ sisu_2.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.5.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_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ <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.7), 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.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.5.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-complete_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.7), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
 
-{~^ sisu-pdf_2.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.5.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-pdf_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ <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.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.5.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-postgresql_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib }~
 
-{~^ sisu-sqlite_2.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.5.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 }~
+{~^ sisu-sqlite_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ <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
 
 For changelogs see:
 
-_1 http://www.jus.uio.no/sisu/SiSU/changelog.html
+_1 http://www.sisudoc.org/sisu/SiSU/changelog.html
 
-_1 http://www.jus.uio.no/sisu/sisu_changelog/changelog.html
+_1 http://www.jus.uio.no/sisu/SiSU/changelog.html
 
 !_ non-free
 
 Book markup samples have been moved to non-free as the substantive text of the documents are available under the author or original publisher's license, and usually do not comply with the Debian Free Software Guidelines.
 
-_* {~^ sisu-markup-samples_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.3-1_all.deb ~{ <br>marked up documents and other examples related to sisu, a larger package containing a number of texts <br>Depends: sisu }~
+_* {~^ sisu-markup-samples_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/ ~{ <br>marked up documents and other examples related to sisu, a larger package containing a number of texts <br>Depends: sisu }~
 
-_* {~^ sisu-markup-samples_2.0.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.3-1.dsc ~{ <br>sisu-markup-samples_2.0.3-1.dsc }~
+_* {~^ sisu-markup-samples_[version].dsc }http://www.jus.uio.no/sisu/pkg/src/ ~{ <br>sisu-markup-samples_[version].dsc }~
 
 For changelogs see:
 
@@ -122,9 +122,9 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
 
 sudo rpm -i [package name]
 
-_* {~^ sisu-2.5.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.5.1-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-[version].noarch.rpm }http://www.jus.uio.no/sisu/pkg/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 }~
+_* {~^ sisu-markup-samples_[version].noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/ ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/ <br> created using: alien -r sisu_[version]_all.deb }~
 
 For changelogs see:
 
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 5b718b7c..8084e1f1 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.0.3-beta-rb1.9.2p180
+:version: 3.0.4-beta-rb1.9.2p180
 :date_stamp: 2011w10/5
 :date: "2011-03-11"
 :project: SiSU