ubuntu/+source/vim:ubuntu/vivid

Last commit made on 2014-12-09
Get this branch:
git clone -b ubuntu/vivid 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/vivid
Repository:
lp:ubuntu/+source/vim

Recent commits

1c2031f... by Iain Lane on 2014-12-09

Import patches-unapplied version 2:7.4.488-3ubuntu2 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 60e999ac36b7948b4444713bedf6ad93860d7752

New changelog entries:
  * debian/patches/fixtest63.patch: Cherry-pick r6411 from upstream to fix
    test63 on the buildds, where TERM is unset.

60e999a... by Iain Lane on 2014-12-09

Import patches-unapplied version 2:7.4.488-3ubuntu1 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 31e076948e6a131c5c8365e65b8c219aa77b2a23

New changelog entries:
  * Merge from 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/rules: Ignore failures from flaky test86.

31e0769... by James McCoy on 2014-11-30

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

Imported using git-ubuntu import.

Changelog parent: e03c0f99733f944d9bd76b2807c05d35c291108d

New changelog entries:
  * Install icons to /usr/share/icons/hicolor to work around #765069.
    (Closes: #768256)

e03c0f9... by James McCoy on 2014-11-15

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

Imported using git-ubuntu import.

Changelog parent: 6bc9e904545e9353a42e6f41e2e831cef36b5669

New changelog entries:
  * Actually fix the Name in vim.desktop. (Closes: #769575)

6bc9e90... by James McCoy on 2014-10-23

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

Imported using git-ubuntu import.

Changelog parent: 7b5199e9ba804c42184b1791af2de43b447d79ca

New changelog entries:
  * Merge upstream tag v7-4-488
  * Fix the Name in vim.desktop.

7b5199e... by James McCoy on 2014-10-21

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

Imported using git-ubuntu import.

Changelog parent: c9d25803ef3d7a7feaa0093bacacd025be1aa946

New changelog entries:
  * Merge upstream tag v7-4-481
    + Updated Russian translation of vimtutor. (Closes: #722673)
  * syntax/debcontrol.vim: Recognize https URLs for Vcs-Git. (Closes:
    #763553)
  * debian/rules: Request all hardening features, other than fortify, from
    dpkg-buildflags.
  * Add codename for Ubuntu's next release, vivid.
  * Install a .desktop file for terminal vim. (Closes: #760512)

c9d2580... by James McCoy on 2014-09-01

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

Imported using git-ubuntu import.

Changelog parent: a2b8ea13eac52fa3684bcb3438ec5d7bc9093da2

New changelog entries:
  * Merge upstream tag v7-4-430
    + 7.4.397: Fix paren matching in zsh scripts. (Closes: #754507)
    + Runtime updates:
      - Improve highlighting of Python's \N{…} sequences. (Closes: #749175)
  * Add jessie release and remove EOLed saucy release from Debian runtime
    files. (Closes: #753823)

a2b8ea1... by James McCoy on 2014-06-20

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

Imported using git-ubuntu import.

Changelog parent: 4d09f644fe9dc864fce81e7ef872d5892d4ede6e

New changelog entries:
  * Merge upstream tag v7-4-335
    + Avoid setting buftype=nofile for scp buffers. (Closes: #743136)
    + Properly handle scp://user@host/ URLs (Closes: #744111)
  * Remove EOLed Quantal release from Debian runtime files.
  * Transition from Lua 5.1 to Lua 5.2

4d09f64... by James McCoy on 2014-05-02

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

Imported using git-ubuntu import.

Changelog parent: 8f842328f4c6bbc24a941fd81c2f4c4fd0e545bb

New changelog entries:
  * syntax/debcontrol.vim:
    + Fix architecture orders to work with left-most regex matching.

8f84232... by James McCoy on 2014-05-02

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

Imported using git-ubuntu import.

Changelog parent: a6e5ecedb3e54adca0f1f21d94132d2feca2655b

New changelog entries:
  * Merge upstream tag v7-4-273
  * syntax/debcontrol.vim:
    + Correctly highlight any-x32 in Architecture field
    + Add ppc64el architecture
  * syntax/deb{changelog,sources}.vim:
    + Add codenames for Ubuntu's development release (devel, utopic)