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

0066467... by Marc Deslauriers on 2009-01-06

Import patches-unapplied version 1:6.4-006+2ubuntu6.2 to ubuntu/dapper-proposed

Imported using git-ubuntu import.

Changelog parent: 8fc41a645151eb90f04fe98cf55b6ba3e6846dc2

New changelog entries:
  * SECURITY UPDATE: arbitrary command execution via vim scripts
    - patches/910_SECURITY_CVE-2008-2712.diff: Based on Red Hat's patch
      backport for vim 6.3 and cherry-picked fixes from Debian's Lenny vim svn.
    - CVE-2008-2712
  * SECURITY UPDATE: user-assisted arbitrary command execution from "K" in
    Visual mode
    - patches/911_SECURITY_CVE-2008-4104.diff: Based on Red Hat's patch
      backport for vim 6.3
    - CVE-2008-4101

8fc41a6... by Neil McGovern on 2007-08-26

Import patches-unapplied version 1:6.4-006+2ubuntu6.1 to ubuntu/dapper-security

Imported using git-ubuntu import.

Changelog parent: 939a21b042a6447c190ce7368e92a235287ded85

New changelog entries:
  * SECURITY UPDATE: Format string vulnerability allows user-assisted remote
    attackers to execute arbitrary code.
  * Added 'patches/801_CVE-2007-2953': Use puts() instead of
    fprintf(). Patch from upstream, backported.
  * References

939a21b... by Martin Pitt on 2006-05-23

Import patches-unapplied version 1:6.4-006+2ubuntu6 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: ec7f16d6ad2e02c8309b11cf1440089bdddd82f8

New changelog entries:
  * debian/rules: Create a POT file on build.

ec7f16d... by Scott James Remnant (Canonical) on 2006-05-18

Import patches-unapplied version 1:6.4-006+2ubuntu5 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 67d3d61127f4e13f8e6c4c683bd3ba8390753310

New changelog entries:
  * Apply patch from Ryan Lortie to fix Ubuntu #44431.
  * Also add edgy to the Ubuntu releases list.

67d3d61... by Scott James Remnant (Canonical) on 2006-04-27

Import patches-unapplied version 1:6.4-006+2ubuntu4 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 9cbbcd9f6015e0a26e7f8969134a5342da94b30c

New changelog entries:
  * Reduce the vim alternative to 35 priority, it was having ideas
    somewhat above its station.

9cbbcd9... by Martin Pitt on 2006-04-26

Import patches-unapplied version 1:6.4-006+2ubuntu3 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 90daae8937d6b4c411c779d7d29c1fdbd03712bd

New changelog entries:
  * debian/updates/deb{control,sources}.vim: Add Ubuntu releases and
    components. Thanks to Karl Goetz <email address hidden> and
    Barry deFreese <email address hidden> for their initial patches.
    Closes: LP#30796

90daae8... by Daniel Silverstone on 2006-03-23

Import patches-unapplied version 1:6.4-006+2ubuntu2 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: b91388e61d3167f5e1ea7af27bc4d16bf02f0a2d

New changelog entries:
  * Reenable vim-ruby since we can now build it in main.

b91388e... by Matthias Klose on 2006-02-02

Import patches-unapplied version 1:6.4-006+2ubuntu1 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 41b1e7f7d2607179d766a8ed99d7f8d704d968e8

New changelog entries:
  * Synchronize with Debian unstable.
  * Convert Ubuntu patches to use quilt.
  * Re-register alternative for `editor'.
  * Install .desktop file again, add attribute NoDisplay=true.
  [ Norbert Tretkowski ]
  * debian/README.Debian: fixed typos (closes: #344608)
  * patches/148_debchangelog.vim.diff: added sarge-{backports|volatile} to
    debchangelog hilighting
  * debian/control: removed build-dependencies added for woody backport
  * debian/control: build-depend on make (>= 3.80+3.81.b4)
  [ Matthijs Mohlmann and Stefano Zacchiroli ]
  * debian/rules: moved "export DH_OPTIONS" back to the beginning of the
    file since old versions of make can't cope with it on
    target-specific variables. Fixes FTBFS on some archs.
    (closes: #344658)
  [ Stefano Zacchiroli ]
  * debian/rules: added 'export' target to generate source package
  * debian/rules: uses quilt to manage debian-specific patches, changed
    build-deps accordingly
  * Added patch 152_javascript.vim which fixes JavaScript syntax
    highlighting (closes: #343402)
  [ Pierre Habouzit ]
  * debian/control: fix vim-gui-common description. (closes: #347912)
  * 304_memline.c.diff causes FTBFS on Hurd, fix it. (closes: #348170)
  [ Debian VIM Maintainers ]
  * New upstream patches (005 and 006), see README.gz for details.
  [ Stefano Zacchiroli ]
  * Epoched all 6.4 versioned relationships in debian/control, they were
    erroneously non-epoched. (closes: #344368, #344414)
  [ Norbert Tretkowski ]
  * Applied patch from Adeodato Simó to fix broken syntax hilighting
    of urgency in debchangelog.vim. (closes: #338557, #343136, #344228)
  * No longer lists a mailinglist as uploader in changelog, until a consensus
    about policy items 4.4 and 5.6.4 is found. (closes: #343073)
  [ Stefano Zacchiroli ]
  * Fixed typo in vim-gui-common description. (closes: #343152)
  * Remove old /usr/share/doc/vim-common symlink during vim-doc and
    vim-common preinst phase. (closes: #343289)
  * debian/rules: finally found the karma of target-specific variables,
    hopefully the file is clearer now ... Fixes FTBFS on hppa.
    (closes: #344150)
  * Fixed dangling manpage symlinks in vim-gui-common.
    (closes: #344179, #343195, #343171)
  * Moved vimtutor from vim-common to vim-runtime
  * Added patch 151_sed.vim which improves sed's syntax highlighting.
    (closes: #336125)
  * Added patch 305_term.c which fixes 'pastetoggle' for working
    properly with F1-F4 keys on Debian xterm's. (closes: #342220)
  [ Debian VIM Maintainers ]
  * New upstream patches (002 to 004), see README.gz for details.
  [ Stefano Zacchiroli ]
  * Added back vim-tiny package. (closes: #222138)
  * Reshaped vim packaging as follows:
    - vim-common -> arch-dependent common files (variants w/o GUI)
    - vim-gui-common -> arch-dependent common files (variants w GUI)
      (closes: #338027)
    - vim-runtime -> vim runtime (arch-independent)
    - vim -> default variant
    - vim-* -> other variants
    - vim-tiny -> tiny variant, no vim-runtime dependency
    - the above changes additionally got rid of circular dependency
      vim -> vim-common -> vim (closes: #340037)
  * Added symlink /usr/share/vim/vimcurrent -> vim64, will be kept
    proper in future releases. /etc/vim/vimrc no longer version-aware.
  * Removed duplicate /usr/share/vim/vimfiles entry in vimrc.
    (closes: #337825)
  * (Re-)Fixed debian/runtime/vimrc, last version inhibit /usr/bin/ex.
  * au commands in vimrc executed only if has("autocmd").
  * No longer try to move configuration files from /etc to /etc/vim
    (ancient preinst, no longer needed to support upgrades from sarge).
  * Updated Description-s in debian/control.
  * Check for and removal of old vim.org diversion in postinst instead
    of postrm (closes: #341081)
  * Adds gvim, when compiled with gnome support, as an alternative for
    gnome-text-editor, with priority lower than gedit (closes: #287202)
  * Substituted @PKG@ in menu entry for package name (closes: #342074)
  [ James Vega ]
  * Added patch 148_debchangelog, update syntax/debchangelog.vim to
    recognize infrequently used but policy compliant syntax.
    (closes: #338557)
  * Fixed patch 304_memline.c.diff to avoid inifinte loops resolving
    symlinks. (closes: #336560)
  * Remove the 'p' vmap in /etc/vim/vimrc since it has various bad
    side-effects such as not being able to paste from a register while
    in visual mode.
  [ Matthijs Mohlmann ]
  * Updated syntax for sshd_config and ssh_config.
  * Updated syntax highlighting for asterisk.vim (Closes: #338256)
  [ Stefano Zacchiroli ]
  * Fixed debian/runtime/vimrc, last version broke some plugins behaviour
    (e.g. gzip, netrw) on files specified on cmdline.

41b1e7f... by Adam Conrad on 2005-11-10

Import patches-unapplied version 1:6.4-001+2ubuntu3 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 14f7c8d4e35508c5636f36e024d864b6d3682912

New changelog entries:
  * Drop GTK support in vim-basic again, to stop blowing out ubuntu-minimal.
  * Remove .desktop items -- oops.
  * Re-enable GTK support in vim-basic.
  * Resync with Debian.
  * Add 'dapper' to the list of supported distribution keywords.
  * Drop patch #990, as it has been merged upstream.
  [ Stefano Zacchiroli ]
  * Fixed debian/runtime/vimrc, last version broke some plugins behaviour
    (e.g. gzip, netrw) on files specified on cmdline.
  [ Debian VIM Maintainers ]
  * New upstream patch (001), see README.gz for details.
  [ Stefano Zacchiroli ]
  * Got rid of conflicts among vim-* packages (aka variants) using
    alternatives for /usr/bin/vim. (closes: #67823, #123959, #280934)
  * Got rid of removal of /usr/doc/* symlinks.
  * Added "sources" debian/rules target which downloads upstream tarballs.
  * Added patch 146_netrw.vim.diff, fixes some issues of netrw.vim with
    file://* URLs. (closes: #334868)
  * Added patch 303_option.c.diff, which fixes 'system()' behaviour when
    $SHELL is empty. (closes: #219386)
  * Added patch 304_memline.c.diff, which fixes swap file locking wrt
    symlinks. (closes: #329826)
  * Changed debian/runtime/vimrc so that /etc/papersize is read without using
    system(), fixes issues with exotic shells. (closes: #271338)
  [ James Vega ]
  * Added patch 147_perl.vim.diff, new upstream syntax file which supersedes
  [ Debian VIM Maintainers ]
  * New major upstream release (6.4).
    + Fixed typo in /usr/share/vim/vim63/doc/usr_04.txt. (closes: #328664)
  [ Norbert Tretkowski ]
  * Removed patches merged upstream:
    + 118_ocaml.vim.diff
  [ Debian VIM Maintainers ]
  * New upstream patch (003), see README.gz for details.
  [ Stefano Zacchiroli ]
  * Updated patches for new release:
    + 118_ocaml.vim.diff
    + 124_errorformat.vim.diff
    + 203_zh_TW.UTF8.po.diff
  [ Debian VIM Maintainers ]
  * New upstream patch (002), see README.gz for details.
  [ Debian VIM Maintainers ]
  * New major upstream beta release (6.4b).
  * New upstream patch (001), see README.gz for details.
  [ Norbert Tretkowski ]
  * Removed patches merged upstream:
    + 110_php.vim.diff
    + 112_prolog.vim.diff
    + 113_xml.vim.diff
    + 114_texinfo.vim.diff
    + 116_sh.vim.diff
    + 121_perl.vim.diff
    + 126_filetype.vim.diff
    + 128_vimdiff.1.diff
    + 132_bib.vim.diff
    + 139_perl.vim.diff
    + 143_eruby.vim.diff
    + 401_doc_exrc.diff
    + 403_usr_04.txt.diff
  [ James Vega ]
  * Updated patches for new release:
    + 102_filetype.vim.diff
    + 120_perl.vim.diff
    + 142_filetype.vim.diff
  * Stefano Zacchiroli <email address hidden>:
    + Fixed %ld typo in debian/patches/203_zh_TW.UTF8.po.diff
    + Added patch debian/patches/403_usr_04.txt.diff, which fixes a
      typo in usr_04.txt. (closes: #328664)
  * New upstream patches (087 to 090), see README.gz for details.
  * Norbert Tretkowski <email address hidden>:
    + Updated Standards-Version to 3.6.2 (no changes needed).
    + Exec vim with -f parameter in .desktop file. (closes: #329292)
  * Stefano Zacchiroli <email address hidden>:
    + Set SHELL=/bin/bash in debian/rules since we use bashisms.
      (closes: #310974)
    + Added patch 140_muttrc.vim.diff, which improves muttrc
      highlighting. (closes: #327074)
    + Added patch 141_asterisk.vim.diff, which adds support for Asterisk
      configuration files sytnax highlighting. (closes: #322850)
    + Added patch 142_filetype.vim.diff, which extends dch highlighting
      to Debian NEWS files. (closes: #328081)
    + Added patch 143_eruby.vim.diff, which adds support for eruby
      highlighting. (closes: #315902)
    + Added patch 144_scripts.vim.diff, which adds support for
      highlighting tla diffs. (closes: #305677)
    + Added patch 145_fortran.vim.diff, which fixes a matchit bug with
      Fortran's "module procedure". (closes: #308865)
    + Added patch 203_zh_TW.UTF8.po.diff, which fixes a translation
      error in locale zh_TW.UTF-8. (closes: #319420)
  * New upstream patch (086), see README.gz for details.
  * Norbert Tretkowski <email address hidden>:
    + Corrected wrong capitalization of menu entry. (closes: #320602)
  * Stefano Zacchiroli <email address hidden>:
    + Added patch 132_bib.vim.diff, which fixes highlighting of bibtex
      comments. (closes: #316184)
    + Added patch 133_filetype.vim.diff, which adds filetype recognition
      for several Zope related file kinds. (closes: #311007)
  * Matthijs Mohlmann <email address hidden>:
    + Added patch 133_resolv.vim.diff, which fixes highlighting of resolv.conf
      search entries. (closes: #311081)
    + Added patch 134_sshconfig.vim.diff, added HashKnownHosts to syn keyword
      sshconfigKeyword. (closes: #321119)
    + Added debsources.vim to debian/updates to add syntax highlighting for
      /etc/apt/sources.list and added this to filetype.vim. (closes: #308947)
    + Added patch 136_muttrc.vim.diff, added crypt_autosign, crypt_autoencrypt
      and xterm_set_titles to syn keyword. (closes: #323278)
  * Pierre Habouzit <email address hidden>:
    + Fix patch 105_xmodmap.vim.diff: wrt XF86_ClearGrab. (closes: #322355)
    + Fix typo in doc/editing.txt. (closes: #322254)
  * James Vega <email address hidden>:
    + Added patch 137_filetype.vim.diff, recognize mutt-ng rc/temp files as
      muttrc/mail filetypes. (closes: #307946)
    + Added patch 138_filetype.txt.diff, fix a typo in the changelog-plugin
      section of filetype.txt. (closes: #314595)
    + Added patch 139_perl.vim.diff, fix recognition of regular expression
  * New upstream patches (079 to 085), see README.gz for details.
    + 6.3.081, 6.3.082: Fix arbitrary shell commands execution by wrapping
      them in glob() or expand() function calls in modelines. (CAN-2005-2368)
      (closes: #320017)
  * James Vega <email address hidden>:
    + Added patch 129_filetype.vim.diff, which sets the filetype to perl for
      *.plx files. (closes: #314309)
  * Matthijs Mohlmann <email address hidden>:
    + Added patch 130_fstab.vim.diff, added bind as option. (closes: #308890)
    + Added patch 131_xxd.1.diff, fixes typo in xxd manpage. (closes: #311234)

14f7c8d... by Adam Conrad on 2005-08-22

Import patches-unapplied version 1:6.3-078+1ubuntu3 to ubuntu/breezy

Imported using git-ubuntu import.

Changelog parent: af2bb02d924ca8039726762992c4d31958b612e5

New changelog entries:
  * Rebuild for the cairo1 -> cairo2 transition.
  * SECURITY UPDATE: Fix code execution.
  * Add debian/patches/990_modeline_codeexec.diff:
    - Do not execute code in glob() and expand() statements when we read them
      from a modeline.
    - Combined upstream patches 6.3.081 and 6.3.082.
    - References:
  * debian/patches/124_errorformat.vim.diff: Remove obsolete hunk that doesn't
    apply any more.
  * Resynchronise with Debian.
  * debian/control:
    - Build-Depends on libxt-dev (Ubuntu: #11113).
  * Drop vim-lesstif package.
  * Add 'breezy' to the list of accepted distribution keywords.
  * Norbert Tretkowski <email address hidden>:
    + Removed all kvim related packages, the code is no longer maintained.
      Sorry. (closes: #234455, #237385, #283765, #293110, #194449, #205586,
      #266431, #272621, #294848, #245006, #194964)
    + Removed patch 401_gcc4.diff, it modified kvim code which is no longer
    + Added NEWS file, so people upgrading to this version getting informed
      about the kvim removal.
  * Matthijs Mohlmann <email address hidden>:
    + Fixed up a patch for xml.vim.
  * Norbert Tretkowski <email address hidden>:
    + Add a replaces: vim (<= 1:6.3-068+1) to every (k)vim-* package, required
      for menu-icon-missing fix from 1:6.3-068+2. (closes: #301866)
    + Urgency medium because above modification fixes regular upgrade with
    + Fixed broken rgvim manpage. (closes: #301881)
  * Pierre Habouzit <email address hidden>:
    + Enhance the es.po. (closes: #206782)
  * Matthijs Mohlmann <email address hidden>:
    + Modified patch 113_xml.vim.diff that fixes #196001 has introduced
      another syntax error. (closes: #301736)
    + Fixed menu-icon-missing on vim-* packages.
  * New upstream patch (068), see README.gz for details.
    + 6.3.068: When editing a compressed file xxx.gz which is a symbolic link
      to the actual file a ":write" no longer renames the link (patch by James
      Vega). (closes: #281630)
  * Norbert Tretkowski <email address hidden>:
    + Added James Vega <email address hidden> to uploaders.
    + Fixed wrong executable registration in /usr/lib/mime/packages/kvim,
      thanks to Robin Verduijn for the patch. (closes: #295471)
    + Fixed synchronisation of syntax highlighting in fortran 90 programs.
      (closes: #301452)
    + Removed vim-doc's dependency on vim, so it's possible to install vim-doc
      without also installing vim.
  * Pierre Habouzit <email address hidden>:
    + Fix php indent plugin, thanks to the ITLab at MUSC. (closes: #282135)
    + Fix prolog syntax file. (closes: #269692)
    + Fix xml syntax ('\' has no special meaning for xml). (closes: #196001)
    + Fix texinfo syntax file warning. (closes: #286763)
  * Matthijs Mohlmann <email address hidden>:
    + Fix lintian warning packages-installs-file-to-usr-x11r6:
      - Moving xpm files to /usr/share/pixmaps.
      - Edited the menu files.
    + Removed prerm-does-not-call-installdocs from lintian/vim.
    + Added patch 111_fstab.vim.diff to fix highlighting in fstab.
      (closes: #300108)
    + Removed Suggests: vim from vim-doc in debian/control.
    + Fixed binary-without-manpage for several packages.
    + Fixed pkg-not-in-package-test in kvim-tcl, kvim-ruby, kvim-python and
    + Fixed the errors postinst-does-not-call-updatemenus and
  * James Vega <email address hidden>:
    + Fixed wrong highlighting of comments in syntax/sh.vim when comments
      occur between switches of case. (closes: #269325)
  * Stefano Zacchiroli <email address hidden>:
    + Added patch 302_message.c.diff to fix CTRL-C quit loops in range commands.
      (closes: #295639)
    + Added patch 118_ocaml.vim.diff to ship latest version of ocaml runtime
      support files: {syntax,ftplugin,ident}/ocaml.vim.
    + Modifications on debian/rules:
      - Uses debian/compat in place of debian/rules' DH_COMPAT.
      - Ignores diff error in "make_patch" target since diff usually returns 1.
      - Added support for command line VARIANT variable to override VARIANTS.
  * Pepijn de Langen <email address hidden>:
    + Added patch 119_php.vim.diff to php syntax highlighting backticks.
      (closes: #144754)
  * Norbert Tretkowski <email address hidden>:
    + Disabled dh_installchangelogs and dh_installdocs for vim-doc.
    + Raised urgency to medium because of upstream patch 6.3.066.
  * New upstream patches (065 to 067), see README.gz for details.
    + 6.3.065: Entering Euro char via digraph doesn't always work.
      (closes: #298162)
  * Norbert Tretkowski <email address hidden>:
    + Added Pierre Habouzit, Torsten Landschoff, Matthijs Mohlmann, Stefano
      Zacchiroli, Alexis Sukrieh and Pepijn de Langen to uploaders.
      (closes: #299446)
    + Added a new patch from Christian Hammers which adds additional keywords
      to /etc/fstab syntax hilighting. (closes: #299704)
    + Modified --with-compiledby value to use $DEBFULLNAME and $DEBEMAIL.
    + Updated tpp syntax file, thanks to Gerfried Fuchs.
    + Changed priority of vim-common package from extra to optional.
  * Pierre Habouzit <email address hidden>:
    + Documented the /etc/vim/{g,}vimrc.local files in README.Debian.
    + Fixed some debcontrol.vim issues:
      - Don't search emails in fields that have not one. (closes: #114508)
      - Fix debcontrolName according to Policy. (closes: #148144)
    + Fixed tutor.vim to use usual locale envvars semantics. (closes: #289113)
    + Added a 16px icon for menu entries too
      (taken from http://www.vim.org/images/vim16x16.xpm). (closes: #39250)
    + Fixed changelog.Debian.gz detection. (closes: #263740)
    + Manpages various fixes:
      - Escape some dashes in vim(1). (closes: #279606)
      - Various fixes for xxd(1). (closes: #281124)
    + Fixed french translation. (closes: #277502)
  * Matthijs Mohlmann <email address hidden>:
    + Add syntax highlighting for xmodmap. (closes: #296759)
    + Fixed lintian warning unquoted-string-in-menu-item in kvim.menu.
    + Fixed lintian warning spelling-error-in-readme-debian (adviced should
      be advised).
    + Changed current maintainer in copyright file.
    + Fixed lintian warning package-relation-with-self in kvim.
    + Fixed lintian warning binary-has-unneeded-section in vim (added
    + Added depends on vim in vim-doc.
  * Alexis Sukrieh <email address hidden>:
    + Added a note about UTF-8 related issues in README.Debian.
    + Added debian/patches/108_automake.vim.diff (thanks to Alexander Kogan)
      which enables highlighting of _CPPFLAGS in automake files.
      (closes: #196212)
    + Added debian/patches/109_xdefaults.vim.diff (thanks to Peter De Wachter)
      which fixes bad highlighting when putting a FONT directive in xdefaults.
      (closes: #264284)
  * Stefano Zacchiroli <email address hidden>:
    + Added #DEBHELPER# tag to debian/vim-{doc,common}.preinst.
    + Minor cleanup of debian/rules so vim-{doc,common} uses dh_install
      instead of dh_movefiles ("binary" target could now be invoked twice
      after a single "install" invocation), let dh_compress compress README.
  * Norbert Tretkowski <email address hidden>:
    + New upstream patches (062 to 064), see README.gz for details.
    + Set maintainer address to project mailinglist on alioth and added myself to
    + Added a new patch which sets automake syntax recognition for files named
      GNUmakefile.am. (closes: #277596)
    + Added a new patch which adds testing-proposed-updates to debchangelog
      syntax hilighting.
  * New upstream patches (059 to 061), see README.gz for details.
  * Kudos to Javier Fernandez-Sanguino Pena, he discovered the usage of
    insecure $$ constructs in vimspell.sh and tcltags.sh which have been
    fixed with the last upload.
  * Removed vimspell.sh and tcltags.sh, these scripts are no longer supported
  * Removed patch which was added in 1:6.3-058+1, it's no longer required.
  * New upstream patches (055 to 058), see README.gz for details.
  * Added a new patch (stolen from Ubuntu) which modifies vimspell.sh and
    tcltags.sh so they use mktemp instead of insecure $$ construction to
    create temporary files. (CAN-2005-0069) (closes: #289560)
  * New upstream patches (047 to 054), see README.gz for details.
  * Source /etc/vim/gvimrc.local if available. (closes: #272001)
  * Added a new patch which fixes ftbfs on amd64 with gcc-4.0, thanks to
    Andreas Jochens. (closes: #288731)