aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-07-22 18:18:03 +0100
committerRalph Amissah <ralph@amissah.com>2007-07-22 18:18:03 +0100
commitc07565064b23feda51810680ea7470e0d49176c3 (patch)
treedd6d017c03a7a35097dab2bc77a5fe010e485ca9
parentUpdated sisu-0.55.5 (diff)
parentvim directory moved from within addons (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG14
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/slate.vim (renamed from data/sisu/conf/editor-syntax-etc/vim/addons/colors/slate.vim)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/filetype.vim (renamed from data/sisu/conf/editor-syntax-etc/vim/addons/filetype.vim)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim (renamed from data/sisu/conf/editor-syntax-etc/vim/addons/ftplugin/sisu.vim)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim (renamed from data/sisu/conf/editor-syntax-etc/vim/addons/syntax/sisu.vim)0
5 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e49c2cfa..5efedcc5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,11 +6,19 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.55.6.orig.tar.gz (2007-07-28:30/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.6.orig.tar.gz
+ sisu_0.55.6.orig.tar.gz
+ sisu_0.55.6-1.dsc
+ sisu_0.55.6-1.diff.gz
+
+ * debian moved vim directory, installation to same locations
+
%% sisu_0.55.5.orig.tar.gz (2007-07-22:29/7)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.5.orig.tar.gz
- sisu_0.55.5.orig.tar.gz
- sisu_0.55.5-1.dsc
- sisu_0.55.5-1.diff.gz
+ cb4e98ced1d11f4ac8c84d80b773fe92 1268030 sisu_0.55.5.orig.tar.gz
+ 38da598ad949b3efc623b676f9826fe1 606 sisu_0.55.5-1.dsc
+ c5a9dacc9f8993553e0a78f927af2147 142162 sisu_0.55.5-1.diff.gz
* initialize output directory, fix (Closes: #434168)
[(a trivial but serious) bug introduced with changed use of variable in
diff --git a/data/sisu/conf/editor-syntax-etc/vim/addons/colors/slate.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/slate.vim
index 8350017e..8350017e 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/addons/colors/slate.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/slate.vim
diff --git a/data/sisu/conf/editor-syntax-etc/vim/addons/filetype.vim b/data/sisu/conf/editor-syntax-etc/vim/filetype.vim
index 917c3e04..917c3e04 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/addons/filetype.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/filetype.vim
diff --git a/data/sisu/conf/editor-syntax-etc/vim/addons/ftplugin/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index 00ed9189..00ed9189 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/addons/ftplugin/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
diff --git a/data/sisu/conf/editor-syntax-etc/vim/addons/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 9b2b562d..9b2b562d 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/addons/syntax/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim