Last commit made on 2011-03-24
Get this branch:
git clone -b ubuntu/natty-devel https://git.launchpad.net/ubuntu/+source/vim
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

c487334... by Kees Cook on 2011-03-24

Import patches-unapplied version 2:7.3.035+hg~8fdc12103333-1ubuntu7 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 152fb7b39d0b711c43813ab3bb6a1ac91347c8c1

New changelog entries:
  * Updated upstream/debian-runtime.patch to includes Multi-Arch field.

152fb7b... by Loïc Minier on 2011-03-23

Import patches-unapplied version 2:7.3.035+hg~8fdc12103333-1ubuntu6 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: c8afdbb767ded545e8ab55846269702787f62ac9

New changelog entries:
  * Update patch upstream/debian-runtime to also list oneiric in
    runtime/syntax/debchangelog.vim and runtime/syntax/debsources.vim.

c8afdbb... by James Hunt on 2011-03-11

Import patches-unapplied version 2:7.3.035+hg~8fdc12103333-1ubuntu5 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 75417a8e421642b4da3b63017e25a039810d9d0a

New changelog entries:
  * runtime/syntax/upstart.vim: Improvements.

75417a8... by James Hunt on 2011-03-08

Import patches-unapplied version 2:7.3.035+hg~8fdc12103333-1ubuntu4 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 3c0e13940e78d4c0ec1072f85410e862620496d8

New changelog entries:
  * runtime/syntax/upstart.vim: New syntax file for Upstart.
  * runtime/filetype.vim: Updated to recognise Upstart configuration files.

3c0e139... by Colin Watson on 2011-02-18

Import patches-unapplied version 2:7.3.035+hg~8fdc12103333-1ubuntu3 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 1fb62dddc0037995b3c595fb05a825a4af7ac09c

New changelog entries:
  * Work around ICE on ppc64 by exporting DEB_GCC_NO_O3=1.

1fb62dd... by Michael Bienia on 2010-12-09

Import patches-unapplied version 2:7.3.035+hg~8fdc12103333-1ubuntu2 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 44b382a19494888ff5d4d2e56a21866ee6e4de0a

New changelog entries:
  * No-change rebuild with Python 2.7 (lp: #688149).

44b382a... by Michael Bienia on 2010-10-25

Import patches-unapplied version 2:7.3.035+hg~8fdc12103333-1ubuntu1 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: ae80b8525873b7731d6974d68b00e71418fd4ea2

New changelog entries:
  * 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 <Left>/<Right> 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
    - 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.

ae80b85... by James McCoy on 2010-10-25

Import patches-unapplied version 2:7.3.035+hg~8fdc12103333-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d2cd744b33e2c131bfec70549a3ec1477300a77f

New changelog entries:
  * Pull patches 001 - 035.
    + More robust YAML highlighting. (Closes: #535682)
  * debian/rules:
    + Stop overriding CFLAGS on the command-line when invoking make. Upstream
      enforces an upper-limit of 1 for _FORTIFY_SOURCE due to the use of
      flexible arrays in nested structs, which improperly cause Vim to crash
      with _FORTIFY_SOURCE=2.
    + Use DEB_HOST_ARCH_OS instead of DEB_HOST_GNU_SYSTEM to determine whether
      Linux-specific functionality is enabled.
    + Use dpkg-vendor to change build configuration when building on Ubuntu.
      Thanks to Michael Bienia for the patch.
  * Make helpztags capable of generating tags files for non-English help
    files. (Closes: #600248)
  * Debian runtime:
    + Add natty as a recognized distribution. (Closes: #600560)
    + Add metapackages as a recognized section. (Closes: #600562)
    + Remove etch as a recognized distribution.
  * debian/control: Add dpkg-dev (>= 1.15.1) Build-Depends for dpkg-vendor.

d2cd744... by James McCoy on 2010-08-15

Import patches-unapplied version 2:7.3.000+hg~ee53a39d5896-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f1219a4143ca613aaf3ee464eceee813c718c8bb

New changelog entries:
  * New upstream release.
  * debian/rules:
    + Explicitly use the dynamic loading Python interfaces.
    + Remove cleanup from clean target which are now properly handled by
      upstream's Makefile.
  * Update version information in documentation.

f1219a4... by James McCoy on 2010-08-13

Import patches-unapplied version 2:7.3f.20100812+hg~20e83abf88b1-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 3aa77f9da58f8fd7f927bdb78bc898cc519b5b0a

New changelog entries:
  * Merge latest 7.3f pre-release.
    + Correctly restore multi-byte terminal titles when exiting Vim. (Closes:
    + Highlight text inside math zones correctly for tex files. (Closes:
    + Recognize nested cite regions in tex files. (Closes: #444288)
    + Support syntax highlighting of bash's $"". (Closes: #473736)
  * Patches merged upstream:
    + perl-indent-block.patch
    + logcheck-ftplugin.patch
    + tex-syntax-verbatim-spell.patch
  * Enable Lua scripting.
    + Add liblua5.1-0-dev and lua5.1 to Build-Depends.
    + Enable lua interface via dynamic loading.
  * Switch Perl interface to dynamic loading.
  * debian/rules: Prefer running tests with the vim-nox binary if it's
  * Bump Standards-Version to -- no changes needed.