Last commit made on 2005-12-20
Get this branch:
git clone -b ubuntu/hoary 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

af2bb02... by Jonathan Riddell on 2005-04-03

Import patches-unapplied version 1:6.3-046+1ubuntu7 to ubuntu/hoary

Imported using git-ubuntu import.

Changelog parent: ee418f37425ff5d205b2a1534e7960aa9aee66e4

New changelog entries:
  * Ensure kubuntu_01_xdg_menus.diff is not applied before uploading.
  * Add kubuntu_01_xdg_menus.diff to make kvim menu entry XDG compliant.
  * Revert KDE removal, thus making the kvim package actually have useful
    content rather than just a broken diversion of vim. kvim-ruby is still
  * Drop editor alternative priority to 35, since Ubuntu installs vim by
    default (closes: Ubuntu #4710).
  * Don't autoindent by default (Ubuntu: #5602)
  * SECURITY UPDATE: fix insecure temporary files
  * Added patch 104_secure_tempfiles.diff: use mktemp instead of insecure $$
    construction to create temporary files in vimspell.sh and tcltags.sh
  * References:
  * Resynchronise with Debian.
  * debian/vim-variant.desktop: Disable menu item again.
  * Norbert Tretkowski <email address hidden>:
    + new upstream patches (032 to 046), see README.gz for details
    + added a desktop entry under /usr/share/applications/ for all variants
      (closes: #285065)
    + added farsi fonts to vim-common package (closes: #258773)
  * Rebuild with python2.4.
  * 900_debcontrol.vim.diff: Add restricted, universe, and multiverse to
  * debian/rules (make_patch): Ignore error code from diff, since it'll
    normally be non-zero.
  * 900_debcontrol.vim.diff: Add amd64 to debcontrolArchitecture.
  * 901_debchangelog.vim.diff: Add warty and hoary to debchangelogTarget.
  * Fix changelog ordering.
  * Resynchronise with Debian.
  * Norbert Tretkowski <email address hidden>:
    + really add Brandens patch which adds XXX and FIXME comment hilighting
      to sh.vim (closes: #280471)
    + updated debcontrol.vim syntax file, which adds debcontrolArchitecture
      for s390, thanks to Gerfried Fuchs (closes: #281127)
  * Norbert Tretkowski <email address hidden>:
    + fixed broken vim-doc.preinst (closes: #280824, #280825)
  * Norbert Tretkowski <email address hidden>:
    + new upstream patches (026 to 031), see README.gz for details
    + add symlink replacing from vim-common also to vim-doc (closes: #279058)
    + added a new patch which adds XXX and FIXME comment hilighting to sh.vim,
      thanks to Branden Robinson (closes: #280471)
    + added a new patch which allows multiple spaces as arguments for xxd,
      thanks to Glyn Kennington (closes: #279709)
    + updated tpp and debcontrol syntax files, thanks to Gerfried Fuchs

ee418f3... by Jeff Waugh <email address hidden> on 2004-10-08

Import patches-unapplied version 1:6.3-025+1ubuntu2 to ubuntu/warty

Imported using git-ubuntu import.