lp://qastaging/~ubuntu-branches/ubuntu/lucid/vim/lucid-201003081817

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntu/lucid/vim

No reviews requested

Diff: 6718 lines (+6658/-0) (has conflicts)

9 files modified

debian/changelog (+6373/-0)
debian/vim-doc.docs (+3/-0)
runtime/ftplugin/tcl.vim (+36/-0)
runtime/indent/mail.vim (+13/-0)
runtime/keymap/dvorak.vim (+82/-0)
runtime/syntax/sdc.vim (+41/-0)
runtime/syntax/taskdata.vim (+43/-0)
runtime/syntax/taskedit.vim (+35/-0)
src/cleanlint.vim (+32/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

55. By Colin Watson on 2010-03-08

UNRELEASED as yet

54. By Colin Watson on 2010-03-08

standard capitalisation and spacing

53. By Colin Watson on 2010-03-08

merge lp:~geser/ubuntu/lucid/vim/merge-7.2.330-1

52. By Colin Watson on 2010-03-07

merge non-uploaded changes from lp:~ubuntu-branches/ubuntu/lucid/vim/lucid-201003070317

51. By Alexander Sack on 2010-03-07

rebuild rest of main for armel armv7/thumb2 optimization;
UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2

50. By Loïc Minier on 2009-09-21

* Add lucid as a valid suite in changelogs and sources.list.
* Rename Vcs-* to XS-Debian-Vcs-*.

49. By Bhavani Shankar on 2009-08-21

* 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.

48. By Steve Langasek on 2009-05-05

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.

47. By Steve Langasek on 2009-05-04

* 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.
  - Disable autoindent, line-wrapping, and backup files by default.
* 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.

46. By Colin Watson on 2009-03-19

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).