Last commit made on 2012-11-15
Get this branch:
git clone -b ubuntu/lucid-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


Recent commits

127a342... by Adam Buchbinder on 2012-09-30

Import patches-unapplied version 2:7.2.330-1ubuntu3.1 to ubuntu/lucid-proposed

Imported using git-ubuntu import.

Changelog parent: a2153e6aaa94d7acaaef797850aeff2e19d9e659

New changelog entries:
  * Backported upstream patch 7.3.216 from
    (LP: #1059085):
    - src/memline.c: Avoid corruption on large-file recovery.
    - src/testdir/test70.in, src/testdir/test70.ok:
      Test large-file recovery.
    - src/testdir/Makefile, src/testdir/Make_amiga.mak,
      src/testdir/Make_dos.mak, src/testdir/Make_os2.mak,
      src/testdir/Make_vms.mms: Update Makefiles to include new tests.

a2153e6... by Loïc Minier on 2010-04-16

Import patches-unapplied version 2:7.2.330-1ubuntu3 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 79d4e844e64045b196ab798669747e2d98f38f26

New changelog entries:
  * runtime/syntax/debchangelog.vim, runtime/syntax/debsources.vim: add
    maverick to allowed dists.

79d4e84... by Michael Bienia on 2010-03-08

Import patches-unapplied version 2:7.2.330-1ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 0252870168ea29135f6cb816d032c8bf710f862e

New changelog entries:
  * debian/rules: Temporarily disable parallel building until we figure out
    where it is broken (fixes the current FTBFS).

0252870... by Colin Watson on 2010-03-08

Import patches-unapplied version 2:7.2.330-1ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 25b0c61632c166af4af0c13db47e33f471aa28e7

New changelog entries:
  [ Michael Bienia ]
  * Merge with Debian unstable (LP: #509900):
    - Highlight Breaks in debian/control (LP: #498303).
    - [7.2.257] GTK 2.17: lots of assertion error messages (LP: #402188).
  * Remaining changes:
    - debian/runtime/vimrc: "syntax on" is a sane default for non-tiny vim.
    - runtime/syntax/debcontrol.vim:
      + Add "metapackages" to the list of valid sections.
    - runtime/syntax/grub.vim:
      + Add Ubuntu-specific 'quiet' keyword.
    - Drop vim-lesstif package and lesstif2-dev build-dependency.
    - Enable Python interpreter on basic builds.
    - Rename Vcs-* to XS-Debian-Vcs-*.
  * runtime/ftplugin/debchangelog.vim: Use python-launchpadlib (and LP API)
    instead of python-launchpad-bugs for bug completion for Ubuntu
    (forwarded to Debian as bug #566841).
  * src/configure.in, src/auto/configure:
    As MODLIBS from python's config/Makefile includes LOCALMODLIBS which
    shouldn't be used and breaks the build with newer python versions, use
    BASEMODLIBS instead of MODLIBS (forwarded to Debian as bug #566842;
    LP: #534251).
  [ Colin Watson ]
  * Add Launchpad integration to the Help menu if launchpad-integration is
    installed (LP: #453103).

25b0c61... by James McCoy on 2010-01-14

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

Imported using git-ubuntu import.

Changelog parent: a87394433cb2b232db6461aa5156c0aae61d4ec9

New changelog entries:
  * [34a85b6] Update README for patches 285 - 330
    - [1aee41b] [7.2.294] when using TEMPDIRS dir name could get too long
      (Closes: #544682)
    - [f3ea2c2] [7.2.300] file descriptors not closed when executing external
      command (Closes: #290507)
    - [f3ce928] [7.2.324] a negative column argument in setpos() may cause a
      crash (Closes: #563071)
  * [fd76420] Sync runtime files
    - NetRW updated to handle 'equalalways' being set, but window sizes not
      being equal. (Closes: #346089)
  * debian/control:
    - [49f131e] Add Depends: ${misc:Depends} to all binary stanzas.
    - [8973628] Bump Standards-Version, no changes required
    - [12ac9a3] Remove Pierre Habouzit from Uploaders.

a873944... by James McCoy on 2009-11-08

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

Imported using git-ubuntu import.

Changelog parent: 2ac16976ed3c06a0aa94c13d0c4892e515acf461

New changelog entries:
  * syntax/debcontrol.vim:
    - [b997413] Add highlighting of Breaks field (Closes: #541989)
    - [05a38bf] Recognize lpia and kopensolaris-i386. (Closes: #543207)
  * [a85b832] Update README for patches 246 - 259
    - [669e098] [7.2.256] GTK font dialog doesn't have a default when
      'guifont' not set (Closes: #307158)
    - [f4ed8fc] [7.2.257] GTK 2.17: lots of assertion error messages (Closes:
  * [83583c3] Add Ubuntu's next release, lucid, to the Debian-related runtime
  * [87f3b00] update-runtime: Use -A option for git-add so deleted files
    are committed.
  * [60cbb45] Sync runtime files
    - Updated remind.vim syntax file. (Closes: #536770)
    - Fix typos in Japanese vimtutor. (Closes: #539577)
  * [96dca67] Move html docs from /u/s/d/vim-common/html to /u/s/d/vim-
  * [9fec1cd] Use usr_toc.html for the usermanual Index page.
  * [fbacb18] Update README for patches 268 - 284
    - [76d3dad] [7.2.283] GTK: changing font doesn't keep the window maximized
      (Closes: #466088)
  * [6e51684] debsources.vim: Recognize rc-buggy (alias for experimental).
    (Closes: #553525)

2ac1697... by James McCoy on 2009-07-30

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

Imported using git-ubuntu import.

Changelog parent: 1c4643b925ba820ba1be31d6c758004e222de6de

New changelog entries:
  * [5263ec7] Add Suggests: indent to vim-tiny since it will invoke indent
    when the user tries to re-indent text without 'equalprg' set. (Closes:
  * [f24fadd] Restore previous behavior of Vim looking for its (g)vimrc in
    $VIM for non vim-tiny packages. Only vim-tiny will look in /etc/vimrc.

1c4643b... by James McCoy on 2009-07-29

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

Imported using git-ubuntu import.

Changelog parent: 156edd67f2d194eeb978c5909ab449f966dde912

New changelog entries:
  [ James Vega ]
  * debian/rules:
    - [b131ea4] Remove SHELL=/bin/bash (again) along with the bashisms
    - [ac8c907] Build Vim to look for its (g)vimrc at /etc/vim/(g)vimrc, not
      in $VIM. This allows Vim to find the files even if /usr isn't mounted,
      in preparation for moving vim-tiny to /bin.
    - [24ab3e8] Remove calls to dh_desktop since desktop files are now handled
      by triggers.
    - [67f3b5b] Only install the UTF-8 versions of the man pages (Closes:
  * Debian-related runtime files:
    - [3071077] Remove gutsy as a valid distribution -- EOLed.
    - [be3e3b7] Add avr32 as a valid architecture. (Closes: #528438)
    - [1e21fa5] Fix the upload target highlighting so experimental isn't
      flagged as an error. (Closes: #532027)
    - [9ed9ffd] Syntax highlight X[SB]-Python-Version and
      XSBC-Original-Maintainer. (Closes: #536657)
    - [ab86bac] Properly highlight comments in multi-line fields in
  * [ea1da8a] Update README for patches 149 - 191
  * [f0b6a54] Update README for patches 192 - 196
  * [6c7d809] Update README for patches 197 - 209
  * [7489ef5] vim-variant.prerm: Cleanup of mis-handled alternatives is
    no longer needed
  * [7be3c83] vim-variant.postinst: Remove directory->symlink code from
  * Lintian cleanups:
    - [0be1067] debian/control: Remove Priority fields from binary package
      stanzas if they're the same as the source package stanza.
    - [bfba0d4] debian/control: Add version for debhelper Build-Depends
    - [6fb245c] debian/control: Remove version for make Build-Depends
    - [d62624b] debian/control: Drop make from Build-Depends since we the
      version we were Build-Depending on is available in Lenny and it is a
      build-essential package.
    - [2fd98ed] Use “set -e” instead of passing -e on the shebang line for
      maintainer scripts.
    - [1759cb6] Fix hyphen-used-as-minus-sign in French man pages
    - [a749e25] Fix hyphen-used-as-minus-sign/manpage-has-errors-from-man in
      Russian man pages
    - [b9533d9] Fix hyphen-used-as-minus-sign in English man pages
    - [64aeabe] Fix manpage-has-errors-from-man in Polish man pages
    - [7125002] Fix hyphen-used-as-minus-sign in Italian man page
    - [4f9d282] Install upstream's README file which describes the patches
      made since the last major upstream release as the upstream changelog.
  * [fe81bdf] Restrict spell checking in matlab filetype to
    strings/comments (Closes: #509123)
  * [567c06a] Add debian/update-runtime script to automate syncing the latest
    runtime files from upstream's ftp site.
  * [6082754] Update README for patches 210 - 239
    - [ef67fb5] [7.2.221] X cut_buffer0 text may be used in the wrong encoding
      (Closes: #531372)
  * [f8033cf] Sync runtime files from upstream's ftp
    - Support automatically reading/writing lzma files (Closes: #535665)
  * [8132670] Make NRead's behavior for HTTP consistent across backends. They
    will all download source by default but some can be configured to download
    rendered text. (Closes: #525422)
  * [cb968f3] Update README for patches 240 - 245
  * [e1e7abe] Sync runtime files from upstream's ftp
    - Add LocalCommand keyword to sshconfig.vim (Closes: #536299)
  [ Stefano Zacchiroli ]
  * [5f48b8d] Removing myself from Uploaders list.

156edd6... by James McCoy on 2009-04-19

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

Imported using git-ubuntu import.

Changelog parent: b0e46cc34fb25ceb959eb21b95ec1e9a4111401a

New changelog entries:
  * [0657c8d] debian/rules: SHELL really does need to be bash...
  * [a97ec6d] Remove transitional vim-{full,perl,python,ruby,tcl}
    packages as they were simply needed for Etch -> Lenny transitions.
  * debian/control:
    - [d92f9ec] Set vim-dbg to Section: debug to match the override.
    - [5677315] Bump S-V to; no changes needed.
  * syntax/debcontrol.vim:
    - [8089fae] Update list of valid sections. (Closes: #520041)
    - [2301bbd] Add kfreebsd-amd64 to architecture list.
  * [5474b86] syntax/debsources.vim: Enable spell-checking only for
  * [33a8ff5] helpztags: Sanity check filenames being processed.
    (Closes: #523963)
  * [502102f] Update README for patches 131 - 148
    - [f4547c6] [7.2.147] cursor in wrong position after Tab for small version
      (Closes: #506658)
  * [ab97c3c] Sync runtime files from upstream.
    - Correct checks which determine whether to use the c filetype for header
      files. (Closes: #524338)
  * [1baf458] Add karmic as a valid distribution for Debian-related
    runtime files.
  * debian/rules:
    - [e8715d6] Remove stale comment and unnecessary use of bash as $SHELL
    - [b11bf9f] Build vim.pot for translations.
    - [665588f] update-orig will tag/archive either the upstream or
      upstream-runtime branch as the upstream source based on whether there
      are differences between the two.
  * [fd87319] compiler/javac.vim: Remove automatic appending of filename
    to compiler command as that removes flexibility from the user. Re-opens
  * [5ef47fb] README.source: Update text to match current practice regarding
    generating the orig.tar.gz and branch merging.

b0e46cc... by James McCoy on 2009-03-05

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

Imported using git-ubuntu import.

Changelog parent: 43f1ecffb13ecf21e4aec5099bf0398cbdb28643

New changelog entries:
  * [3694d28] Update README for patches 80 - 093
  * [7a0baa7] update-patches: Redirect `which' output to /dev/null
  * [6313a2e] Remove sarge and add squeeze to the Debian syntax files
  * [5623ecb] Update README for patches 94 - 108
  * [a80edd8] syntax/fstab.vim: Recognize ext4 related options (Closes:
  * [813748e] Update README for patches 109 - 130
    - [9cff935] [7.2.130] Vim may haing until CTRL-C is typed when using
      CTRL-Z (Closes: #516580)