Last commit made on 2012-03-12
Get this branch:
git clone -b ubuntu/precise 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

58e0136... by Michael Bienia on 2012-03-11

Import patches-unapplied version 2:7.3.429-2ubuntu2 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: 9279801bf164094734ba4b71d1dbebd726696ce5

New changelog entries:
  * debian/runtime/vimrc, debian/runtime/gvimrc:
    Undo the changes from the previous upload as they conflict with/override
    user settings from ~/.vimrc (lp: #951440; re-open #871907).

9279801... by Michael Bienia on 2012-02-26

Import patches-unapplied version 2:7.3.429-2ubuntu1 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: 73d36dfaed0f2d85db8f0291c418b930d8aee289

New changelog entries:
  * Merge with Debian testing/unstable (lp: #927642). Remaining changes:
    - debian/runtime/debian.vim.in:
      + Add Launchpad integration to the Help menu if launchpad-integration is
    - 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/runtime/vimrc, debian/runtime/gvimrc:
    Set background=dark for vim and background=light for gvim (lp: #871907)

73d36df... by James McCoy on 2012-02-11

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

Imported using git-ubuntu import.

Changelog parent: 1066ea12365f3de93b0fe764ae72fee57ee433d9

New changelog entries:
  * Ignore failures in test61 since it is highly sensitive to timing.
    Slow/heavily loaded systems will cause the test to fail.
  * Install bug scripts with correct permissions.
    + Use dh_bugfiles to simplify process
    + Bump debhelper B-D to >= 7.2.3~

1066ea1... by James McCoy on 2012-02-05

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

Imported using git-ubuntu import.

Changelog parent: 33154e87fc65635279e9364e5798a5f817f3227d

New changelog entries:
  * Pull upstream tag v7-3-429
    + Updated sshconfig syntax file. (Closes: #594296)
    + 7.3.365: Fix crash when using a large Unicode character with syntax
      highlighting. (Closes: #657777)
  * Add new education and introspection sections to debcontrol syntax file.
    (Closes: #651381)
  * Update vim-common's mime information to handle only having vim-tiny
    installed. (Closes: #654674)
    + Add test -x /usr/bin/vim for the vim entries.
    + Add lower-priority vi entries.
  * Use new --enable-fail-if-missing flag to make configure fail if an
    interpreter is enabled but configure test fails.
  * Add bug script to show what binaries the vi/vim/gvim symlinks point to.
  * Only use /u/s/dpkg/default.mk when available.
    + Reduce versioned B-D on dpkg-dev
    + Manually set relevant makefile variables if file isn't present
  * Add alternate libncurses5-dev B-D to ease backporting.

33154e8... by James McCoy on 2011-12-01

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

Imported using git-ubuntu import.

Changelog parent: 5acf2417050783240cef6982f7628d105e12b0d3

New changelog entries:
  * Pull upstream tag v7-3-363
    + 7.3.358: Fix mouse handling since urxvt support. (Closes: #647055)
  * Set vim-lesstif's section to oldlibs, as suggested by

5acf241... by James McCoy on 2011-10-21

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

Imported using git-ubuntu import.

Changelog parent: dade6ec80bbaa809932496d0933cbbcff0c538a2

New changelog entries:
  * Pull upstream tag v7-3-346
    + 7.3.337: Redraw the screen after resizing the terminal. (Closes:
    + 7.3.343: Add mouse support for urxvt.
    + 7.3.344: Use read()/write() instead of fputs()/fread() to detect when
      the child GUI process has started. (Closes: #644639)
  * Don't build vim-gnome on m68k, since the dependencies aren't available.
  * Update Debian runtime files for Precise Pangolin. (Closes: #644489)
  * Use correct DEB_VERSION_* make variable for update-orig target.
  * Also use CPPFLAGS and LDFLAGS from /u/s/dpkg/buildflags.mk
  * Change libncurses5-dev B-D to libtinfo-dev.
  * Remove patch de.po-lesen.patch, merged upstream.
  * Set DEB_BUILD_MAINT_OPTIONS=hardening=-fortify so we don't override
    upstream's handling.
  * Bump Standards-Version to 3.9.2, no changes needed.

dade6ec... by James McCoy on 2011-10-05

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

Imported using git-ubuntu import.

Changelog parent: f5c46ee186c83087cb4bc249a15310a5e0ec527e

New changelog entries:
  * Pull upstream tag v7-3-333
    + 7.3.318: Fix behavior of C on empty last line. (Closes: #642432)
    + 7.3.323: Recognize a few more patterns for GCC error messages. (Closes:
    + 7.3.333: Handle multi-byte characters when using `.' to repeat a
      command. (Closes: #632542)
  * debian/rules: Remove debian/lintian/vim in clean-vim-basic
  * debian/rules: Include makefiles from dpkg-dev.
    + Bump dpkg-dev versioned B-D >= 1.16.1

f5c46ee... by James McCoy on 2011-09-19

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

Imported using git-ubuntu import.

Changelog parent: 25a6afb426448f9848e8b8dd2a12c00805ee9452

New changelog entries:
  * Pull upstream tag v7-3-315.
    + 7.3.295: When select() is interrupted loop and try again. (Closes:
    + 7.3.300: Python doesn't parse multi-byte argument correctly. (Closes:
  * Recognize armhf as an architecture in debcontrol files. (Closes: #638873)
  * Fix typo in vim policy. Thanks to Jakub Wilk for the patch. (Closes:
  * Add GenericName field to desktop file. (Closes: #641037)
  * Use versioned ruby binary name to ensure we're getting the correct build

25a6afb... by James McCoy on 2011-08-15

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

Imported using git-ubuntu import.

Changelog parent: e27c296703c87f19ad6d6dfa102dd806f00eb52a

New changelog entries:
  * Pull upstream tag v7-3-280.
    + Remove patches/crontab-syntax-case-ignore, merged upstream.
    + Remove patches/debcontrol-syntax-multiarch, merged upstream
    + Remove patches/dosini-syntax-hash, merged upstream
    + 7.3.261: Parse GCC 4.5+ "In file included from" messages correctly when
      using quickfix. (Closes: #621693)
  * debian/control:
    + Add vim-lua Provides to packages which are built with lua bindings.
    + Add Lua to long description for the packages which provide the bindings.
  * Drop +hg~$hash from the version string now that upstream is tagging the
    minor updates.
  * Update Debian/Ubuntu codenames in debchangelog/debsources syntax files.
    (Closes: #624686)
  * Add support for architecture wildcards in debcontrol syntax file. Thanks
    to Jakub Wilk for the patch. (Closes: #624805)
  * Remove path and extension from Icon key in the desktop file. Thanks to
    Michael Bienia for the patch. (Closes: #624688, LP: #740842)
  * debian/watch: Change dversionmangle to just drop the patch version.
  * Make the leading XC- optional for the Package-Type header in debcontrol
    syntax file. Thanks to Guillem Jover for the patch. (Closes: #628763)
  * Improve syntax highlighting for automake files. Based on a patch by
    Guillem Jover. (Closes: #628759)

e27c296... by James McCoy on 2011-04-10

Import patches-unapplied version 2:7.3.154+hg~74503f6ee649-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3109f37d35c3d78918d45b7c14b146d3100ed48a

New changelog entries:
  * Remove upstream/Makefile-parallel.patch as many parallel invocations of
    upstream's Makefile may result in multiple instances of cp trying to
    exclusively open src/auto/config.mk.
  * debian/rules: Add a src/auto/config.mk target which all configure-*
    targets have as a pre-requisite.