aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2008-05-11 14:29:34 -0400
committerRalph Amissah <ralph@amissah.com>2008-05-11 14:29:34 -0400
commitf06b5e1378a198ec3359c733589e5bbc87de5581 (patch)
treea355369a161a47c3f8ebfc8bb1b671efe462b8a4
parentMerge branch 'upstream' into debian/sid (diff)
parentchangelog and version updated (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG2
-rw-r--r--conf/sisu/version.yml6
-rw-r--r--data/doc/sisu/CHANGELOG32
-rw-r--r--data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi24
-rw-r--r--lib/sisu/v0/hub.rb2
5 files changed, 46 insertions, 20 deletions
diff --git a/CHANGELOG b/CHANGELOG
index df1bf30b..9a667b42 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,7 +9,7 @@ Reverse Chronological:
%% STABLE MANIFEST
-%% sisu_0.66.3.orig.tar.gz (2008-05-10:18/6)
+%% sisu_0.66.3.orig.tar.gz (2008-05-11:18/7)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz
sisu_0.66.3.orig.tar.gz
sisu_0.66.3-1.dsc
diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml
index 7402f4a3..ded9517e 100644
--- a/conf/sisu/version.yml
+++ b/conf/sisu/version.yml
@@ -1,5 +1,5 @@
---
-:version: 0.66.2
-:date_stamp: 2008w16/5
-:date: "2008-04-25"
+:version: 0.66.3
+:date_stamp: 2008w18/0
+:date: "2008-05-11"
:project: SiSU
diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG
index 229f3575..9a667b42 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/CHANGELOG
@@ -9,11 +9,37 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.66.3.orig.tar.gz (2008-05-11:18/7)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz
+ sisu_0.66.3.orig.tar.gz
+ sisu_0.66.3-1.dsc
+ sisu_0.66.3-1.diff.gz
+
+ * sqlite3, problem with transaction commits and disconnecting from db
+ (including query and close), frustrating as sqlite is invaluable, bug has
+ arisen with attempt to upgrade sisu from use of sqlite2 to sqlite3, may be
+ within sisu [re-check connection requirements] but appears to be with
+ sqlite3 component of (libdbi-ruby, libdbm-ruby); writing on the net at
+ present suggests there may be a problem[1]; file bug report against
+ sisu-sqlite and against libdbd-sqlite3-ruby, libdbd-sqlite3-ruby1.8,
+ [1] http://www.sqlite.org/cvstrac/wiki?p=SqliteWrappers discussing
+ different program apis at this time writes the following on ruby-dbi (in
+ bold) "Ruby DBI (dbd_sqlite). This needs some work (see mailing list!)."
+
+ * sql, work on ability to create sql transaction file for manual sql commit
+
+ * particulars, introduced an abstraction for getting: basic environment;
+ document parameters; and machine coded document
+
+ * debian/control use debhelper version 7
+
+ * debian/control introduce vcs info git repo, browser
+
%% sisu_0.66.2.orig.tar.gz (2008-04-25:16/5)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.2.orig.tar.gz
- sisu_0.66.2.orig.tar.gz
- sisu_0.66.2-1.dsc
- sisu_0.66.2-1.diff.gz
+ 6af989ae3bc57889ce0e02eaa8d45d384fdec7ef 1496216 sisu_0.66.2.orig.tar.gz
+ 989f5cde491ee3890ce083461d0dbf769371c306 1003 sisu_0.66.2-1.dsc
+ d76cede86c178164c37a1f1b8f441c2ed48cf2fa 146135 sisu_0.66.2-1.diff.gz
* sisu-sqlite use sqlite3, unresolved issue finalizing transaction
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index 59eb6d66..f931b60c 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -18,9 +18,9 @@
@date.available: 2007-08-28
-@date.modified: 2008-03-30
+@date.modified: 2008-05-11
-@date: 2008-03-30
+@date: 2008-05-11
@level: new=C; break=1; num_top=1
@@ -55,7 +55,7 @@
Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
-_* {~^ sisu_0.66.1.orig.tar.gz (of 2008-03-30:12/7) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.1.orig.tar.gz
+_* {~^ sisu_0.66.3.orig.tar.gz (of 2008-03-30:12/7) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz
_* {~^ sisu-markup-samples_1.0.8.orig.tar.gz (of 2007-08-19:33/7 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.8.orig.tar.gz *~sisu-markup-samples
@@ -90,23 +90,23 @@ deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
!_ Source
-_* {~^ sisu_0.66.1.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.1.orig.tar.gz
+_* {~^ sisu_0.66.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz
-_* {~^ sisu_0.66.1-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.1-1.diff.gz
+_* {~^ sisu_0.66.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3-1.diff.gz
-_* {~^ sisu_0.66.1-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.1-1.dsc
+_* {~^ sisu_0.66.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3-1.dsc
!_ Debs
-_* {~^ sisu_0.66.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.66.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_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.66.3-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_0.66.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.66.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_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.66.3-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_0.66.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.66.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_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.66.3-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_0.66.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.66.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_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.66.3-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_0.66.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.66.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_0.66.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.66.3-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 }~
For changelogs see:
@@ -132,7 +132,7 @@ _1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_sam
The RPM is generated Alien~{ http://www.kitenet.net/programs/alien/ }~ from two deb packages (sisu and sisu-doc). Dependencies are not handled, not even that of the essential Ruby.
-_* {~^ sisu-0.66.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.66.1-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.66.1-1_all.deb }~
+_* {~^ sisu-0.66.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.66.3-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.66.3-1_all.deb }~
_* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> untested, created using alien }~
diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v0/hub.rb
index a9b616c1..af93c736 100644
--- a/lib/sisu/v0/hub.rb
+++ b/lib/sisu/v0/hub.rb
@@ -131,7 +131,7 @@ module SiSU
when /^source_kdissert$/; SiSU_Kdi_source::Source.new(@opt).read ## -S
when /^digests$/; SiSU_Digest_view::Source.new(@opt).read # -N
when /^xml_scaffold$/; SiSU_XML_scaffold::Source.new(@opt).read # -T
- when /^air$/; SiSU_Air::Source.new(@opt).read # -A
+ #when /^air$/; SiSU_Air::Source.new(@opt).read # -A
when /^plaintext$/; SiSU_Plaintext::Source.new(@opt).read # -a
when /^wikispeak$/; SiSU_Wikispeak::Source.new(@opt).read # -g
when /^odf$/; SiSU_ODF::Source.new(@opt).read # -o