Last commit made on 2009-09-21
Get this branch:
git clone -b ubuntu/karmic-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

b86b9c1... by Loïc Minier on 2009-09-21

Import patches-unapplied version 2:7.2.245-2ubuntu2 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 5090c6871cff67c680b03e67aac97632f551f575

New changelog entries:
  * Add lucid as a valid suite in changelogs and sources.list.
  * Rename Vcs-* to XS-Debian-Vcs-*.

5090c68... by Bhavani Shankar on 2009-08-21

Import patches-unapplied version 2:7.2.245-2ubuntu1 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 2ac16976ed3c06a0aa94c13d0c4892e515acf461

New changelog entries:
  * Merge from debian unstable, remaining changes: LP: #407038
    - 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.

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)

43f1ecf... by James McCoy on 2009-01-11

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

Imported using git-ubuntu import.

Changelog parent: ccbbb3d4ea08f25ed0d2365c607139de4fcb0ffc

New changelog entries:
  * [4d191a4] Update README for patches 50 - 065
  * [37bd8e4] Update README for patches 66 - 079
    - [43035e4] [7.2.068] error when Emacs tags file line is too long (Closes:
  * debian/update-patches:
    - [38e4f12] die if lftp isn't installed
    - [fe1a8f1] Set GIT_AUTHOR_DATE when committing upstream patches
  * [b5182c2] Fix a few typos in the French translation (Closes:
  * [75a19d8] vim-runtime: Remove old version diversions in postinst
    (Closes: #503757)
  * [b170d58] debian/rules: Call dh_desktop for vim-gui-common

ccbbb3d... by James McCoy on 2008-11-30

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

Imported using git-ubuntu import.

Changelog parent: b829369e81c3f803de24e9fdf90c5aab58d4dbfb

New changelog entries:
  * [444b68d] syntax/python.vim: Add missing contained keyword for
    pythonDecoratorName (Closes: #504510)

b829369... by James McCoy on 2008-11-26

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

Imported using git-ubuntu import.

Changelog parent: 72fee58bd87e7a2888c93644f043349d77ec157b

New changelog entries:
  [ James Vega ]
  * [9525410] Remove EOLd feisty and add jaunty to
  * [c154fa3,606fc00] Update README for patches 026 - 049
  * [233b1c9] Add recognition of PRUNENAMES variable to syntax/updatedb.vim
    (Closes: #504084)
  * [f7bfa57] Don't install vim alternatives for vim-tiny. vim-tiny is built
    to act like vi, so the vim alternative just causes more confusion than
    it's worth (by default).
  * [f0116b4] Make vim-runtime Conflict vim-tiny << ${source:Version} to
    ensure diversions don't cause problems when upgrading to a new major
    upstream version. (Closes: #503757)
  * [401c913] Include rgb.txt in vim-runtime (Closes: #505069)
  * [045810d] Fix a typo in ftplugin/gitcommit.vim's comments... (Closes:
  * [b4fe540,3454e66] Correctly highlight Python decorator names. (Closes:
  [ Stefano Zacchiroli ]
  * [64d3690] policy: bump version and copyright year

72fee58... by James McCoy on 2008-10-20

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

Imported using git-ubuntu import.