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

Last commit made on 2013-08-12
Get this branch:
git clone -b ubuntu/saucy-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/saucy-proposed
Repository:
lp:ubuntu/+source/vim

Recent commits

6f8ad14... by Adam Conrad on 2013-08-11

Import patches-unapplied version 2:7.4.000-1ubuntu2 to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: e01cd7a233af560b5db9701bee174c7b2535d0cd

New changelog entries:
  * Use lua5.2 for the current lua transition in main (LP: #1196921)
  * Ignore test86 for now, as it seems to do goofy things on powerpc.

e01cd7a... by Adam Conrad on 2013-08-11

Import patches-unapplied version 2:7.4.000-1ubuntu1 to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 7922f9f3d84cf4963d14a8bbe8b90f1537d7c40b

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/update-upstart-syntax.patch:
      + Add setuid and setgid to syntax file.
  * Drop ubuntu-multiarch.patch, no longer required.

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)

e440e70... by James McCoy on 2013-05-06

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

Imported using git-ubuntu import.

Changelog parent: 8ceba74dbd5e33d3347c23e79f973fd7c2aba878

New changelog entries:
  * Merge upstream tag v7-3-923
    + Updated documentation for Python syntax file. (Closes: #613038)
    + NetRW no longer creates files in ~/.vim (or ~/.vim itself) if
      g:netrw_dirhistmax <= 0. (Closes: #635984)
  * Remove EOLed Oneiric and Hardy releases from Debian runtime files. Add
    Saucy and wheezy-backports.
  * Bump Standards-Version to 3.9.4, no changes needed.
  * Recognize “-b $branch” as part of a Vcs-Git field. (Closes: #702751)

8ceba74... by James McCoy on 2013-02-22

Import patches-unapplied version 2:7.3.831-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 04e4703cc3b18f76939b57221e7f383e2d62b028

New changelog entries:
  * Merge upstream tag v7-3-831
    + Merged patches:
      - upstream/debian-runtime-spell.patch, upstream/if_py-crash.patch,
        upstream/netrw-syntax-fix.patch, upstream/remove-py_config.patch
    + 7.3.607: Swap fg and bg colors for completion menu. (Closes: #680772)
    + 7.3.750: Fix off-by-one error in justify macro. (Closes: #620106)
    + 7.3.751: Retry test61 once if it fails.
      - Remove the explicit ignoring of test61 failures in debian/rules
  * Mark "DM-Upload-Allowed" in debian/control files as an "Error", since the
    field is no longer supported by the Debian archives.
  * Re-enable vim-gnome on m68k.
  * Update Ubuntu release names in Debian runtime files.

04e4703... by James McCoy on 2013-02-09

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

Imported using git-ubuntu import.

Changelog parent: 6a6503a4bd995cfefe91b24b6f134029b68196ce

New changelog entries:
  * Add vim-lesstif.preinst to handle transitioning /usr/share/doc/vim-lesstif
    from a symlink to a directory. (Closes: #700069)
  * Add clarification to short description of vim-nox. (Closes: #699780)