ubuntu/+source/vim:ubuntu/utopic-devel

Last commit made on 2014-10-20
Get this branch:
git clone -b ubuntu/utopic-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

Name:
ubuntu/utopic-devel
Repository:
lp:ubuntu/+source/vim

Recent commits

e021faa... by St├ęphane Graber on 2014-10-20

Import patches-unapplied version 2:7.4.273-2ubuntu4 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 96b71b7ba801b18c4d46aedd015c38f5d3829e11

New changelog entries:
  * Add it to the other place too...

96b71b7... by St├ęphane Graber on 2014-10-20

Import patches-unapplied version 2:7.4.273-2ubuntu3 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 1f65c45469e61806cb38fddce3ca1d69c15cc9e0

New changelog entries:
  * Add vivid to the list of valid Ubuntu series.

1f65c45... by Colin Watson on 2014-08-21

Import patches-unapplied version 2:7.4.273-2ubuntu2 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 76d05ea6774943388f6c869b0b1d39e04a1a24f3

New changelog entries:
  * Rebuild for Perl 5.20.0.

76d05ea... by Adam Conrad on 2014-05-02

Import patches-unapplied version 2:7.4.273-2ubuntu1 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 4d09f644fe9dc864fce81e7ef872d5892d4ede6e

New changelog entries:
  * Merge with Debian unstable and drop debian/ubuntu-fix-arches.patch.

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)

a6e5ece... by James McCoy on 2014-04-08

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

Imported using git-ubuntu import.

Changelog parent: a572b70d24101c22fd34b8c9fda8ffd0d0122893

New changelog entries:
  * Merge upstream tag v7-4-253
    + 7.4.252: Clear blink timer after removing it to avoid GLib-CRITICAL
      error. (Closes: #743668)
  * rules: Explicitly disable SMACK on Linux, in favor of SELinux.

a572b70... by James McCoy on 2014-03-28

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

Imported using git-ubuntu import.

Changelog parent: 4f2c3d9c6915726083081aadcba95d203521b728

New changelog entries:
  * Merge upstream tag v7-4-225
    + Patches merged upstream:
      - upstream/python-ftplugin-include.patch and
        upstream/shadowdir-tests.diff
    + netrw: Don't try to access the clipboard when support isn't enabled.
      (Closes: #737530)
    + 7.4.209: Escape a repeated command when storing it for redo. (Closes:
      #739656)
    + 7.4.222: Use RbConfig::CONFIG['rubyarchhdrdir'] to allow building Vim
      against Ruby 2.x. (Closes: #739125)

4f2c3d9... by James McCoy on 2014-02-03

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

Imported using git-ubuntu import.

Changelog parent: a82c5634f1db6053cf485cd38dd581638f532cce

New changelog entries:
  * Merge upstream tag v7-4-161
    + Fix loading of NetRW when editing a directory. (Closes: #732091)
  * Update Ubuntu releases in Debian syntax files.
  * Add more debian-ports architectures to debcontrol syntax file. (Closes:
    #722313)
  * ftplugin/debchangelog: Allow changing distribution from UNRELEASED.
    (Closes: #734267)
  * control: Bump Standards-Version to 3.9.5, no changes needed.
  * Add shadowdir-tests.diff to fix building in a shadow build directory.

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.