ubuntu/+source/vim:ubuntu/trusty

Last commit made on 2014-01-02
Get this branch:
git clone -b ubuntu/trusty 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

Name:
ubuntu/trusty
Repository:
lp:ubuntu/+source/vim

Recent commits

e6835bd... by Matthias Klose on 2014-01-02

Import patches-unapplied version 2:7.4.052-1ubuntu3 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 8941f951529cdabca1d8b29d5972ac44c936bd79

New changelog entries:
  * No-change rebuild for Tcl 8.6.

8941f95... by Adam Conrad on 2013-12-10

Import patches-unapplied version 2:7.4.052-1ubuntu2 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 3ec783313db645658e7ff70f64699bb4bb8055ca

New changelog entries:
  * upstream/completion-crash.patch: Fix crash with Insert mode completion.

3ec7833... by Adam Conrad on 2013-10-18

Import patches-unapplied version 2:7.4.052-1ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: a82c5634f1db6053cf485cd38dd581638f532cce

New changelog entries:
  * Merge with Debian unstable, remaining changes:
    - 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/update-upstart-syntax.patch:
      + Add setuid and setgid to syntax file.
  * debian/patches/debian/ubuntu-dists.patch:
    - Add devel and trusty as valid distribution targets.
  * debian/patches/debian/ubuntu-arches.patch:
    - Support arm64, ppc64el, and x32 as valid arches.

a82c563... by James McCoy on 2013-10-09

Import patches-unapplied version 2:7.4.052-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9dfe6afa25116300fe5688ff554a635541307ac5

New changelog entries:
  * Merge upstream tag v7-4-052
    - Remove upstream/python-ftplugin-keywordprg.patch, merged upstream
  * debian/watch: Use the pasv option.
  * debian/control: Version the ruby1.8{,-dev} Build-Conflicts now that the
    Provides: have been dropped.

9dfe6af... by James McCoy on 2013-09-18

Import patches-unapplied version 2:7.4.027-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7922f9f3d84cf4963d14a8bbe8b90f1537d7c40b

New changelog entries:
  * Merge upstream tag v7-4-027
    + 7.4.003: Refresh a stale pointer in new regex engine to avoid
      dereferencing a freed pointer. (Closes: #722081)
    + 7.4.024: Read an undo file owned by the current user, even if that
      differs from the owner of the edited file. (Closes: #721944)
    + Use old regex engine for yamlBlockMappingKey highlighting to workaround
      performance problem with new engine. (Closes: #719510)

7922f9f... by James McCoy on 2013-08-11

Import patches-unapplied version 2:7.4.000-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3f601c0dd95e7c259f62263f2731fb0a743ff34c

New changelog entries:
  * New upstream release.
  * Upload to unstable.
  * Stop providing /usr/share/vim/vimcurrent. It shouldn't be used by
    anything, since it's Debian specific, and the Vim packaging hasn't used it
    (other than documenting the location of debian.vim) for years.
  * Override spelling-error-in-binary … tEH the.

3f601c0... by James McCoy on 2013-08-03

Import patches-unapplied version 2:7.4b.004-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: d45220f20db11b746ac8e6141017323f464136d1

New changelog entries:
  * Merge upstream tag v7-4b-004
    + 7.4a.044: Clear window from b_wininfo in win_free(). (Closes: #717529)
  * debian/rules: Install Japanese translations of man pages.
  * Update path in binaries-have-file-conflict lintian override.
  * Use canonical URI for Vcs-*.

d45220f... by James McCoy on 2013-07-13

Import patches-unapplied version 2:7.4a.012-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 3ba6a75a1268df985cbb0c805fc6e44f6065f598

New changelog entries:
  * Merge upstream tag v7-4a-012
    + New NFA regex engine. Vim automatically determines whether to use the
      new or old engine based on the pattern. A specific engine can be
      forced with the 'regexengine' option or within a pattern using the \%#=
      atom.
    + Updated Perl syntax files
      - Adds support for Perl 5.10 syntax. (Closes: #681606)
      - Fixes syntax highlighting when qq{} contains a } character. (Closes:
        #598197)
    + Fix display of an empty entry in NetRW directory listing. (Closes:
      #709101)
    + Recognize Ikiwiki's *.mdwn as markdown filetype. (Closes: #672597)
    + 7.3.985: Call g_set_prgname() on startup to set a proper WM_CLASS.
      (Closes: #639925)
    + Source ~/.vim/vimrc or ~/.vim/gvimrc in favor of ~/.vimrc or ~/.gvimrc.
    + Update sh syntax file
      - Recognize when sh is dash and change the default behavior highlighting
        to be POSIX instead of Bourne. (Closes: #712657, #699172)
      - Correctly highlight text after a "--". (Closes: #713922)
  * debian/rules: Simplify version handling and bump for the pre-release.
  * Add shadowdir-fixes.patch, to fix test failures when building in a
    shadow directory.

3ba6a75... by James McCoy on 2013-06-24

Import patches-unapplied version 2:7.3.923-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 05791bbda06e4d8134431b17479d1547720e4792

New changelog entries:
  * Build-Conflict against ruby1.8{,-dev} to work around incorrect ruby{,-dev}
    Provides (c.f., #710022).

05791bb... by James McCoy on 2013-05-27

Import patches-unapplied version 2:7.3.923-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e440e705d4620739ef0ada22879ab2a2278119ef

New changelog entries:
  * Fix FTBFS with M-A Python. (Closes: #701513)