adjustments to Rantfile and debian directory

4 files changed, 61 insertions, 133 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 94d740d8..bb82dcba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,37 @@ 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
   716601a80e8942d8cdc953e5cfa33237 1258642 sisu_0.54.1.orig.tar.gz
   a095bf0e84858e2e31a6fe474d1ab2b3 606 sisu_0.54.1-1.dsc
@@ -15,7 +45,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.1.orig.tar.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/Rantfile b/Rantfile
index bb733a6e..04063df5 100644
--- a/Rantfile
+++ b/Rantfile
@@ -1,75 +1,29 @@
 #!/usr/bin/env ruby
 raise 'Please, use ruby1.8.4 or later.' if RUBY_VERSION < '1.8.4'
 =begin
- Rantfile mapping setup.rb directory structure
+ Rantfile installer for SiSU
+ * Homepage: <http://www.jus.uio.no/sisu/SiSU> <http://www.sisudoc.org>
+ * Download:  <http://www.jus.uio.no/sisu/download>
 
- SiSU Simple information Structuring Universe, Serialised information, Structured Units
- * SiSU at present is for the Linux/Unix platform
- * See homepage at: <<  http://www.jus.uio.no/sisu/SiSU  >>
- * &  <<  http://www.jus.uio.no/sisu/download  >>
 
- Rant is a Ruby 'ant' by Stefan Lang
-
- For Setup/Installation SiSU uses either:
- * Minero Aoki's setup.rb, provided along with SiSU, or
- * Rant which may be downloaded and installed from:
-     http://make.rubyforge.org/
-
- * Name: Rant install/setup file for SiSU - Simple information Structuring Universe, Serialised information Structured Units
- *
- * Author: Ralph@Amissah.com
- * Description: Rant install/setup file which maps directory structure used by setup.rb
-   * arch-tag: Rant install/setup file which maps directory structure used by setup.rb
-   * $Id$
-
- Copyright (C) 2005 Ralph Amissah (first release edition)
- Copyright (C) 1997 Ralph Amissah (first edition)
-
- * License: GPL 2 or later
-
-  Summary of GPL 2
-
-  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 (at your option)
-  any later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
+ Copyright (C) 2007 Ralph Amissah
 
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * License: LGPL - GNU Lesser General Public License
+     [same license as Rant provided within the Rant package]
 
-  If you have Internet connection, the latest version of the GPL should be
-  available at these locations:
-    http://www.fsf.org/licenses/gpl.html
-    http://www.gnu.org/copyleft/gpl.html
-    http://www.jus.uio.no/sisu/gpl2.fsf
+ * Ralph Amissah <ralph@amissah.com>
+   Ralph Amissah <ralph.amissah@gmail.com>
 
-  SiSU was first released to the public on January 4th 2005
-
-  SiSU uses:
-
-  *  Standard SiSU markup syntax,
-  *  Standard SiSU meta-markup syntax, and the
-  *  Standard SiSU object citation numbering and system
+ Rant is a Ruby 'ant' by Stefan Lang
+ * Rant may be downloaded and installed from:
+     http://make.rubyforge.org/
 
-  © Ralph Amissah 1997, current 2005.
-  All Rights Reserved.
+ Notes on use:
 
- * Ralph Amissah mailto:ralph@amissah.com
-   Ralph Amissah mailto:amissah@gmail.com
+     rant -T
 
- * NOTE reminder to create independent setup file called install:
-     rant-import --auto install
-   then you can, as root (for default action):
-     ruby install
-   or for help on alternative actions:
-     ruby install help
-     ruby install -T
+ SiSU can also be Setup/Installation using:
+ * Minero Aoki's setup.rb, provided along with SiSU, or
 
 =end
 #%% produce a makefile suitable for the target platform
@@ -170,52 +124,6 @@ def setup_find_cp_r(dir_get,dir_put)                       #secondary, using rec
     end
   end
 end
-                                                           #%% using a single filelist
-#filelist broken in switch to rant from rake
-#filelist=Rant::FileList.new('bin/*','lib/**/*','conf/**/*','data/**/*','man/**/*')
-#filelist=Rant::FileList.new('bin/*','lib/**/*','conf/**/*','data/**/*','data/man/**/*')
-def dest(f)                                                #filelist mapping - note currently does not get 'data/man'
-  stub=f.scan(/^\S+?\/(\S+)/).join
-  place=case f
-  when /^bin/;        "#{@dir[:bin]}/#{stub}"
-  when /^lib/;        "#{@dir[:lib]}/#{stub}"
-  when /^conf/;       "#{@dir[:conf]}/#{stub}"
-  when /^data/;       "#{@dir[:data]}/#{stub}" unless f =~/^data\/sisu/
-  when /^share/;      "#{@dir[:share]}"
-  when /^man/;        "#{@dir[:man]}/#{stub}"
-  when /^vim/;        "#{@dir[:conf]}/#{stub}/vim"
-  else 'ERROR' #change
-  end
-end
-def setup_filelist_cp_r(filelist)                          #secondary, using recursive copy
-  filelist.sort.each do |f|
-    place=dest(f)
-    case
-    when File.file?(f)
-      cp_r(f,place)
-      chmod_util(place)
-    when File.directory?(f)
-      mkdir(place) unless FileTest.directory?(place)
-    end
-  end
-end
-def setup_filelist_create(filelist)                        #secondary
-  filelist.sort.each do |f|
-    place=dest(f)
-    action=case
-    when File.file?(f)
-      cp(f,place)
-      chmod_file(place)
-      "->  #{place}"
-    when File.directory?(f)
-      p place
-      File.mkpath(place) unless FileTest.directory?(place)
-      ".#{place}/"
-    else '?'
-    end
-    puts action
-  end
-end
 def rant_system_info
   puts <<WOK
   #{@proj[:platform_notice]}
@@ -392,15 +300,10 @@ desc "Help"
 task :help => [:project_help,:system_info,:rant_tasks,:pi?]
 #desc "Setup/Install #{@proj[:name]} (uses filelist)"
 task :install => [:default_notice,:project]
-#:install uses filelist which was broken in switch to rant from rake, look at later
-#task :install => [:install]
-task :install_a => [:rant_default1]
-task :install_b => [:rant_default2]
 task :install_bin => [:setup_bin]
 desc "[make rant install file]"
 task :create_rant_independent_task_file => [:rant_independence]
                                                            #%% setup/install tasks
-
 task :rant_independence do                                 #notice
   resp=''
   while resp.length < 4
@@ -429,9 +332,6 @@ end
 task :default_notice do                                    #notice
   default_notice
 end
-task :rant_default1 do                                     #secondary
-  setup_filelist_cp_r(filelist)
-end
 task :rant_default2 do                                     #secondary
   setup_find_cp_r('bin',@dir[:bin]) if File.directory?('bin')
   setup_find_cp_r('lib',@dir[:lib]) if File.directory?('lib')
@@ -441,9 +341,6 @@ task :rant_default2 do                                     #secondary
   setup_find_cp_r('data/vim',"#{@dir[:data]}/vim") if File.directory?('data/vim')
   setup_find_cp_r('man',@dir[:man]) if File.directory?('man')
 end
-task :install do                                           #secondary
-  setup_filelist_create(filelist)
-end
 task :setup_bin do                                         #bin
   setup_find_create('bin',@dir[:bin]) if File.directory?('bin')
 end
diff --git a/debian/data/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_debian.rb b/debian/data/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_debian.rb
index 58622bb4..61abfcc6 100644
--- a/debian/data/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_debian.rb
+++ b/debian/data/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_debian.rb
@@ -3,7 +3,7 @@
  * Author: Ralph@Amissah.com
    * http://www.jus.uio.no/sisu
    * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin for SiSU descriptive pages, ... 
+ * Description: Document skin for SiSU descriptive pages, ...
  * License: Same as SiSU see http://www.jus.uio.no/sisu
  * Notes: Site default appearance variables set in defaults.rb
      Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
@@ -26,7 +26,7 @@ module SiSU_Viz
       'http://www.debian.org/'
     end
     def url_site # used in pdf header
-      'http://www.debian.org' 
+      'http://www.debian.org'
     end
     def url_txt # text to go with url usually stripped url
       'www.debian.org'
@@ -36,7 +36,7 @@ module SiSU_Viz
     end
   #% color
     def color_band1
-      '"#ffffff"'      
+      '"#ffffff"'
     end
     def color_band2
       '"#ffffff"'
@@ -46,7 +46,7 @@ module SiSU_Viz
     	'&nbsp;Debian'
     end
     def txt_home
-      'Debian' 
+      'Debian'
     end
   #% icon
     def icon_home_button
diff --git a/debian/sisu.install b/debian/sisu.install
index 49319d78..50c9a5d1 100644
--- a/debian/sisu.install
+++ b/debian/sisu.install
@@ -1,5 +1,6 @@
 bin/ usr
 lib/sisu/ usr/lib/ruby/1.8
+lib/sisu/ usr/lib/ruby/1.9
 conf/sisu etc
 data/sisu usr/share
 data/doc/sisu usr/share/doc