ubuntu/+source/vim:ubuntu/wily-proposed

Last commit made on 2015-10-21
Get this branch:
git clone -b ubuntu/wily-proposed 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/wily-proposed
Repository:
lp:ubuntu/+source/vim

Recent commits

b43c880... by Iain Lane on 2015-10-21

Import patches-unapplied version 2:7.4.712-2ubuntu4 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 5ee1fb0777c966f0c323e1272c9e4aab0c6349dd

New changelog entries:
  * Update list of Ubuntu releases.

5ee1fb0... by Matthias Klose on 2015-09-08

Import patches-unapplied version 2:7.4.712-2ubuntu3 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 5dc1c80b187458756981ca999535add0f74a9d2b

New changelog entries:
  * No-change rebuild to add ruby2.2 support.

5dc1c80... by Adam Conrad on 2015-05-14

Import patches-unapplied version 2:7.4.712-2ubuntu2 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 41f4dc25d75f560e39096ed54fd43ba74befe3aa

New changelog entries:
  * debian/patches/debian/ubuntu-releases.patch: Move Ubuntu release fixes
    to new local patch, drop lucid, and add missing karmic to unsupported.

41f4dc2... by Iain Lane on 2015-05-13

Import patches-unapplied version 2:7.4.712-2ubuntu1 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 80c956f639518269ac882ea2cd8216ff310bdd9f

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.
  * Add vivid and wily to list of known releases.
  * debian/rules: Use ps2write. Ghostscript 9.10 removed the 'pswrite' device.
    We need to write level 2 postscript now.

80c956f... by James McCoy on 2015-05-01

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

Imported using git-ubuntu import.

Changelog parent: be1c760b003b24998d6a5e170b663128cd5cdf1a

New changelog entries:
  * Add stretch to Debian syntax files. (Closes: #783506)
  * syntax/debsources.vim: Recognize all Debian/Ubuntu releases, but highlight
    unsupported releases differently.
  * Add patch upstream/lcs_space-overflow.patch, which fixes an integer
    overflow when determining whether to apply listchar's space setting. This
    fixes the test_listchars failure on certain architectures when PIE is
    enabled.

be1c760... by James McCoy on 2015-04-25

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

Imported using git-ubuntu import.

Changelog parent: 2206e3f5d3f8215bb643a14c684c0b74dd08645b

New changelog entries:
  * Merge upstream tag v7-4-712
    + 7.4.586: Remove a cyclic dependency when generating documentation, which
      results in unreproducible builds. (Closes: #775562)
    + 7.4.609: Use a stack of dicts and lists to be marked for garbage
      collection, thus making it iterative instead of recursive. Fixes crash
      with some plugins written in other languages (e.g., lua). (Closes:
      #778821)
    + runtime/syntax/registry.vim: Correct highlighting of comments. (Closes:
      #687199)
    + runtime/syntax/strace.vim: Highlight 2-digit escape sequences the same
      as 1 or 3-digit escape sequences. (Closes: #775113)
  * Remove backported patches upstream/v7-4-576.patch and
    upstream/netrwSavePosn.patch.
  * Add a Build-Conflict for autoconf2.13 to avoid a FTBFS if it's installed.
    (Closes: #781031)

2206e3f... by James McCoy on 2015-03-31

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

Imported using git-ubuntu import.

Changelog parent: 93dd597d6c0b84b183849f917b340802b43d617f

New changelog entries:
  * Backport patch 7.4.576 to fix jarring toggling of 'linebreak' option when
    using the c command to change the buffer. (Closes: #774492)
  * Backport upstream fix for call to unknown function in NetRW plugin.
    (Closes: #768467)

93dd597... by James McCoy on 2015-03-21

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

Imported using git-ubuntu import.

Changelog parent: 9fb12ca909d51d44c81adf2b193bab001cf5f392

New changelog entries:
  * Build vim logo from the eps instead of pdf so the svg has the correct
    bounding box. Thanks to Simon McVittie for the idea! (Closes: #778477)
  * syntax/debchangelog.vim:
    + Recognize jessie, jessie-backports, and sid targets
    + Recognize binary-only=yes key value in debchangelogHeader

9fb12ca... by James McCoy on 2015-02-12

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

Imported using git-ubuntu import.

Changelog parent: ff665efd86001f5faefd55df01b15b0dbb3e9d3f

New changelog entries:
  * Install icons to the proper directory. dh_install doesn't rename files,
    even though the last upload pretended it does.
    - Use upstream's icons and remove the ones in debian/
    - Add Build-Depends: pdf2svg to create a scalable icon

ff665ef... by James McCoy on 2014-12-30

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

Imported using git-ubuntu import.

Changelog parent: 31e076948e6a131c5c8365e65b8c219aa77b2a23

New changelog entries:
  * Move vim icon from vim-gui-common to vim-common since both vim.desktop and
    gvim.desktop use it. (Closes: #773930)