diff -Nru vim-7.3.346/debian/changelog vim-7.3.346/debian/changelog --- vim-7.3.346/debian/changelog 2011-10-21 04:17:22.000000000 +0200 +++ vim-7.3.346/debian/changelog 2011-11-26 14:40:28.000000000 +0100 @@ -1,3 +1,16 @@ +vim (2:7.3.346-1ubuntu1) precise; urgency=low + + * Merge with Debian testing/unstable (lp: #896587). Remaining changes: + - debian/runtime/debian.vim.in: + + Add Launchpad integration to the Help menu if launchpad-integration is + installed. + - debian/runtime/vimrc: + + "syntax on" is a sane default for non-tiny vim + - debian/patches/debian/ubuntu-grub-syntax.patch: + + Add Ubuntu-specific "quiet" keyword. + + -- Michael Bienia Sat, 26 Nov 2011 14:40:17 +0100 + vim (2:7.3.346-1) unstable; urgency=low * Pull upstream tag v7-3-346 @@ -18,6 +31,29 @@ -- James McCoy Thu, 20 Oct 2011 22:17:16 -0400 +vim (2:7.3.333-1ubuntu2) precise; urgency=low + + * Rebuild for Perl 5.14. + + -- Colin Watson Tue, 15 Nov 2011 23:22:43 +0000 + +vim (2:7.3.333-1ubuntu1) precise; urgency=low + + * Merge with Debian testing/unstable; remaining changes: + - debian/rules: + + Work around ICE on ppc64 by exporting DEB_GCC_NO_O3=1. + - debian/runtime/debian.vim.in: + + Add Launchpad integration to the Help menu if launchpad-integration is + installed. + - debian/runtime/vimrc: + + "syntax on" is a sane default for non-tiny vim + - debian/patches/debian/ubuntu-grub-syntax.patch: + + Add Ubuntu-specific "quiet" keyword. + - debian/patches/debian/ubuntu-version.patch: + + Update supported Ubuntu codenames: add precise. + + -- Loïc Minier Mon, 17 Oct 2011 13:47:55 +0200 + vim (2:7.3.333-1) unstable; urgency=low * Pull upstream tag v7-3-333 @@ -75,6 +111,40 @@ -- James Vega Mon, 15 Aug 2011 06:35:08 -0400 +vim (2:7.3.154+hg~74503f6ee649-2ubuntu3) oneiric; urgency=low + + * Update patch debian/ubuntu-version to list new "precise" dist/series in + debchangelog and debsources.vim. + + -- Loïc Minier Thu, 06 Oct 2011 12:03:26 +0200 + +vim (2:7.3.154+hg~74503f6ee649-2ubuntu2) oneiric; urgency=low + + * No-change rebuild with perl 5.12 (lp: #778053) + + -- Michael Bienia Thu, 05 May 2011 20:38:12 +0200 + +vim (2:7.3.154+hg~74503f6ee649-2ubuntu1) oneiric; urgency=low + + * Merge with Debian unstable (lp: #774233) + * Remaining changes: + - debian/rules: + + Work around ICE on ppc64 by exporting DEB_GCC_NO_O3=1. + - debian/runtime/debian.vim.in: + + Add Launchpad integration to the Help menu if launchpad-integration is + installed. + - debian/runtime/vimrc: + + "syntax on" is a sane default for non-tiny vim + - debian/patches/debian/ubuntu-grub-syntax.patch: + + Add Ubuntu-specific "quiet" keyword. + - debian/patches/debian/ubuntu-version.patch: + + Update supported Ubuntu codenames: drop jaunty and karmic, add oneiric. + * debian/gvim.desktop: + Drop path and extension from the Icon filename to allow themes to change + the icon (lp: #740842). + + -- Michael Bienia Sat, 30 Apr 2011 17:21:30 +0200 + vim (2:7.3.154+hg~74503f6ee649-2) unstable; urgency=low * Remove upstream/Makefile-parallel.patch as many parallel invocations of @@ -128,6 +198,69 @@ -- James Vega Sat, 09 Apr 2011 19:18:27 -0400 +vim (2:7.3.035+hg~8fdc12103333-1ubuntu7) natty; urgency=low + + * Updated upstream/debian-runtime.patch to includes Multi-Arch field. + + -- Kees Cook Wed, 23 Mar 2011 22:45:53 -0700 + +vim (2:7.3.035+hg~8fdc12103333-1ubuntu6) natty; urgency=low + + * Update patch upstream/debian-runtime to also list oneiric in + runtime/syntax/debchangelog.vim and runtime/syntax/debsources.vim. + + -- Loïc Minier Wed, 23 Mar 2011 13:23:38 +0100 + +vim (2:7.3.035+hg~8fdc12103333-1ubuntu5) natty; urgency=low + + * runtime/syntax/upstart.vim: Improvements. + + -- James Hunt Fri, 11 Mar 2011 15:20:06 +0000 + +vim (2:7.3.035+hg~8fdc12103333-1ubuntu4) natty; urgency=low + + * runtime/syntax/upstart.vim: New syntax file for Upstart. + * runtime/filetype.vim: Updated to recognise Upstart configuration files. + + -- James Hunt Tue, 08 Mar 2011 12:14:56 +0000 + +vim (2:7.3.035+hg~8fdc12103333-1ubuntu3) natty; urgency=low + + * Work around ICE on ppc64 by exporting DEB_GCC_NO_O3=1. + + -- Colin Watson Fri, 18 Feb 2011 17:37:44 +0000 + +vim (2:7.3.035+hg~8fdc12103333-1ubuntu2) natty; urgency=low + + * No-change rebuild with Python 2.7 (lp: #688149). + + -- Michael Bienia Thu, 09 Dec 2010 17:24:51 +0100 + +vim (2:7.3.035+hg~8fdc12103333-1ubuntu1) natty; urgency=low + + * Merge with Debian unstable (lp: #662276): + - Use case-insensitive matching for month and day of week names in + crontab's syntax file (lp: #517019 aka Debian bug #568378). + - Fix sqlcomplete's / maps so they don't interfere with + normal usage (lp: #584797 aka Debian bug #560083). + - [7.2.386] KDE 3.1 focus hack causes problems for other window managers + (lp: #535341). + * Remaining changes: + - debian/control: + + Drop vim-lesstif package and lesstif2-dev build-dependency. + + Rename Vcs-* to XS-Debian-Vcs-*. + - debian/rules: + + Don't build the vim-lesstif variant in Ubuntu. + - debian/runtime/debian.vim.in: + + Add Launchpad integration to the Help menu if launchpad-integration is + installed. + - debian/runtime/vimrc: + + "syntax on" is a sane default for non-tiny vim + - debian/patches/debian/ubuntu-grub-syntax.patch: + + Add Ubuntu-specific "quiet" keyword. + + -- Michael Bienia Mon, 25 Oct 2010 10:55:05 +0200 + vim (2:7.3.035+hg~8fdc12103333-1) unstable; urgency=low * Pull patches 001 - 035. @@ -317,6 +450,57 @@ -- James Vega Tue, 18 May 2010 18:40:17 -0400 +vim (2:7.2.330-1ubuntu4) maverick; urgency=low + + * runtime/syntax/debchangelog.vim, runtime/syntax/debsources.vim: add natty + to allowed dists. + + -- Loïc Minier Tue, 28 Sep 2010 02:49:59 +0200 + +vim (2:7.2.330-1ubuntu3) lucid; urgency=low + + * runtime/syntax/debchangelog.vim, runtime/syntax/debsources.vim: add + maverick to allowed dists. + + -- Loïc Minier Fri, 16 Apr 2010 11:31:40 +0200 + +vim (2:7.2.330-1ubuntu2) lucid; urgency=low + + * debian/rules: Temporarily disable parallel building until we figure out + where it is broken (fixes the current FTBFS). + + -- Michael Bienia Mon, 08 Mar 2010 20:35:33 +0100 + +vim (2:7.2.330-1ubuntu1) lucid; urgency=low + + [ Michael Bienia ] + * Merge with Debian unstable (LP: #509900): + - Highlight Breaks in debian/control (LP: #498303). + - [7.2.257] GTK 2.17: lots of assertion error messages (LP: #402188). + * Remaining changes: + - debian/runtime/vimrc: "syntax on" is a sane default for non-tiny vim. + - runtime/syntax/debcontrol.vim: + + Add "metapackages" to the list of valid sections. + - runtime/syntax/grub.vim: + + Add Ubuntu-specific 'quiet' keyword. + - Drop vim-lesstif package and lesstif2-dev build-dependency. + - Enable Python interpreter on basic builds. + - Rename Vcs-* to XS-Debian-Vcs-*. + * runtime/ftplugin/debchangelog.vim: Use python-launchpadlib (and LP API) + instead of python-launchpad-bugs for bug completion for Ubuntu + (forwarded to Debian as bug #566841). + * src/configure.in, src/auto/configure: + As MODLIBS from python's config/Makefile includes LOCALMODLIBS which + shouldn't be used and breaks the build with newer python versions, use + BASEMODLIBS instead of MODLIBS (forwarded to Debian as bug #566842; + LP: #534251). + + [ Colin Watson ] + * Add Launchpad integration to the Help menu if launchpad-integration is + installed (LP: #453103). + + -- Colin Watson Mon, 08 Mar 2010 17:08:44 +0000 + vim (2:7.2.330-1) unstable; urgency=low * [34a85b6] Update README for patches 285 - 330 @@ -364,6 +548,33 @@ -- James Vega Sun, 08 Nov 2009 16:51:59 -0500 +vim (2:7.2.245-2ubuntu3) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Sun, 07 Mar 2010 01:10:27 +0100 + +vim (2:7.2.245-2ubuntu2) karmic; urgency=low + + * Add lucid as a valid suite in changelogs and sources.list. + * Rename Vcs-* to XS-Debian-Vcs-*. + + -- Loïc Minier Mon, 21 Sep 2009 13:07:03 +0200 + +vim (2:7.2.245-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #407038 + - debian/runtime/vimrc: "syntax on" is a sane default for non-tiny vim. + - runtime/syntax/debcontrol.vim: + + Add "metapackages" to the list of valid sections. + - runtime/syntax/grub.vim: + + Add Ubuntu-specific 'quiet' keyword. + - Drop vim-lesstif package and lesstif2-dev build-dependency. + - Enable Python interpreter on basic builds. + + -- Bhavani Shankar Fri, 21 Aug 2009 20:07:37 +0530 + vim (2:7.2.245-2) unstable; urgency=low * [5263ec7] Add Suggests: indent to vim-tiny since it will invoke indent @@ -441,6 +652,33 @@ -- James Vega Wed, 29 Jul 2009 20:18:17 +0200 +vim (2:7.2.148-2ubuntu2) karmic; urgency=low + + * Drop the changes to debian/runtime/debian.vim.in, which were no-ops + since these options are already disabled by default. Thanks to James + Vega for pointing this out. + + -- Steve Langasek Tue, 05 May 2009 18:45:52 +0000 + +vim (2:7.2.148-2ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/runtime/vimrc: "syntax on" is a sane default for non-tiny vim. + - runtime/syntax/debcontrol.vim: + + Add "metapackages" to the list of valid sections. + - runtime/syntax/grub.vim: + + Add Ubuntu-specific 'quiet' keyword. + - Drop vim-lesstif package and lesstif2-dev build-dependency. + - Enable Python interpreter on basic builds. + * Dropped changes, merged in Debian: + - Add jaunty, karmic to the list of valid suites. + - runtime/syntax/debsources.vim: + + Add "jaunty" to debsourcesDistrKeyword + - Create a .pot file for translations. + * Drop gutsy from the list of valid distro series, it's been EOLed. + + -- Steve Langasek Mon, 04 May 2009 11:13:42 +0000 + vim (2:7.2.148-2) unstable; urgency=low * [0657c8d] debian/rules: SHELL really does need to be bash... @@ -499,6 +737,52 @@ -- James Vega Thu, 05 Mar 2009 08:58:23 -0500 +vim (2:7.2.079-1ubuntu5) jaunty; urgency=low + + * Guard "syntax on" default so that it's only used if the syntax feature + is available, since /etc/vim/vimrc is sometimes used by vim-tiny too + (LP: #342174). + + -- Colin Watson Thu, 19 Mar 2009 15:16:10 +0000 + +vim (2:7.2.079-1ubuntu4) jaunty; urgency=low + + * Added karmic to the list of valid distro series. + + -- Soren Hansen Fri, 13 Mar 2009 16:07:45 +0100 + +vim (2:7.2.079-1ubuntu3) jaunty; urgency=low + + * debian/runtime/vimrc: "syntax on" is a sane default for non-tiny vim, + LP: #63172 + + -- Dustin Kirkland Thu, 05 Mar 2009 09:28:52 -0600 + +vim (2:7.2.079-1ubuntu2) jaunty; urgency=low + + * Rebuild for python2.6. + + -- Matthias Klose Mon, 02 Mar 2009 12:19:07 +0100 + +vim (2:7.2.079-1ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian (diversions fix closes LP: #296324). Remaining + changes: + - runtime/syntax/debcontrol.vim: + + Add "metapackages" to the list of valid sections. + - runtime/syntax/debchangelog.vim: + + Add "jaunty" to the list of valid suites. + - Drop vim-lesstif package and lesstif2-dev build-dependency. + - Enable Python interpreter on basic builds. + - Create a .pot file for translations. + - Disable autoindent, line-wrapping, and backup files by default. + - runtime/syntax/debsources.vim: + + Add "jaunty" to debsourcesDistrKeyword + - runtime/syntax/grub.vim: + + Add Ubuntu-specific 'quiet' keyword. + + -- Colin Watson Tue, 13 Jan 2009 18:39:18 +0000 + vim (2:7.2.079-1) unstable; urgency=low * [4d191a4] Update README for patches 50 - 065 @@ -548,6 +832,24 @@ -- James Vega Tue, 25 Nov 2008 23:38:38 -0500 +vim (2:7.2.025-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - runtime/syntax/debcontrol.vim: + + Add "metapackages" to the list of valid sections. + - runtime/syntax/debchangelog.vim: + + Add "jaunty" to the list of valid suites. + - Drop vim-lesstif package and lesstif2-dev build-dependency. + - Enable Python interpreter on basic builds. + - Create a .pot file for translations. + - Disable autoindent, line-wrapping, and backup files by default. + - runtime/syntax/debsources.vim: + + Add "jaunty" to debsourcesDistrKeyword + - runtime/syntax/grub.vim: + + Add Ubuntu-specific 'quiet' keyword. + + -- Soren Hansen Wed, 05 Nov 2008 11:37:43 +0100 + vim (2:7.2.025-2) unstable; urgency=low * Remove "deprecated" warnings about (g)vimrc.local from /etc/vim/(g)vimrc. @@ -759,6 +1061,45 @@ -- James Vega Thu, 26 Jun 2008 12:49:16 -0400 +vim (1:7.1.314-3ubuntu3) intrepid; urgency=low + + * runtime/syntax/grub.vim: + - Add Ubuntu-specific 'quiet' keyword. + * Remove some unnecessary divergence from Debian, thanks to James Vega + (LP: #248713): + - Remove explicit settings of textwidth=0 and nobackup, since those are + already the defaults. + - Remove explicit setting of viminfo to a subset of the default, thereby + adding s10 and h. + - Remove NoDisplay=true from gvim.desktop; vim-gui-common isn't + installed by default and there's no reason to withhold the menu entry + from those who have installed it (LP: #3222). + + -- Colin Watson Mon, 21 Jul 2008 14:22:09 +0100 + +vim (1:7.1.314-3ubuntu2) intrepid; urgency=low + + * Rebuild for libgpmg1 -> libgpm2 transistion. + + -- Steve Kowalik Sun, 20 Jul 2008 05:24:49 +1000 + +vim (1:7.1.314-3ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Enable detection of GNU screen as a mouse-capable terminal. + - Add NoDisplay=true to gvim.desktop. + - Drop vim-lesstif package and lesstif2-dev build-dependency. + - Build-depend on libxt-dev. + - Enable Python interpreter on basic builds. + - Create a .pot file for translations. + - Disable autoindent, line-wrapping, and backup files by default. + * Fixes various vulnerabilities due to improper quoting of 'execute' + arguments (LP: #240216). + * Drop fixes for upgrade problems from Ubuntu 6.06 LTS; direct upgrades + from 6.06 to 8.10 will not be supported. + + -- Colin Watson Thu, 26 Jun 2008 13:42:18 +0100 + vim (1:7.1.314-3) unstable; urgency=high * Update runtime files affected by the filename escape vulnerability. @@ -821,6 +1162,23 @@ -- James Vega Tue, 10 Jun 2008 22:28:10 -0400 +vim (1:7.1.293-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #234766), remaining changes: + - Enable detection of GNU screen as a mouse-capable terminal. + - Add NoDisplay=true to gvim.desktop. + - Drop vim-lesstif package and lesstif2-dev build-dependency. + - Build-depend on libxt-dev. + - Restore a number of Conflicts/Replaces and include + /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1}, both to help with upgrade + problems from 6.06. + - Enable Python interpreter on basic builds. + - Create a .pot file for translations. + - Disable autoindent, line-wrapping, and backup files by default. + - Omni completion for Launchpad bugs. + + -- Fabien Tassin Sun, 25 May 2008 14:10:50 +0200 + vim (1:7.1.293-3) unstable; urgency=low * runtime/syntax/debchangelog.vim,debsources.vim: @@ -846,6 +1204,32 @@ -- James Vega Sun, 04 May 2008 14:11:17 -0400 +vim (1:7.1.293-2ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian (LP: #183935); thanks to James Vega for + including a number of our changes! Remaining changes: + - Enable detection of GNU screen as a mouse-capable terminal. + - Add NoDisplay=true to gvim.desktop. + - Drop vim-lesstif package and lesstif2-dev build-dependency. + - Build-depend on libxt-dev. + - Restore a number of Conflicts/Replaces and include + /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1}, both to help with upgrade + problems from 6.06. + - Enable Python interpreter on basic builds. + - Create a .pot file for translations. + - Disable autoindent, line-wrapping, and backup files by default. + - Add intrepid to lists of Ubuntu distributions. + - Add metapackages to list of allowed debian/control sections. + - Add omni completion support for Launchpad bugs via + python-launchpad-bugs. + * Improve omni completion for Launchpad and debbugs, so that it allows + completion of bug number parts (base), e.g. + "LP:#1" will include all bugs from the package + beginning with "1". Previously, this would have invoked a completion + using debbugs (thanks, Daniel Hahler; LP: #196112). + + -- Colin Watson Thu, 01 May 2008 21:56:46 +0100 + vim (1:7.1.293-2) unstable; urgency=low * debian/rules: @@ -1246,6 +1630,73 @@ -- James Vega Mon, 03 Dec 2007 15:53:27 -0500 +vim (1:7.1-138+1ubuntu3) hardy; urgency=low + + * patches/debchangelog_launchpad.diff: + - Add omni completion support for Launchpad bugs via + python-launchpad-bugs. + + -- Colin Watson Thu, 31 Jan 2008 10:59:03 +0000 + +vim (1:7.1-138+1ubuntu2) hardy; urgency=low + + * debian/control: + - re-add the removed conflicts/replaces that apply for the + dapper->hardy upgrades + + -- Michael Vogt Tue, 20 Nov 2007 14:01:58 +0100 + +vim (1:7.1-138+1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/runtime/debian.vim.in: + - Disable autoindent, linebreak and backup files + + debian/rules: + - Enable pythoninterpreter on basic builds + - Skip -lesstif variant + - Create a .pot file for translations + - Use bzip2 compression for vim-runtime + + debian/vim-common.dirs: + - Include /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1} to help with + upgrade problems from dapper; retain this until at least the first + Ubuntu LTS release after 6.06 + + debian/gvim.desktop: + - Add NoDisplay=true + + debian/control: + - DebianMaintainerField + - Drop lesstif2-dev from Build-Depends + - Add libxt-dev to Build-Depends to fix build + - Drop vim-lesstif package + + patches/debcontrol.vim.diff: + - Add XSBC-Original-Maintainer as legal field + + patches/900_debcontrol.vim.diff: + - Add restricted, universe, multiverse, and metapackages to allowed + sections + + patches/screen-mouse-support.diff: + - Enable detection of GNU screen as a mouse-capable terminal + (LP #113227) + + patches/901_debchangelog.vim.diff: + - Add warty, hoary, breezy, dapper, edgy, feisty, gutsy, hardy, + *-proposed, *-updates, *-security, *-backports, *-commercial, and + *-partner to allowed distributions. + + patches/add-ubuntu-sources.diff: + - Add restricted, universe, multiverse to allowed sections + - Add dapper, edgy, feisty, gutsy, hardy, *-proposed, *-updates, + *-security, *-backports, *-commercial, and *-partner to allowed + distributions. + + patches/debchangelog_launchpad.diff: + - Highlight Launchpad bug-closing syntax in debian/changelog files. + * New changes: + + debian/control: + - Add dpkg-dev (>= 1.13.19) dependency (Debian removed it because + stable has new enough dpkg-dev, but Dapper doesn't, so we keep it) + * The following changes were dropped: + + debian/control: + - Pre-Depend on dpkg with bzip2 support (oldest support release has this + already) + + -- Soren Hansen Fri, 19 Oct 2007 15:37:56 +0200 + vim (1:7.1-138+1) unstable; urgency=medium [ Debian Vim Maintainers ] @@ -1306,6 +1757,55 @@ -- James Vega Sun, 07 Oct 2007 15:47:26 -0400 +vim (1:7.1-056+2ubuntu2) gutsy; urgency=low + + * Trigger rebuild for hppa + + -- LaMont Jones Thu, 04 Oct 2007 12:26:15 -0600 + +vim (1:7.1-056+2ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/runtime/debian.vim.in: + - Disable autoindent, linebreak and backup files + + debian/rules: + - Enable pythoninterpreter on basic builds + - Skip -lesstif variant + - Create a .pot file for translations + - Use bzip2 compression for vim-runtime + + debian/vim-common.dirs: + - Include /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1} to help with + upgrade problems from dapper; retain this until at least the first + Ubuntu LTS release after 6.06 + + debian/gvim.desktop: + - Add NoDisplay=true + + debian/control: + - DebianMaintainerField field + - Drop lesstif2-dev from Build-Depends + - Add libxt-dev to Build-Depends to fix build + - Pre-Depend on dpkg with bzip2 support + - Drop vim-lesstif package + + patches/debcontrol.vim.diff: + - Add XSBC-Original-Maintainer as legal field + + patches/900_debcontrol.vim.diff: + - Add restricted, universe, multiverse, and metapackages to allowed + sections + + patches/901_debchangelog.vim.diff: + - Add warty, hoary, breezy, dapper, edgy, feisty, gutsy, *-proposed, + *-updates, *-security, *-backports, and *-commercial to allowed + distributions. + + patches/add-ubuntu-sources.diff: + - Add restricted, universe, multiverse to allowed sections + - Add dapper, edgy, feisty, gutsy, *-proposed, *-updates, *-security, + and *-backports to allowed distributions. + + patches/debchangelog_launchpad.diff: + - Highlight Launchpad bug-closing syntax in debian/changelog files. + + patches/screen-mouse-support.diff: + - Enable detection of GNU screen as a mouse-capable terminal + (LP #113227) + + -- Soren Hansen Tue, 28 Aug 2007 17:02:33 +0200 + vim (1:7.1-056+2) unstable; urgency=low * Brown paper bag release -- vimrc.tiny should not be calling :let since @@ -1365,6 +1865,52 @@ -- James Vega Wed, 08 Aug 2007 00:18:16 -0400 +vim (1:7.1-022+1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/runtime/debian.vim.in: + - disable autoindent and backup files + + debian/rules: + - enable pythoninterpreter on basic builds + - skip -lesstif and -full variants + - remove references to vim-full package + - create a .pot file for translations + - use bzip2 compression for vim-runtime + + debian/vim-common.dirs: + - include /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1} to help with + upgrade problems from dapper; retain this until at least the first + Ubuntu LTS release after 6.06 + + debian/gvim.desktop: + - add NoDisplay=true + + debian/control: + - DebianMaintainerField field + - drop lesstif2-dev from Build-Depends + - add libxt-dev to Build-Depends to fix build + - pre-depend on dpkg with bzip2 support + - drop vim-lesstif package + + patches/debcontrol.vim.diff: + - add XSBC-Original-Maintainer as legal field + + patches/add-ubuntu-sources.diff: + - add restricted, universe, multiverse to allowed sections + - add dapper, edgy, feisty, gutsy, *-proposed, *-updates, *-security, + and *-backports to allowed distributions. + + patches/901_debchangelog.vim.diff: + - add warty, hoary, breezy, dapper, edgy, feisty, gutsy, *-proposed, + *-updates, *-security, *-backports, and *-commercial to allowed + distributions. + + patches/900_debcontrol.vim.diff: + - add restricted, universe, multiverse, and metapackages to allowed + sections + + patches/screen-mouse-support.diff: + - Enable detection of GNU screen as a mouse-capable terminal + (LP #113227) + + patches/debchangelog_launchpad.diff: + - Highlight Launchpad bug-closing syntax in debian/changelog files. + * Dropped debian/kubuntu_01_xdg_menus.diff (hasn't been used in years) and + patches/proc-filetype-detection-fix.diff (applied upstream). + + -- Soren Hansen Fri, 13 Jul 2007 15:32:59 +0200 + vim (1:7.1-022+1) unstable; urgency=low [ Debian Vim Maintainers ] @@ -1420,6 +1966,60 @@ -- James Vega Sat, 07 Jul 2007 15:04:57 -0400 +vim (1:7.1-000+1ubuntu2) gutsy; urgency=low + + [ Micah Cowan ] + * patches/screen-mouse-support.diff: + - Enable detection of GNU screen as a mouse-capable terminal + (LP: #113227) + * patches/proc-filetype-detection-fix.diff: + - Fix detection of files of type Oracle ProC (LP: #86916) + + [ Colin Watson ] + * patches/debchangelog_launchpad.diff: + - Highlight Launchpad bug-closing syntax in debian/changelog files. + + -- Colin Watson Wed, 04 Jul 2007 04:38:55 +0100 + +vim (1:7.1-000+1ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + + debian/runtime/debian.vim.in: + - disable autoindent and backup files + + patches/debcontrol.vim.diff: + - add XSBC-Original-Maintainer as legal field + + patches/900_debcontrol.vim.diff: + - add restricted, universe, multiverse, and metapackages to allowed + sections + + patches/901_debchangelog.vim.diff: + - add breezy, dapper, edgy, feisty, gutsy, *-proposed, *-updates, + *-security, *-backports, and dapper-commercial to allowed + distributions + + patches/add-ubuntu-sources.diff: + - add restricted, universe, multiverse to allowed sections + - add dapper, edgy, feisty, gutsy, *-proposed, *-updates, *-security, + and *-backports to allowed distributions + + debian/control: + - drop lesstif2-dev from Build-Depends + - drop vim-lesstif package + - add libxt-dev to Build-Depends to fix build + - pre-depend on dpkg with bzip2 support + - Ubuntu-specific Maintainer field + + debian/rules: + - enable pythoninterpreter on basic builds + - skip -lesstif and -full variants + - remove references to vim-full package + - create a .pot file for translations + - use bzip2 compression for vim-runtime + + debian/gvim.desktop: + - add NoDisplay=true + + debian/vim-common.dirs: + - include /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1} to help with + upgrade problems from dapper; retain this until at least the first + Ubuntu LTS release after 6.06 + + -- Colin Watson Thu, 24 May 2007 13:12:54 +0100 + vim (1:7.1-000+1) unstable; urgency=low [ Debian Vim Maintainers ] @@ -1453,6 +2053,56 @@ -- James Vega Sat, 12 May 2007 13:24:27 -0400 +vim (1:7.0-219+1ubuntu2) gutsy; urgency=low + + [ Soren Hansen ] + * patches/901_debchangelog.vim.diff: + - Simplify regex for Ubuntu distributions. + + -- Colin Watson Fri, 20 Apr 2007 21:25:54 +0100 + +vim (1:7.0-219+1ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + + debian/runtime/debian.vim.in: + - disable autoindent and backup files + + patches/debcontrol.vim.diff: + - add XSBC-Original-Maintainer as legal field + + patches/900_debcontrol.vim.diff: + - add restricted, universe, multiverse, and metapackages to allowed + sections + + patches/901_debchangelog.vim.diff: + - add breezy, dapper, edgy, feisty, *-proposed, *-updates, *-security, + *-backports, and dapper-commercial to allowed distributions + + patches/add-ubuntu-sources.diff: + - add restricted, universe, multiverse to allowed sections + - add dapper, edgy, feisty, *-proposed, *-updtaes, *-security, and + *-backports to allowed distributions + + debian/control: + - drop lesstif2-dev from Build-Depends + - drop vim-lesstif package + - add libxt-dev to Build-Depends to fix build + - pre-depend on dpkg with bzip2 support + - Ubuntu-specific Maintainer field + + debian/rules: + - enable pythoninterpreter on basic builds + - skip -lesstif and -full variants + - remove references to vim-full package + - create a .pot file for translations + - use bzip2 compression for vim-runtime + + debian/gvim.desktop: + - add NoDisplay=true + + debian/vim-common.dirs: + - include /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1} to help with + upgrade problems from dapper; retain this until at least the first + Ubuntu LTS release after 6.06 + * patches/901_debchangelog.vim.diff: Add gutsy, gutsy-security, + gutsy-proposed, gutsy-updates, and gutsy-backports targets. + * patches/add-ubuntu-sources.diff: Add gutsy distribution. + * patches/cindent-fix.patch: Remove; this is upstream patch 7.0.211. + + -- Colin Watson Fri, 20 Apr 2007 19:24:56 +0100 + vim (1:7.0-219+1) unstable; urgency=low [ Debian Vim Maintainers ] @@ -1499,6 +2149,78 @@ -- James Vega Thu, 4 Jan 2007 01:50:25 -0500 +vim (1:7.0-164+1ubuntu7) feisty; urgency=low + + * Add XSBC-Original-Maintainer to debcontrol syntax highlighting. + + -- Soren Hansen Sat, 10 Mar 2007 22:07:48 +0100 + +vim (1:7.0-164+1ubuntu6) feisty; urgency=low + + * Ubuntu-specific Maintainer field (really, this time saving + the control file before building the package). + + -- Ian Jackson Tue, 20 Feb 2007 16:45:18 +0000 + +vim (1:7.0-164+1ubuntu5) feisty; urgency=low + + * Re-upload with .orig.tar.gz as intended, and bump version number. + * Ubuntu-specific Maintainer field. + + -- Ian Jackson Tue, 20 Feb 2007 14:13:33 +0000 + +vim (1:7.0-164+1ubuntu4) feisty; urgency=low + + * Include /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1} in the + vim-common package which will help with some upgrade problems (LP + #84906). These directories should be retained until at least the + first Ubuntu LTS release after 6.06, to smooth upgrades from Dapper. + + -- Ian Jackson Tue, 20 Feb 2007 12:31:22 +0000 + +vim (1:7.0-164+1ubuntu3) feisty; urgency=low + + * Use bzip2 compression for vim-runtime, saving about 1MB of .deb size. + + -- Colin Watson Tue, 30 Jan 2007 16:08:49 +0000 + +vim (1:7.0-164+1ubuntu2) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Sun, 14 Jan 2007 16:25:53 +0000 + +vim (1:7.0-164+1ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + + debian/runtime/debian.vim.in: + - disable autoindent and backup files + + patches/900_debcontrol.vim.diff: + - add restricted, universe, multiverse, and metapackages to allowed + sections + + patches/901_debchangelog.vim.diff: + - add breezy, dapper, edgy, feisty, *-proposed, *-updates, *-security, + *-backports, and dapper-commercial to allowed distributions + + patches/add-ubuntu-sources.diff: + - add restricted, universe, multiverse to allowed sections + - add dapper, edgy, feisty, *-proposed, *-updtaes, *-security, and + *-backports to allowed distributions + + patches/cindent-fix.patch: + - added again + + debian/control: + - drop lesstif2-dev from Build-Depends + - drop vim-lesstif package + - add libxt-dev to Build-Depends to fix build + + debian/rules: + - enable pythoninterpreter on basic builds + - skip -lesstif and -full variants + - remove references to vim-full package + - create a .pot file for translations + + debian/gvim.desktop: + - add NoDisplay=true + + -- Colin Watson Fri, 15 Dec 2006 12:15:18 +0000 + vim (1:7.0-164+1) unstable; urgency=low [ Debian Vim Maintainers ] @@ -1561,6 +2283,18 @@ -- Stefano Zacchiroli Wed, 25 Oct 2006 17:07:37 +0200 +vim (1:7.0-122+1ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. + * patches/900_debcontrol.vim.diff: Add metapackages section. + * patches/901_debchangelog.vim.diff: Add dapper-proposed, edgy-proposed, + feisty, feisty-security, feisty-proposed, feisty-updates, and + feisty-backports targets. + * patches/add-ubuntu-sources.diff: Add feisty, *-proposed, and *-backports + distributions. + + -- Colin Watson Fri, 27 Oct 2006 11:57:31 +0100 + vim (1:7.0-122+1) unstable; urgency=medium [ Debian Vim Maintainers ] @@ -1625,6 +2359,41 @@ -- Stefano Zacchiroli Sun, 10 Sep 2006 11:59:14 +0200 +vim (1:7.0-035+1ubuntu5) edgy; urgency=low + + * Backport from Debian (James Vega, closes: Malone #66733): + - Build vim-tiny with multibyte support. (closes: #361378) + + -- Colin Watson Wed, 18 Oct 2006 18:43:57 +0100 + +vim (1:7.0-035+1ubuntu4) edgy; urgency=low + + * patches/901_debchangelog.vim.diff: Add *-backports and + dapper-commercial. + + -- Colin Watson Mon, 11 Sep 2006 15:52:54 +0100 + +vim (1:7.0-035+1ubuntu3) edgy; urgency=low + + * patches/901_debchangelog.vim.diff: Fix a couple of misplaced spaces so + that dapper and edgy-updates are highlighted properly. + + -- Colin Watson Mon, 11 Sep 2006 13:53:48 +0100 + +vim (1:7.0-035+1ubuntu2) edgy; urgency=low + + * patches/add-ubuntu-sources.diff: + + Add Ubuntu specific parts to the sources.list syntax highlighting. + Thanks to Karl Goetz for the patch (Ubuntu: #30796) + + -- Sebastian Dröge Sat, 22 Jul 2006 17:13:23 +0200 + +vim (1:7.0-035+1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Martin Pitt Wed, 12 Jul 2006 15:16:50 +0200 + vim (1:7.0-035+1) unstable; urgency=low [ Debian Vim Maintainers ] @@ -1646,6 +2415,45 @@ -- James Vega Mon, 3 Jul 2006 01:43:11 -0400 +vim (1:7.0-017+8ubuntu2) edgy; urgency=low + + * Cleaned up cruft in debian/rules diff. + * Build vim-full, since we can build it in main. + * Restore old changelog entries. + * patches/901_debchangelog: Add *-security and *-updates pockets for Ubuntu + releases. + + -- Martin Pitt Thu, 29 Jun 2006 12:47:54 +0200 + +vim (1:7.0-017+8ubuntu1) edgy; urgency=low + + * Sync with Debian: + Remaining Ubuntu Changes + + debian/runtime/debian.vim.in: + - disable autoindent and backup files + + patches/debcontrol.vim.diff: + - add restricted, universe, multiverse to allowed sections + + patches/debsources.vim.diff: + - add restricted, universe, multiverse to allowed sections + - add dapper and edgy to allowed distributions + + patches/debchangelog.syntax.vim.diff: + - add breezy, dapper and edgy to allowed distributions + + debian/control: + - drop lesstif2-dev from Build-Depends + - drop vim-lesstif and vim-full packages + - add libxt-dev to Build-Depends to fix build + + debian/rules: + - enable pythoninterpreter on basic builds + - skip -lesstif and -full variants + - remove references to vim-full package + - create a .pot file for translations + + debian/gvim.desktop: + - add NoDisplay=true + + patch/cindent-fix.patch: + - added again + + -- Sebastian Dröge Wed, 28 Jun 2006 00:58:52 +0200 + vim (1:7.0-017+8) unstable; urgency=medium * Rebuild with fixed libruby1.8. Urgency medium since vim-full and vim-ruby @@ -1973,6 +2781,50 @@ -- James Vega Wed, 8 Feb 2006 15:11:37 -0500 +vim (1:6.4-006+2ubuntu6) dapper; urgency=low + + * debian/rules: Create a POT file on build. + + -- Martin Pitt Tue, 23 May 2006 11:39:49 +0200 + +vim (1:6.4-006+2ubuntu5) dapper; urgency=low + + * Apply patch from Ryan Lortie to fix Ubuntu #44431. + * Also add edgy to the Ubuntu releases list. + + -- Scott James Remnant Thu, 18 May 2006 06:11:48 +0100 + +vim (1:6.4-006+2ubuntu4) dapper; urgency=low + + * Reduce the vim alternative to 35 priority, it was having ideas + somewhat above its station. + + -- Scott James Remnant Thu, 27 Apr 2006 23:21:42 +0100 + +vim (1:6.4-006+2ubuntu3) dapper; urgency=low + + * debian/updates/deb{control,sources}.vim: Add Ubuntu releases and + components. Thanks to Karl Goetz and + Barry deFreese for their initial patches. + Closes: LP#30796 + + -- Martin Pitt Wed, 26 Apr 2006 20:49:31 +0200 + +vim (1:6.4-006+2ubuntu2) dapper; urgency=low + + * Reenable vim-ruby since we can now build it in main. + + -- Daniel Silverstone Thu, 23 Mar 2006 12:32:25 +0000 + +vim (1:6.4-006+2ubuntu1) dapper; urgency=low + + * Synchronize with Debian unstable. + * Convert Ubuntu patches to use quilt. + * Re-register alternative for `editor'. + * Install .desktop file again, add attribute NoDisplay=true. + + -- Matthias Klose Thu, 2 Feb 2006 13:55:52 +0000 + vim (1:6.4-006+2) unstable; urgency=low [ Norbert Tretkowski ] @@ -2093,6 +2945,35 @@ -- Debian VIM Maintainers Sun, 23 Oct 2005 16:03:43 +0200 +vim (1:6.4-001+2ubuntu3) dapper; urgency=low + + * Drop GTK support in vim-basic again, to stop blowing out ubuntu-minimal. + + -- Adam Conrad Thu, 10 Nov 2005 12:28:39 -0500 + +vim (1:6.4-001+2ubuntu2) dapper; urgency=low + + * Remove .desktop items -- oops. + * Re-enable GTK support in vim-basic. + + -- Daniel Stone Fri, 28 Oct 2005 09:44:51 +1000 + +vim (1:6.4-001+2ubuntu1) dapper; urgency=low + + * Resync with Debian. + * Add 'dapper' to the list of supported distribution keywords. + * Drop patch #990, as it has been merged upstream. + + -- Daniel Stone Tue, 25 Oct 2005 07:57:58 +1000 + +vim (1:6.4-001+2) unstable; urgency=low + + [ Stefano Zacchiroli ] + * Fixed debian/runtime/vimrc, last version broke some plugins behaviour + (e.g. gzip, netrw) on files specified on cmdline. + + -- Debian VIM Maintainers Sun, 23 Oct 2005 16:03:43 +0200 + vim (1:6.4-001+1) unstable; urgency=low [ Debian VIM Maintainers ] @@ -2275,6 +3156,32 @@ -- Debian VIM Maintainers Thu, 28 Jul 2005 12:16:06 +0200 +vim (1:6.3-078+1ubuntu3) breezy; urgency=low + + * Rebuild for the cairo1 -> cairo2 transition. + + -- Adam Conrad Tue, 23 Aug 2005 01:57:09 +1000 + +vim (1:6.3-078+1ubuntu2) breezy; urgency=low + + * SECURITY UPDATE: Fix code execution. + * Add debian/patches/990_modeline_codeexec.diff: + - Do not execute code in glob() and expand() statements when we read them + from a modeline. + - Combined upstream patches 6.3.081 and 6.3.082. + - References: + http://www.guninski.com/where_do_you_want_billg_to_go_today_5.html + * debian/patches/124_errorformat.vim.diff: Remove obsolete hunk that doesn't + apply any more. + + -- Martin Pitt Tue, 26 Jul 2005 11:30:46 +0000 + +vim (1:6.3-078+1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Michael Vogt Thu, 23 Jun 2005 15:32:31 +0200 + vim (1:6.3-078+1) unstable; urgency=low * New upstream patches (073 to 078), see README.gz for details. @@ -2374,6 +3281,25 @@ -- Norbert Tretkowski Sun, 24 Apr 2005 17:26:49 +0200 +vim (1:6.3-68+4ubuntu3) breezy; urgency=low + + * debian/control: + - Build-Depends on libxt-dev (Ubuntu: #11113). + + -- Sebastien Bacher Fri, 27 May 2005 19:46:38 +0200 + +vim (1:6.3-68+4ubuntu2) breezy; urgency=low + + * Drop vim-lesstif package. + + -- Daniel Stone Mon, 23 May 2005 22:19:45 +1000 + +vim (1:6.3-68+4ubuntu1) breezy; urgency=low + + * Add 'breezy' to the list of accepted distribution keywords. + + -- Daniel Stone Wed, 13 Apr 2005 12:44:25 +1000 + vim (1:6.3-068+4) unstable; urgency=medium * Norbert Tretkowski : @@ -2578,6 +3504,57 @@ -- Norbert Tretkowski Wed, 05 Jan 2005 20:51:36 +0100 +vim (1:6.3-046+1ubuntu7) hoary; urgency=low + + * Ensure kubuntu_01_xdg_menus.diff is not applied before uploading. + + -- Jonathan Riddell Sun, 3 Apr 2005 13:09:32 +0100 + +vim (1:6.3-046+1ubuntu6) hoary; urgency=low + + * Add kubuntu_01_xdg_menus.diff to make kvim menu entry XDG compliant. + + -- Jonathan Riddell Sun, 3 Apr 2005 00:44:21 +0000 + +vim (1:6.3-046+1ubuntu5) hoary; urgency=low + + * Revert KDE removal, thus making the kvim package actually have useful + content rather than just a broken diversion of vim. kvim-ruby is still + skipped. + + -- Colin Watson Tue, 8 Mar 2005 00:09:16 +0000 + +vim (1:6.3-046+1ubuntu4) hoary; urgency=low + + * Drop editor alternative priority to 35, since Ubuntu installs vim by + default (closes: Ubuntu #4710). + + -- Colin Watson Tue, 1 Mar 2005 15:37:33 +0000 + +vim (1:6.3-046+1ubuntu3) hoary; urgency=low + + * Don't autoindent by default (Ubuntu: #5602) + + -- Thom May Wed, 19 Jan 2005 12:10:29 +0000 + +vim (1:6.3-046+1ubuntu2) hoary; urgency=low + + * SECURITY UPDATE: fix insecure temporary files + * Added patch 104_secure_tempfiles.diff: use mktemp instead of insecure $$ + construction to create temporary files in vimspell.sh and tcltags.sh + * References: + CAN-2005-0069 + http://bugs.debian.org/289560 + + -- Martin Pitt Tue, 18 Jan 2005 16:29:10 +0100 + +vim (1:6.3-046+1ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + * debian/vim-variant.desktop: Disable menu item again. + + -- Colin Watson Sun, 19 Dec 2004 11:42:55 +0000 + vim (1:6.3-046+0sarge1) testing-proposed-updates; urgency=high * Built on testing for testing-proposed-updates because patch 045 fixes @@ -2595,6 +3572,35 @@ -- Norbert Tretkowski Sun, 12 Dec 2004 02:36:11 +0100 +vim (1:6.3-031+3ubuntu4) hoary; urgency=low + + * Rebuild with python2.4. + + -- Matthias Klose Thu, 16 Dec 2004 11:57:12 +0100 + +vim (1:6.3-031+3ubuntu3) hoary; urgency=low + + * 900_debcontrol.vim.diff: Add restricted, universe, and multiverse to + debcontrolSection. + * debian/rules (make_patch): Ignore error code from diff, since it'll + normally be non-zero. + + -- Colin Watson Fri, 10 Dec 2004 12:47:00 +0100 + +vim (1:6.3-031+3ubuntu2) hoary; urgency=low + + * 900_debcontrol.vim.diff: Add amd64 to debcontrolArchitecture. + * 901_debchangelog.vim.diff: Add warty and hoary to debchangelogTarget. + * Fix changelog ordering. + + -- Colin Watson Mon, 6 Dec 2004 18:23:01 +0100 + +vim (1:6.3-031+3ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Wed, 17 Nov 2004 00:17:02 +0000 + vim (1:6.3-031+3) unstable; urgency=low * Really add Brandens patch which adds XXX and FIXME comment hilighting @@ -2622,6 +3628,30 @@ -- Norbert Tretkowski Tue, 09 Nov 2004 18:56:42 +0100 +vim (1:6.3-025+1ubuntu2) warty; urgency=low + + * debian/vim-gnome.desktop: + - Disable menu item. + + -- Jeff Waugh Fri, 8 Oct 2004 10:04:36 +1000 + +vim (1:6.3-025+1ubuntu1) warty; urgency=low + + * New version from sid (Closes: Warty#1687) + - Fixes diversions (Closes: Warty#834) + * Merge changes from 1:6.2-532+4ubuntu1 + - Don't build kvim* + - Remove build-dependency on kdelibs + - Don't build vim-ruby + - Remove build-dependencies on ruby, ruby-dev + * Build vim-basic with python support + * Don't build with GNOME support, since that would bloat base + * Add conflicts: vim (= 1:6.2-532+4ubuntu2) to vim variants + due to moving of gvimrc + (Closes: Warty#1717 + + -- Matt Zimmerman Fri, 24 Sep 2004 13:46:42 -0700 + vim (1:6.3-025+1) unstable; urgency=low * New upstream patches (020 to 025), see README.gz for details. diff -Nru vim-7.3.346/debian/control vim-7.3.346/debian/control --- vim-7.3.346/debian/control 2011-10-21 04:15:54.000000000 +0200 +++ vim-7.3.346/debian/control 2011-11-26 14:16:20.000000000 +0100 @@ -1,7 +1,8 @@ Source: vim Section: editors Priority: optional -Maintainer: Debian Vim Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Vim Maintainers Uploaders: James Vega Standards-Version: 3.9.2.0 Build-Depends: debhelper (>= 7), libacl1-dev, libgpmg1-dev [linux-any], diff -Nru vim-7.3.346/debian/patches/debian/ubuntu-grub-syntax.patch vim-7.3.346/debian/patches/debian/ubuntu-grub-syntax.patch --- vim-7.3.346/debian/patches/debian/ubuntu-grub-syntax.patch 1970-01-01 01:00:00.000000000 +0100 +++ vim-7.3.346/debian/patches/debian/ubuntu-grub-syntax.patch 2011-11-26 14:16:20.000000000 +0100 @@ -0,0 +1,13 @@ +Index: vim-7.3.000+hg~ee53a39d5896/runtime/syntax/grub.vim +=================================================================== +--- vim-7.3.000+hg~ee53a39d5896.orig/runtime/syntax/grub.vim 2010-10-17 12:51:13.000000000 +0200 ++++ vim-7.3.000+hg~ee53a39d5896/runtime/syntax/grub.vim 2010-10-17 12:51:29.000000000 +0200 +@@ -40,7 +40,7 @@ + \ displaymem embed find fstest geometry halt help + \ impsprobe initrd install ioprobe kernel lock + \ makeactive map md5crypt module modulenounzip pause +- \ quit reboot read root rootnoverify savedefault setup ++ \ quiet quit reboot read root rootnoverify savedefault setup + \ testload testvbe uppermem vbeprobe + + syn keyword grubSpecial saved diff -Nru vim-7.3.346/debian/patches/series vim-7.3.346/debian/patches/series --- vim-7.3.346/debian/patches/series 2011-10-21 03:10:35.000000000 +0200 +++ vim-7.3.346/debian/patches/series 2011-11-26 14:16:20.000000000 +0100 @@ -11,3 +11,4 @@ debian/disabled-modelines.patch debian/awk-shebang.patch debian/extra-tex-detection.patch +debian/ubuntu-grub-syntax.patch diff -Nru vim-7.3.346/debian/runtime/debian.vim.in vim-7.3.346/debian/runtime/debian.vim.in --- vim-7.3.346/debian/runtime/debian.vim.in 2011-10-15 05:09:57.000000000 +0200 +++ vim-7.3.346/debian/runtime/debian.vim.in 2011-11-26 14:16:20.000000000 +0100 @@ -47,3 +47,15 @@ map map! endif + +if executable("launchpad-integration") + " Launchpad integration + an 9999.76 &Help.Get\ Help\ Online\.\.\. :call LPI("--info") + an 9999.77 &Help.Translate\ This\ Application\.\.\. :call LPI("--translate") + an 9999.78 &Help.Report\ a\ Problem\.\.\. :call LPI("--bugs") + an 9999.79 &Help.-lpisep- + + fun! s:LPI(opt) + call system("launchpad-integration --pid " . getpid() . " " . a:opt) + endfun +endif diff -Nru vim-7.3.346/debian/runtime/vimrc vim-7.3.346/debian/runtime/vimrc --- vim-7.3.346/debian/runtime/vimrc 2011-10-15 05:09:57.000000000 +0200 +++ vim-7.3.346/debian/runtime/vimrc 2011-11-26 14:16:20.000000000 +0100 @@ -17,7 +17,9 @@ " Vim5 and later versions support syntax highlighting. Uncommenting the next " line enables syntax highlighting by default. -"syntax on +if has("syntax") + syntax on +endif " If using a dark background within the editing area and syntax highlighting " turn on this option as well