diff -Nru vim-7.3.429/debian/changelog vim-7.3.429/debian/changelog --- vim-7.3.429/debian/changelog 2012-03-12 06:05:28.000000000 +0000 +++ vim-7.3.429/debian/changelog 2012-05-03 21:26:38.000000000 +0000 @@ -1,3 +1,9 @@ +vim (2:7.3.429-2ubuntu2.1) precise-proposed; urgency=low + + * Add quantal to the deb{changelog,sources} hilighting (LP: #994208) + + -- Adam Conrad Fri, 27 Apr 2012 10:17:02 -0600 + vim (2:7.3.429-2ubuntu2) precise; urgency=low * debian/runtime/vimrc, debian/runtime/gvimrc: diff -Nru vim-7.3.429/debian/patches/series vim-7.3.429/debian/patches/series --- vim-7.3.429/debian/patches/series 2012-02-27 09:15:09.000000000 +0000 +++ vim-7.3.429/debian/patches/series 2012-04-27 16:16:06.000000000 +0000 @@ -6,7 +6,7 @@ upstream/extra-rst-detection.patch upstream/es.po-recover.patch upstream/pythoncomplete-autoload-init.patch -upstream/debian-runtime-precise.patch +upstream/debian-runtime-precise-quantal.patch upstream/debian-runtime-sections.patch debian/vim-tiny.patch debian/disabled-modelines.patch diff -Nru vim-7.3.429/debian/patches/upstream/debian-runtime-precise.patch vim-7.3.429/debian/patches/upstream/debian-runtime-precise.patch --- vim-7.3.429/debian/patches/upstream/debian-runtime-precise.patch 2012-02-04 22:55:46.000000000 +0000 +++ vim-7.3.429/debian/patches/upstream/debian-runtime-precise.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Index: b/runtime/syntax/debchangelog.vim -=================================================================== ---- a/runtime/syntax/debchangelog.vim -+++ b/runtime/syntax/debchangelog.vim -@@ -19,7 +19,7 @@ - " Define some common expressions we can use later on - syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ " - syn match debchangelogUrgency contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\=" --syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(lenny|squeeze)-%(backports%(-sloppy)=|volatile)|%(hardy|lucid|maverick|natty|oneiric)%(-%(security|proposed|updates|backports|commercial|partner))=)+" -+syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(lenny|squeeze)-%(backports%(-sloppy)=|volatile)|%(hardy|lucid|maverick|natty|oneiric|precise)%(-%(security|proposed|updates|backports|commercial|partner))=)+" - syn match debchangelogVersion contained "(.\{-})" - syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*" - syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*" -Index: b/runtime/syntax/debsources.vim -=================================================================== ---- a/runtime/syntax/debsources.vim -+++ b/runtime/syntax/debsources.vim -@@ -23,7 +23,7 @@ - - " Match uri's - syn match debsourcesUri +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' <>"]\++ --syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(lenny\|squeeze\|wheezy\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|hardy\|lucid\|maverick\|natty\|oneiric\)\([-[:alnum:]_./]*\)+ -+syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(lenny\|squeeze\|wheezy\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|hardy\|lucid\|maverick\|natty\|oneiric\|precise\)\([-[:alnum:]_./]*\)+ - - " Associate our matches and regions with pretty colours - hi def link debsourcesLine Error diff -Nru vim-7.3.429/debian/patches/upstream/debian-runtime-precise-quantal.patch vim-7.3.429/debian/patches/upstream/debian-runtime-precise-quantal.patch --- vim-7.3.429/debian/patches/upstream/debian-runtime-precise-quantal.patch 1970-01-01 00:00:00.000000000 +0000 +++ vim-7.3.429/debian/patches/upstream/debian-runtime-precise-quantal.patch 2012-04-27 16:14:47.000000000 +0000 @@ -0,0 +1,26 @@ +Index: b/runtime/syntax/debchangelog.vim +=================================================================== +--- a/runtime/syntax/debchangelog.vim ++++ b/runtime/syntax/debchangelog.vim +@@ -19,7 +19,7 @@ + " Define some common expressions we can use later on + syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ " + syn match debchangelogUrgency contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\=" +-syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(lenny|squeeze)-%(backports%(-sloppy)=|volatile)|%(hardy|lucid|maverick|natty|oneiric)%(-%(security|proposed|updates|backports|commercial|partner))=)+" ++syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(lenny|squeeze)-%(backports%(-sloppy)=|volatile)|%(hardy|lucid|maverick|natty|oneiric|precise|quantal)%(-%(security|proposed|updates|backports|commercial|partner))=)+" + syn match debchangelogVersion contained "(.\{-})" + syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*" + syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*" +Index: b/runtime/syntax/debsources.vim +=================================================================== +--- a/runtime/syntax/debsources.vim ++++ b/runtime/syntax/debsources.vim +@@ -23,7 +23,7 @@ + + " Match uri's + syn match debsourcesUri +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' <>"]\++ +-syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(lenny\|squeeze\|wheezy\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|hardy\|lucid\|maverick\|natty\|oneiric\)\([-[:alnum:]_./]*\)+ ++syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(lenny\|squeeze\|wheezy\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|hardy\|lucid\|maverick\|natty\|oneiric\|precise\|quantal\)\([-[:alnum:]_./]*\)+ + + " Associate our matches and regions with pretty colours + hi def link debsourcesLine Error