Merge branch 'upstream' into debian/sid

3 files changed, 31 insertions, 9 deletions

diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index f2772393..fde457d7 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,33 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
-%% 2.6.1.orig.tar.gz (2010-07-08:27/4)
+%% 2.6.2.orig.tar.gz (2010-07-15:28/4)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
+  sisu_2.6.2.orig.tar.gz
+  sisu_2.6.2-1.dsc
+  sisu_2.6.2-1.diff.gz
+
+  * param, header reading more robust (re: commented out parts)
+
+  * vim syntax, in bulleted and indented text recognize bold
+
+  * param, rights (all) add line breaks between copyright, license and other
+    rights
+
+  * texpdf, if no "copy @" info remove; rename left footer; asterisk issue
+
+  * sisu-harvest, alias for sisu --harvest (with man page)
+
+  * texpdf, codeblocks, left margin flush
+
+  * html_segments, line space between end of text and section bottom navigation
+    bar
+
+%% 2.6.1.orig.tar.gz (2010-07-09:27/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
-  sisu_2.6.1.orig.tar.gz
-  sisu_2.6.1-1.dsc
-  sisu_2.6.1-1.diff.gz
+  95fe09b870e23f922bf7d02b8aa83827ef9592f06f844ba4df5c808e283c8590 2728806 sisu_2.6.1.orig.tar.gz
+  bffd97dda3a8b4eb71201c47590ef363570f018a2517be359e28bcd9c82ff97c 1151 sisu_2.6.1-1.dsc
+  58c35da9a25d97a01e180404dbffe72de953139cab059db6a6aba69855a716bd 280583 sisu_2.6.1-1.diff.gz
 
   * markup samples moved to data/doc/sisu/v2/markup-samples
 
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 11636720..334d058c 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -1,6 +1,6 @@
 "SiSU Vim syntax file
 "SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-"SiSU Markup:     SiSU (sisu-2.6.0, 2010-07-07)
+"SiSU Markup:     SiSU (sisu-2.6.2, 2010-07-10)
 "(originally looked at Ruby Vim by Mirko Nasato)
 
 if version < 600
@@ -86,7 +86,7 @@ syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_co
 syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}image" oneline
 "some line operations
 syn region sisu_control contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace matchgroup=sisu_control start="\(\(^\| \)!_ \|<:b>\)" end="$"
-syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$"
+syn region sisu_normal contains=sisu_fontface,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$"
 syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$"
 "font face curly brackets
 "syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 6e8d23f7..e7f60c76 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.6.1
-:date_stamp: 2010w27/5
-:date: "2010-07-09"
+:version: 2.6.2
+:date_stamp: 2010w28/4
+:date: "2010-07-15"
 :project: SiSU