packages: vim-syntax-upstart/vim-syntax-upstart-keywords_and_pld.patch, vim...

[glen]

Author: glen                         Date: Sun Aug 14 09:51:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.3

---- Files affected:
packages/vim-syntax-upstart:
   vim-syntax-upstart-keywords_and_pld.patch (1.2 -> 1.3) , vim-syntax-upstart.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/vim-syntax-upstart/vim-syntax-upstart-keywords_and_pld.patch
diff -u packages/vim-syntax-upstart/vim-syntax-upstart-keywords_and_pld.patch:1.2 packages/vim-syntax-upstart/vim-syntax-upstart-keywords_and_pld.patch:1.3
--- packages/vim-syntax-upstart/vim-syntax-upstart-keywords_and_pld.patch:1.2	Fri May 21 08:35:54 2010
+++ packages/vim-syntax-upstart/vim-syntax-upstart-keywords_and_pld.patch	Sun Aug 14 11:51:43 2011
@@ -1,14 +1,12 @@
-diff -dur -x '*.orig' upstart-0.6.5.orig/contrib/vim/ftdetect/upstart.vim upstart-0.6.5/contrib/vim/ftdetect/upstart.vim
 --- upstart-0.6.5.orig/contrib/vim/ftdetect/upstart.vim	2009-10-23 22:47:27.000000000 +0200
 +++ upstart-0.6.5/contrib/vim/ftdetect/upstart.vim	2010-05-21 08:32:57.000000000 +0200
 @@ -1,2 +1,3 @@
  " Treat all /etc/init/*.conf files as upstart job files
  au BufNewFile,BufRead /etc/init/*.conf	set filetype=upstart
 +au BufNewFile,BufRead *.upstart	set filetype=upstart
-diff -dur -x '*.orig' upstart-0.6.5.orig/contrib/vim/syntax/upstart.vim upstart-0.6.5/contrib/vim/syntax/upstart.vim
---- upstart-0.6.5.orig/contrib/vim/syntax/upstart.vim	2009-10-23 22:47:27.000000000 +0200
-+++ upstart-0.6.5/contrib/vim/syntax/upstart.vim	2010-05-21 08:32:39.000000000 +0200
-@@ -14,6 +14,8 @@
+--- vim-syntax-upstart-1.3/contrib/vim/syntax/upstart.vim	2011-06-14 16:54:03.000000000 +0300
++++ vim-syntax-upstart-1.3/contrib/vim/syntax/upstart.vim	2011-08-14 12:47:44.534013176 +0300
+@@ -15,6 +15,8 @@
  elseif exists("b:current_syntax")
  	finish
  endif
@@ -16,38 +14,16 @@
 +setlocal iskeyword=@,48-57,-,.
  
  let is_bash = 1
- "unlet! b:current_syntax
-@@ -33,6 +35,7 @@
- " one argument
- syn keyword upstartStatement description author version
- syn keyword upstartStatement pid kill normal console env umask nice limit chroot chdir exec
-+syn keyword upstartStatement expect export
+ syn include @Shell syntax/sh.vim
+@@ -95,6 +97,11 @@
+ " upstart-socket-bridge
+ syn keyword upstartEvent socket
  
- " one or more arguments (events)
- syn keyword upstartStatement emits
-@@ -40,7 +43,7 @@
- syn keyword upstartStatement on start stop
- 
- " flag, no parameter
--syn keyword upstartStatement daemon respawn service instance
-+syn keyword upstartStatement daemon respawn service instance task
- 
- " prefix for exec or script 
- syn keyword upstartOption pre-start post-start pre-stop post-stop
-@@ -53,8 +56,15 @@
- syn keyword upstartOption limit
- " options for console
- syn keyword upstartOption logged output owner none
-+" options for expect
-+syn keyword upstartOption daemon fork stop
- 
--syn keyword upstartEvent startup stalled control-alt-delete kbdrequest starting started stopping stopped runlevel
-+syn keyword upstartEvent startup stalled control-alt-delete kbdrequest starting started stopping stopped runlevel 
-+
 +" PLD events
-+syn keyword upstartEvent pld.sysinit-done pld.shutdown-started 
-+syn keyword upstartEvent root-filesystem virtual-filesystems local-filesystems filesystem all-swaps
++syn keyword upstartEvent root-filesystem
++syn keyword upstartEvent pld.sysinit-done pld.shutdown-started
 +syn keyword upstartEvent pld.network-started pld.network-starting pld.network-stopped pld.network-stopping
- 
- hi def link upstartComment Comment
- hi def link upstartTodo	Todo
++
+ hi def link upstartComment   Comment
+ hi def link upstartTodo	     Todo
+ hi def link upstartString    String

================================================================
Index: packages/vim-syntax-upstart/vim-syntax-upstart.spec
diff -u packages/vim-syntax-upstart/vim-syntax-upstart.spec:1.5 packages/vim-syntax-upstart/vim-syntax-upstart.spec:1.6
--- packages/vim-syntax-upstart/vim-syntax-upstart.spec:1.5	Thu Jan 27 19:40:42 2011
+++ packages/vim-syntax-upstart/vim-syntax-upstart.spec	Sun Aug 14 11:51:43 2011
@@ -2,12 +2,12 @@
 %define		syntax upstart
 Summary:	Vim syntax: Varnish configuation Language
 Name:		vim-syntax-%{syntax}
-Version:	0.1
-Release:	4
+Version:	1.3
+Release:	1
 License:	GPL v2
 Group:		Applications/Editors/Vim
-Source0:	http://upstart.ubuntu.com/download/0.6/upstart-0.6.5.tar.gz
-# Source0-md5:	f9466bba72b655c2408353b64105853f
+Source0:	http://launchpad.net/upstart/1.x/1.3/+download/upstart-%{version}.tar.gz
+# Source0-md5:	7820797b64878c27115fff6a7398a6a9
 Patch0:		%{name}-keywords_and_pld.patch
 Requires:	vim-rt >= 4:7.2.411
 BuildArch:	noarch
@@ -42,6 +42,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/08/14 09:51:43  glen
+- up to 1.3
+
 Revision 1.5  2011/01/27 18:40:42  glen
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim-syntax-upstart/vim-syntax-upstart-keywords_and_pld.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim-syntax-upstart/vim-syntax-upstart.spec?r1=1.5&r2=1.6&f=u