Last commit made on 2012-02-28
Get this branch:
git clone -b ubuntu/oneiric-updates 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

393157a... by Rex Tsai on 2012-01-13

Import patches-unapplied version 2:7.3.154+hg~74503f6ee649-2ubuntu3.1 to ubuntu/oneiric-proposed

Imported using git-ubuntu import.

Changelog parent: 1bcad0f17301646b1f5f6f2ba55985627d61905d

New changelog entries:
  * debian/patches/debian/gtk-fork.patch: Opening a window before forking
    causes problems for GTK (LP: #856779)

1bcad0f... by Loïc Minier on 2011-10-06

Import patches-unapplied version 2:7.3.154+hg~74503f6ee649-2ubuntu3 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: e7762ec13a09b9f3559a1fbc51da169e2dda76b8

New changelog entries:
  * Update patch debian/ubuntu-version to list new "precise" dist/series in
    debchangelog and debsources.vim.

e7762ec... by Michael Bienia on 2011-05-05

Import patches-unapplied version 2:7.3.154+hg~74503f6ee649-2ubuntu2 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: e86a1c94e97e909abba4fe3018134a815afbf539

New changelog entries:
  * No-change rebuild with perl 5.12 (lp: #778053)

e86a1c9... by Michael Bienia on 2011-04-30

Import patches-unapplied version 2:7.3.154+hg~74503f6ee649-2ubuntu1 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: e27c296703c87f19ad6d6dfa102dd806f00eb52a

New changelog entries:
  * Merge with Debian unstable (lp: #774233)
  * Remaining changes:
    - debian/rules:
      + Work around ICE on ppc64 by exporting DEB_GCC_NO_O3=1.
    - 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/patches/debian/ubuntu-version.patch:
      + Update supported Ubuntu codenames: drop jaunty and karmic, add oneiric.
  * debian/gvim.desktop:
    Drop path and extension from the Icon filename to allow themes to change
    the icon (lp: #740842).

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.

3109f37... by James McCoy on 2011-04-09

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

Imported using git-ubuntu import.

Changelog parent: ae80b8525873b7731d6974d68b00e71418fd4ea2

New changelog entries:
  * Pull patches 036 - 154. (Closes: #608390)
    + 7.3.042: Clear the spell checking info only when clearing the options
      for a buffer. (Closes: #600688)
    + 7.3.088: Fix a sporadic crash when using Ruby bindings. (Closes:
    + 7.3.091: Don't write special K_IGNORE codes when recording a Vim
      session. (Closes: #608242)
  * debian/watch: Adjust dversionmangle to handle the hg naming.
  * Add upstream/es.po-recover.patch, which corrects the translation of the
    swap file recovery prompt. Thanks to Vicente Couce Díaz for the patch.
    (Closes: #606947)
  * debian/rules:
    + Remove -Wl,--as-needed since upstream now uses that when available.
    + Disable dynamic loading of language bindings until a more robust method
      of handling their dependencies is determined. (Closes: #611573)
  * Remove vim-lesstif package in favor of the new vim-athena package.
  * Add upstream/pythoncomplete-autoload-init.patch, which ensures PyParser's
    parserline variable is initialized. Thanks to John Eikenberry for the
    patch. (Closes: #608420)
  * Bump debhelper compatibility to 7.
    + Use dh_prep instead of dh_clean -k.
    + Bump debhelper Build-Depends to >= 7.
  * debian.vim: Remove BufRead autocmd which was incorrectly setting
    filetype=mail for reportbug.conf. Reportbug's temp files are always
    reportbug-*. (Closes: #621798)
  * Add upstream/debcontrol-syntax-multiarch.patch, which adds syntax
    highlighting of Multi-Arch fields in debian/control. Thanks to Thomas
    Preud'homme for the patch. (Closes: #621098)
  * debian/control:
    + Remove python3-dev Build-Depends since python3interp can only be enabled
      if dynamically loading the language binding libraries.
    + Change ruby Build-Depends to ruby1.8 since the unversioned packages are
      going away.
  * Add upstream/Makefile-parallel.patch, which adds the "shadow" target to
    the top-level Makefile so src/config.mk.dist is properly copied to
    src/auto/config.mk before invoking src/Makefile. This fixes parallel
    builds since config.mk.dist was introduced.
  + Update Lintian overrides for the consistent path names in 2.5.0.

ae80b85... by James McCoy on 2010-10-25

Import patches-unapplied version 2:7.3.035+hg~8fdc12103333-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d2cd744b33e2c131bfec70549a3ec1477300a77f

New changelog entries:
  * Pull patches 001 - 035.
    + More robust YAML highlighting. (Closes: #535682)
  * debian/rules:
    + Stop overriding CFLAGS on the command-line when invoking make. Upstream
      enforces an upper-limit of 1 for _FORTIFY_SOURCE due to the use of
      flexible arrays in nested structs, which improperly cause Vim to crash
      with _FORTIFY_SOURCE=2.
    + Use DEB_HOST_ARCH_OS instead of DEB_HOST_GNU_SYSTEM to determine whether
      Linux-specific functionality is enabled.
    + Use dpkg-vendor to change build configuration when building on Ubuntu.
      Thanks to Michael Bienia for the patch.
  * Make helpztags capable of generating tags files for non-English help
    files. (Closes: #600248)
  * Debian runtime:
    + Add natty as a recognized distribution. (Closes: #600560)
    + Add metapackages as a recognized section. (Closes: #600562)
    + Remove etch as a recognized distribution.
  * debian/control: Add dpkg-dev (>= 1.15.1) Build-Depends for dpkg-vendor.

d2cd744... by James McCoy on 2010-08-15

Import patches-unapplied version 2:7.3.000+hg~ee53a39d5896-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f1219a4143ca613aaf3ee464eceee813c718c8bb

New changelog entries:
  * New upstream release.
  * debian/rules:
    + Explicitly use the dynamic loading Python interfaces.
    + Remove cleanup from clean target which are now properly handled by
      upstream's Makefile.
  * Update version information in documentation.

f1219a4... by James McCoy on 2010-08-13

Import patches-unapplied version 2:7.3f.20100812+hg~20e83abf88b1-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 3aa77f9da58f8fd7f927bdb78bc898cc519b5b0a

New changelog entries:
  * Merge latest 7.3f pre-release.
    + Correctly restore multi-byte terminal titles when exiting Vim. (Closes:
    + Highlight text inside math zones correctly for tex files. (Closes:
    + Recognize nested cite regions in tex files. (Closes: #444288)
    + Support syntax highlighting of bash's $"". (Closes: #473736)
  * Patches merged upstream:
    + perl-indent-block.patch
    + logcheck-ftplugin.patch
    + tex-syntax-verbatim-spell.patch
  * Enable Lua scripting.
    + Add liblua5.1-0-dev and lua5.1 to Build-Depends.
    + Enable lua interface via dynamic loading.
  * Switch Perl interface to dynamic loading.
  * debian/rules: Prefer running tests with the vim-nox binary if it's
  * Bump Standards-Version to -- no changes needed.

3aa77f9... by James McCoy on 2010-07-21

Import patches-unapplied version 2:7.3b.20100720+hg~7b7508ee56f1-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 349f8826d8ce7341f23b3a20ed23bf9ae30bc617

New changelog entries:
  * Merge 7.3b pre-release.
    + Don't run autocommands when being killed to avoid overrunning the stack.
      (Closes: #580961)
    + Detect when the recovered buffer matches the on-disk file and notify the
      user. (Closes: #89359)
    + Update CMake runtime files. (Closes: #463715)
    + Correctly set timestamp for X selection transfers. (Closes: #577035)
    + Improve 'cindent's handling of javascript. (Closes: #588875)
    + Correctly displays characters inserted via digraph sequences which wrap
      to a new line. (Closes: #442184)
  * Patches merged upstream:
    + it-manpage-fixes.patch
    + lang-breaks-floating-point.patch
    + python-modlibs.patch:
      - Remove autoconf Build-Depends as configure.in isn't being patched
      - Remove autoconf-stamp pre-requisite for configure-stamp-% target.
  * Update debian/rules to handle the snapshot versioning.
  * Enable Python3 language interface.
    + Add python3-dev to Build-Depends.
    + Pass --enable-python3interp to configure when building variants with
      language interfaces enabled.