Fixed up vim filetype support (works nicely in etch and sid now)

diff --git a/debian/rules b/debian/rules
index 2ff2844ba825bcf25e5f09cb9abb0b4c01e891f7..62d28902dc76281d964c1f110da24637d60d2c4a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,36 +9,28 @@ export DH_OPTIONS
 clean:
        dh_testdir
        dh_testroot
-       dh_clean 
+       dh_clean
 
 binary:
        dh_testdir
        dh_testroot
-       dh_installchangelogs 
+       dh_installchangelogs
        dh_installdocs
        dh_installman tks.1
-       dh_compress 
+       dh_compress
        dh_fixperms
-       
+
        dh_installdeb
-       
+
        dh_installdirs
-       #dh_install
+       dh_install
+
        cp $(CURDIR)/tks.pl $(CURDIR)/debian/tks/usr/bin/tks
        cp -R $(CURDIR)/lib/WRMS* $(CURDIR)/debian/tks/usr/share/perl5
-       
-       # Vim auto-syntax-highlighting stuff
-       cp ext/vim/syntax/tks.vim \
-           $(CURDIR)/debian/tks/usr/share/vim/vim70/syntax/
-       cp ext/vim/syntax/tks.vim \
-           $(CURDIR)/debian/tks/usr/share/vim/vim71/syntax/
-       cp ext/vim/ftdetect/tks.vim               \
-           $(CURDIR)/debian/tks/usr/share/vim/addons/ftdetect/
-       
-       
+
        dh_gencontrol
        dh_md5sums
-       
+
        dh_builddeb
 
 .PHONY: build clean binary

diff --git a/debian/tks.dirs b/debian/tks.dirs
index 7f1513d2a486b0561bdf53f36118362ee191b8cd..7f51cdd5772ac70bca79d20d2be4b0b869b774c5 100644 (file)
--- a/debian/tks.dirs
+++ b/debian/tks.dirs
@@ -1,5 +1,5 @@
 usr/bin
 usr/share/perl5
-usr/share/vim/addons/ftdetect
-usr/share/vim/vim70/syntax
-usr/share/vim/vim71/syntax
+usr/share/tks
+usr/share/tks/vim
+usr/share/vim/registry

diff --git a/debian/tks.install b/debian/tks.install
new file mode 100644 (file)
index 0000000..a08920d
--- /dev/null
+++ b/debian/tks.install
@@ -0,0 +1,4 @@
+ext/vim/ftdetect    usr/share/tks/vim
+ext/vim/ftplugin    usr/share/tks/vim
+ext/vim/syntax      usr/share/tks/vim
+ext/vim/tks.yaml    usr/share/vim/registry

diff --git a/debian/tks.postinst b/debian/tks.postinst
new file mode 100644 (file)
index 0000000..e65b9ff
--- /dev/null
+++ b/debian/tks.postinst
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postinst script for tks
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+#DEBHELPER#
+
+case "$1" in
+    configure)
+
+        # Install vim plugin
+        for dir in ftdetect ftplugin syntax; do
+            # Ensure required vim plugin dirs exist
+            [ -d /var/lib/vim/addons/$dir ] || mkdir /var/lib/vim/addons/$dir
+
+            [ -L /var/lib/vim/addons/$dir/tks.vim ] || ln -fs /usr/share/tks/vim/$dir/tks.vim /var/lib/vim/addons/$dir/tks.vim
+        done
+
+        ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+        ;;
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+        ;;
+esac
+
+exit 0

diff --git a/debian/tks.postrm b/debian/tks.postrm
new file mode 100644 (file)
index 0000000..d7bdd6e
--- /dev/null
+++ b/debian/tks.postrm
@@ -0,0 +1,43 @@
+#!/bin/sh
+# postrm script for tks
+#
+# see: dh_installdeb(1)
+
+set -e
+
+#DEBHELPER#
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    purge)
+        # Uninstall vim plugin
+        for dir in ftdetect ftplugin syntax; do
+            [ -L /var/lib/vim/addons/$dir/tks.vim ] && rm /var/lib/vim/addons/$dir/tks.vim
+        done
+    ;;
+    remove)
+    ;;
+    failed-upgrade|abort-install|abort-upgrade|disappear|upgrade)
+    ;;
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+exit 0
+
+
+

diff --git a/ext/vim/ftdetect/tks.vim b/ext/vim/ftdetect/tks.vim
index 6efb04745c9d8e3cccb5a78d06aa6e7cabe6ca21..df11ec452eb3de44ed8cadafc80a37c36abf8245 100644 (file)
--- a/ext/vim/ftdetect/tks.vim
+++ b/ext/vim/ftdetect/tks.vim
@@ -1,2 +1,2 @@
 " detect tks filetype
-au BufRead,BufNewFile *.tks     set filetype=tks tabstop=16 shiftwidth=16 noexpandtab
+au BufRead,BufNewFile *.tks set filetype=tks

diff --git a/ext/vim/ftplugin/tks.vim b/ext/vim/ftplugin/tks.vim
new file mode 100644 (file)
index 0000000..5fe4d90
--- /dev/null
+++ b/ext/vim/ftplugin/tks.vim
@@ -0,0 +1,3 @@
+set tabstop=16
+set shiftwidth=16
+set noexpandtab

diff --git a/ext/vim/tks.yaml b/ext/vim/tks.yaml
new file mode 100644 (file)
index 0000000..fde2c98
--- /dev/null
+++ b/ext/vim/tks.yaml
@@ -0,0 +1,7 @@
+addon: tks
+description: "Syntax highlighting for TKS"
+basedir: /usr/share/tks/vim
+files:
+  - syntax/tks.vim
+  - ftplugin/tks.vim
+  - ftdetect/tks.vim