Last commit made on 2010-07-13
Get this branch:
git clone -b debian/squeeze 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

349f882... by James McCoy on 2010-07-12

Import patches-unapplied version 2:7.2.445+hg~cb94c42c0e1a-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9a463c390d30bdeb9773eb558533eaa91b4b1339

New changelog entries:
  * debian/control:
    + Use Breaks instead of Conflicts for the gvimtutor move.
    + Use linux-any wildcards for linux-specific Build-Depends. (Closes:
    + Bump Standards-Version to
  * Pull patches 439 - 445.
  * runtime/ftplugin/debchangelog.vim: Use “silent!” to avoid errors when
    disabling the menu. Thanks to Jan Christoph Ebersbach for the patch.

9a463c3... by James McCoy on 2010-06-14

Import patches-unapplied version 2:7.2.438+hg~d44112feb815-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 720692199413143eaf27f0e4660476d07429311f

New changelog entries:
  * Rework the diversion handling again.
    + vim-runtime.preinst: Add diversion on major version upgrades.
    + vim-runtime.postrm: Remove old diversion on major version upgrades.
    + vim-runtime Breaks vim-tiny less than the current source version.

7206921... by James McCoy on 2010-06-12

Import patches-unapplied version 2:7.2.438+hg~d44112feb815-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9d7c5ff91d272a912437adf8a464598fd59eb8e9

New changelog entries:
  * vim-runtime.preinst: Use the right function name for removing diversions
    when upgrading across major versions.

9d7c5ff... by James McCoy on 2010-06-12

Import patches-unapplied version 2:7.2.438+hg~d44112feb815-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 981b7bcb1694ce3873eeb0b548dc969c6fb48aaf

New changelog entries:
  * vim-runtime.preinst:
    + Remove code handling the Etch->Lenny diversion fixup.
    + Add handling of diversions when upgrading across major versions.
  * vim-runtime.postrm: Remove diversions on abort-install and disappear.
  * Move gvimtutor to vim-gui-common from vim-runtime. (LP: #484851)
  * debian/control: Remove versioned relationships which are satisified in

981b7bc... by James McCoy on 2010-05-29

Import patches-unapplied version 2:7.2.438+hg~d44112feb815-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 2d449f93fbbe1311a6d5847f17bfcaa3f9903e19

New changelog entries:
  * Fix FTBFS with parallel builds and using the autoconf target to update the
    configure script.

2d449f9... by James McCoy on 2010-05-26

Import patches-unapplied version 2:7.2.438+hg~d44112feb815-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5c0f21d5228457379e071a82cc854fa46d3c7053

New changelog entries:
  * Pull patches 437 - 438.
    + 7.2.438: Fix crash when running “vim -r”. (Closes: #583122)
  * Cherry-pick upstream/lang-breaks-floating-point.patch from upstream to
    prevent floating point functionality from breaking when the :lang command
    is issued. (Closes: #582421)
  * Fix building against Debian's Python 2.6 package. (Closes: #566842)
    + Cherry-pick upstream/python-modlibs.patch from upstream.
    + debian/control: Add autoconf to Build-Depends.
    + debian/rules: Re-generate configure at build time and remove on clean.

5c0f21d... by James McCoy on 2010-05-18

Import patches-unapplied version 2:7.2.436+hg~e12b9d992389-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 25b0c61632c166af4af0c13db47e33f471aa28e7

New changelog entries:
  * Pull patches 331 - 436.
    + 7.2.367: Make xxd follow documented behavior when using “-r -p”.
      (Closes: #567041)
    + 7.2.405: Re-enable default value for IncSearch to allow highlighting of
      matched text when using :substitute's c flag. (Closes: #572994)
    + 7.2.413: Largefile support for all Vim packages. (LP: #128494)
    + 7.2.426: Require literal commas be escaped in 'langmap'. (Fixes
      #233008, obviating upstream/langmap-comma-parsing.patch)
    + 7.2.429: Specifically check for ENOENT to decide a file doesn't exist.
      Also fixes the check for EFBIG/EOVERFLOW. (Closes: #430205, #139510)
    + Updated runtime files:
      - Fix sqlcomplete's <Left>/<Right> maps so they don't interfere with
        normal usage. (Closes: #560083)
      - Recognize Perl 5.10's “state” keyword. (Closes: #499644)
      - Handle a wider variety of quoting operators in Perl. (Closes:
  * debian/control:
    + Update Vcs-* to point to the Mercurial repository.
    + Bump Standards-Version to 3.8.4, no changes needed.
  * vim-policy: Update links to package descriptions and repository.
  * Reword presubj to provide a few methods for narrowing down the bug's
  * debian/rules:
    + Specify STRIP=: when running upstream's install targets to prevent
      upstream's automatic stripping.
    + Pass the --with-modified-by to the Debian Vim maintainers list.
    + Remove git helper targets.
    + Remove get-orig-source target and related variables, since we're just
      using the upstream Mercurial repository.
  * debian/source/format: Switch to “3.0 (quilt)”.
  * debian/README.source: Update description according to the change to
    Mercurial and use of “3.0 (quilt)” source format.
  * runtime/ftplugin/debchangelog.vim: Update completion of Ubuntu bugs based
    on a patch from Michael Bienia. (Closes: #566841)
  * runtime/syntax/{debchangelog,debsources}.vim: Remove intrepid and add
    maverick to the set of Ubuntu releases.
  * Use case-insensitive matching for month and day of week names in crontab's
    syntax file. Thanks to Chris Butler for the patch. (Closes: #568378)

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.