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

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

Import patches-unapplied version 1:7.1.314-3ubuntu3.1 to ubuntu/intrepid-proposed

Imported using git-ubuntu import.

Changelog parent: 294758bce2601e29a7b479c50898abdbf64e2a93

New changelog entries:
  * SECURITY UPDATE: arbitrary command execution via vim scripts
    - Cherry-picked fixes from Debian's Lenny vim svn.
    - http://git.debian.org/?p=pkg-vim/vim.git;a=shortlog;h=refs/heads/maint/lenny
    - runtime/autoload/netrw.vim: Backported NetrwDelete() from netrw v132 so
      we pass the netrw.v4 vulnerability test from www.rdancer.org
    - CVE-2008-2712
  * SECURITY UPDATE: user-assisted arbitrary command execution from "K" in
    Visual mode
    - Upstream patch 7.2.010
    - src/normal.c: NUL-terminate the identifier string
    - src/normal.c: Only use the word under the cursor, instead of the entire
      line after the cursor, when constructing the shell command to run.
    - http://git.debian.org/?p=pkg-vim/vim.git;a=commit;h=cb279e0979a103089695c21564ccc5bf8de5f558
    - http://git.debian.org/?p=pkg-vim/vim.git;a=commit;h=706c71e15525a8939ede60c827f4131007f0c81e
    - http://git.debian.org/?p=pkg-vim/vim.git;a=commit;h=805d0695937ec8c634a3d07393df2e7e565370b4
    - CVE-2008-4101

294758b... by Colin Watson on 2008-07-21

Import patches-unapplied version 1:7.1.314-3ubuntu3 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 0e4cbe77f7fce9605ec331c4df229919776255eb

New changelog entries:
  * runtime/syntax/grub.vim:
    - Add Ubuntu-specific 'quiet' keyword.
  * Remove some unnecessary divergence from Debian, thanks to James Vega
    (LP: #248713):
    - Remove explicit settings of textwidth=0 and nobackup, since those are
      already the defaults.
    - Remove explicit setting of viminfo to a subset of the default, thereby
      adding s10 and h.
    - Remove NoDisplay=true from gvim.desktop; vim-gui-common isn't
      installed by default and there's no reason to withhold the menu entry
      from those who have installed it (LP: #3222).

0e4cbe7... by Steve Kowalik on 2008-07-19

Import patches-unapplied version 1:7.1.314-3ubuntu2 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 560b849f057dab3159359be2e368ef5a65c0ce6f

New changelog entries:
  * Rebuild for libgpmg1 -> libgpm2 transistion.

560b849... by Colin Watson on 2008-06-26

Import patches-unapplied version 1:7.1.314-3ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: dcd63de5d80e263207646df4b91e27a64b8392c2

New changelog entries:
  * Resynchronise with Debian. Remaining changes:
    - Enable detection of GNU screen as a mouse-capable terminal.
    - Add NoDisplay=true to gvim.desktop.
    - Drop vim-lesstif package and lesstif2-dev build-dependency.
    - Build-depend on libxt-dev.
    - Enable Python interpreter on basic builds.
    - Create a .pot file for translations.
    - Disable autoindent, line-wrapping, and backup files by default.
  * Fixes various vulnerabilities due to improper quoting of 'execute'
    arguments (LP: #240216).
  * Drop fixes for upgrade problems from Ubuntu 6.06 LTS; direct upgrades
    from 6.06 to 8.10 will not be supported.
  * Update runtime files affected by the filename escape vulnerability.
    (CVE 2008-2712, Closes: #486502)
  * debian/vim-runtime.preinst:
    - Only add the diversions if the preinst is called with the "install" or
      "upgrade" (to handle the previous mishandling in postrm) arguments.
  * debian/vim-runtime.postrm:
    - Only remove the diversions if the postrm is called with the "remove"
      argument. (Closes: #486446)
  * runtime/menu.vim:
    - Escape the buffer name when using the "Window -> Split File Explorer"
      menu item. (Closes: #486417)
  * debian/rules:
    - Tell configure to only check the GUI toolkit specific to the variant
      being built. (Closes: #486319, #486336)
  * runtime/ftplugin/debchangelog.vim:
    - Merge Launchpad bug completion from Ubuntu.
    - Specify the full path when calling apt-listbugs instead of relying on
      /usr/sbin being in the user's path.
    - Improve error handling for Launchpad bug completion.
  * New upstream patches (294 - 314), see README.gz for details.
    - SELinux support merged upstream
  * Update NetRW to version 125n (pre-release).
    - Calculate length of multi-byte strings properly. (Closes: #474609)
    - Display/navigate symlinks to directories properly. (Closes: #474980)
  * Update vim-git runtime files.
  * debian/update-patches:
    - Fix determination of patch level from last commit.
    - Use debian:debian/README to determine current patch level.
    - Don't exit on error since that prevents correcting merges.
    - Use a standard commit message for debian/README.
  * runtime/ftplugin/debchangelog.vim:
    - NewVersion() should only call foldopen if folding is enabled.
  * runtime/macros/justify.vim:
    - Calculate strlen for multi-byte strings properly. (Closes: #481115)
  * debian/rules:
    - Make use of upstream's "shadow" directories so the variants can be built
      in parallel.
    - Remove .NOTPARALLEL to allow parallel building.
    - Remove useless dh_shlibdeps call in the binary-indep target.
    - Remove autoconf-stamp target since we're no longer patching configure.
  * debian/vim-runtime.install:
    - Add new gvimtutor to vim-runtime package.
  * Very carefully divert vim-tiny's help.txt and helptags so they will still
    be in place if vim-runtime is removed.
  * debian/control:
    - Remove vim-runtime's Replaces of vim-tiny since the conflicting files
      are now handled by diversions.

dcd63de... by Fabien Tassin on 2008-05-25

Import patches-unapplied version 1:7.1.293-3ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 1ece4617534c593047801772b8ac4298569dcc6f

New changelog entries:
  * Merge from debian unstable (LP: #234766), remaining changes:
    - Enable detection of GNU screen as a mouse-capable terminal.
    - Add NoDisplay=true to gvim.desktop.
    - Drop vim-lesstif package and lesstif2-dev build-dependency.
    - Build-depend on libxt-dev.
    - Restore a number of Conflicts/Replaces and include
      /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1}, both to help with upgrade
      problems from 6.06.
    - Enable Python interpreter on basic builds.
    - Create a .pot file for translations.
    - Disable autoindent, line-wrapping, and backup files by default.
    - Omni completion for Launchpad bugs.
  * runtime/syntax/debchangelog.vim,debsources.vim:
    - Update the list of supported Ubuntu releases.
  * debian/policy/vim-policy.xml:
    - Remove svn keywords since it's not being stored in svn anymore.
  * debian/vim-variant.postinst:
    - Remove switching on $1 since it's safe to always add the alternatives.
  * debian/vim-variants.prerm:
    - Add removal of alternatives during deconfigure. (Closes: #411697)
  * debian/README.Debian:
    - Add information about mimicing Vim's default modeline behavior and the
      securemodelines plugin. (Closes: #479060)
  * debian/rules:
    - Separate build-arch and build-indep targets so Vim's policy document
      aren't built on the buildd's (thus avoiding the openjade segfault on
  * debian/control:
    - Move docbook-utils and docbook-xml to Build-Depends-Indep
  * src/if_python.c:
    - If building against Python 2.5, use ssize_t instead of int according to
      PEP 353.

1ece461... by Colin Watson on 2008-05-01

Import patches-unapplied version 1:7.1.293-2ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: e34ca75ad81128bf9120e6b0e90bc074b9a17d59

New changelog entries:
  * Resynchronise with Debian (LP: #183935); thanks to James Vega for
    including a number of our changes! Remaining changes:
    - Enable detection of GNU screen as a mouse-capable terminal.
    - Add NoDisplay=true to gvim.desktop.
    - Drop vim-lesstif package and lesstif2-dev build-dependency.
    - Build-depend on libxt-dev.
    - Restore a number of Conflicts/Replaces and include
      /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1}, both to help with upgrade
      problems from 6.06.
    - Enable Python interpreter on basic builds.
    - Create a .pot file for translations.
    - Disable autoindent, line-wrapping, and backup files by default.
    - Add intrepid to lists of Ubuntu distributions.
    - Add metapackages to list of allowed debian/control sections.
    - Add omni completion support for Launchpad bugs via
  * Improve omni completion for Launchpad and debbugs, so that it allows
    completion of bug number parts (base), e.g.
    "LP:<space>#1<ctrl-x><ctrl-o>" will include all bugs from the package
    beginning with "1". Previously, this would have invoked a completion
    using debbugs (thanks, Daniel Hahler; LP: #196112).
  * debian/rules:
    - Fix expansion of @VIMCUR@ in vimrc.tiny. Based off a patch by Daniel
      Hahler. (Closes: #477379)
    - Create a separate install-stamp-vim-tiny target.
    - Add the proper lines for vimrc.tiny to vim-tiny.{install,links} in the
      install-stamp-vim-tiny target.
  * debian/control:
    - Correct the vim-common and vim-runtime descriptions with regard to
    - Add Conflicts/Replaces to vim-tiny against vim-common since
      /etc/vim/vimrc.tiny is moving to the vim-tiny package.
  * runtime/syntax/messages.vim:
    - Support highlighting of RFC3339 timestamps. (Closes: #475568)
  * runtime/scripts.vim:
    - Detect Mozilla Thunderbird's mbox file as mail filetype. Thanks to
      Kevin B. McCarty for the patch. (Closes: #475300)
  * runtime/filetype.vim:
    - Add detection of more passwd/shadow related files. Based on a patch by
      Jarek Kamiński. (Closes: #420304)
    - Improve filetype detection of strace logs. Thanks to Philipp Marek for
      the patch. (Closes: #473967)
    - Add filetype detection of more Apache config files. Thanks to Josh
      Triplett and Xavier Guimard for the patch. (Closes: #421312)
    - Fix a missing comma in the cron filetype detection.
  * debian/control:
    - Add Provides for vim-{ruby,python,perl,tcl} to any variant that supports
      those language bindings since some packages benefit from being able to
      specify a Depends on a vim package with support for a specific language.
    - Only Build-Depend on libselinux1-dev for linux systems.
    - Remove Provides from the transition packages.
  * runtime/filetype.vim:
    - Use "setf" instead of "set ft" when setting the filetype to git so that
      we don't override another filetype which may have been set during
      filetype detection.
  * runtime/syntax/debchangelog.vim:
    - Cleanup the list of recognized releases and add
  * Lintian cleanups
    - Change doc-base section to Editors.
    - Remove Encoding key from desktop entry.
  * New upstream patches (286 - 291), see README.gz for details.
  * Add SELinux support (Closes: #474102)
    - Vim patch taken from Fedora's Vim packaging
    - Thanks to Vaclav Ovsik for the patch to the Debian packaging.
  * Fix indentation of Perl files when folding is enabled. Thanks to Gregory
    Hainaut for the patch. (Closes: #473660)
  * debian/control:
    - Add libselinux1-dev and autoconf Build-Depends.
  * debian/rules:
    - Rule & dependency added for rebuilding src/auto/configure.
    - Add update-orig target to prep a new upstream+patches orig.tar.gz for
  * Repack upstream tarball so we're no longer using tarball(s)-in-tarball.
  * New upstream patches (267 - 285), see README.gz for details.
    - 7.1.277 adds recognition of a few extra groff macros (TP, HP, Pp, Lp,
      and It) in the default 'paragraphs' option. (Closes: #468924)
  * Updated runtime files:
    - syntax/sh.vim:
      + No longer mishighlight parenthetical expressions inside arithmetic
        expansions. (Closes: #468366)
    - syntax/debcontrol.vim:
      + Fix syntax highlighting for Vcs-Svn field to accept svn+ssh and remove
        the leading "svn+" from http URLs. (Closes: #472201)
    - syntax/debsource.vim:
      + Add lenny as a recognized distribution.
      + Add debtorrent, ssh, rsh, cdrom, and copy URIs. (Closes: #471556)
    - filetype.vim
      + Add .dpkg-{old,dist} to the list of extensions which are ignored
        when determining filetype. (Closes: #421314)
      + Recognize /etc/cron.d/* as crontab filetype. (Closes: #472375)
    - Change the debchangelog and debcontrol ftplugins to require enabling of
      folding instead of folding by default.
  * Make debian/tiny/vimrc.tiny.diff a proper patch that is always applied and
    update it to only be enabled when TINY_VIMRC is defined.
  * debian/rules:
    - Remove the special-case targets for vim-tiny and add -DTINY_VIMRC to the
      CFLAGS used when building vim-tiny.
    - Cleanup dead/useless code from the makefile.
    - Restrict 'make test' from running unless build and host types are the
    - Allow vim-gnome to build on non-linux-gnu systems.
    - Only enable gpm on linux-gnu systems.
    - Automatically specify the Vim version when generating helpztags.1.
    - Add .NOTPARALLEL target.
    - Only run 'make distclean' if configure has already been run.
    - Remove patch, unpatch, extract targets/prerequisites now that the
      upstream source is directly unpacked in the tarball.
    - Simplify get-orig-source so there's only one set of commands that
      are run regardless of whether it's a normal or snapshot release.
  * debian/control:
    - Remove the [!hurd-i386] qualifier from libgnomeui-dev Build-Depend.
    - Remove quilt from Build-Depends.
    - Change Vcs-* fields to point at the git repo.
  * Adjust 'modeline' help to indicate that Debian defaults it to off.
  * Update README.Debian and FAQ to reflect the deviation from
    upstream's 'modeline' default. (Closes: #472522)
  * Remove NEWS entries relevant to stable or earlier releases.
  [ James Vega ]
  * New upstream patches (246 - 266), see README.gz for details.
    - 7.1.265 fixes an infinite loop when <Space> is included in 'isfname' and
      the user tries to complete a filename. (Closes: #465163)
    - 7.1.266 fixes an issue where Vim would stop parsing a terminal response
      early, causing the rest of the response to be interpreted as key presses
      from the user. (Closes: #466789)
  * debian/control:
    - Build-Depend on tcl-dev instead of tcl8.4-dev per Tcl/Tk policy.
  * Added patches:
    - make.vim-syntax.diff:
      + Add recognition of more function names. (Closes: #465912)
  * Removed patches:
    - configure-tcl_detection.diff:
      + Accepted upstream and merged as 7.1.257
  * Add debian/watch file.
  * debian/rules:
    - Add a get-orig-source target.
  [ martin f. krafft ]
  * add Tim Pope's vim-git integration (v1.1, commit a53cabb) to vim-runtime.
  [ James Vega ]
  * Correct a typo in /etc/vim/vimrc's (Closes: #467057) and eval.txt's (via
    new last-position-jump.diff patch) 'last-position-jump' code snippet which
    would cause it to fail if the g key were remapped.
  * runtime/syntax/debcontrol.vim:
    - Ignore case for control file keys
    - Match case for control file values
    - Improve syntax matching for Vcs-Svn, Vcs-Git, and Vcs-Cvs field values.
    - Match URLs for Vcs-Arch, Vcs-Bzr, Vcs-Darcs, Vcs-Hg.
    - Recognize more fields as multi-line.
    - Use the 'keepend' qualifier for the Vcs-* syntax regions to prevent
      mishighlighting of debcontrolHTTPUrl matches. (Closes: #466338)
  * debian/control:
    - Add "Provides: vim" to all vim variant packages. (Closes: #447714)
  * New upstream patches (242 - 245), see README.gz for details.
    - 7.1.244 fixes an issue where a maximized gvim window would size itself
      larger than the size of the workspace, cutting off part of the
      command-line. (Closes: #378311)
  * debian/control:
    - Add libacl1-dev to Build-Depends so it actually builds with acl support.
      Thanks to Lucas Nussbaum's dirty chroot builds for noticing this.
    - Change TCL to Tcl in the package descriptions.
  * New patches:
    - option.c-langmap_comma.diff:
      + Improves parsing of 'langmap' to follow the behavior specified in the
        help. Commas need to be escaped if they're being used literally
        instead of as a list separator. (Closes: #233008)
    - commandline-compatible.diff:
      + If either -N/-C options are given on the command line, set
        'nocompatible'/'compatible' after sourcing of the startup files
        finishes. (Closes: #438560)
  * Refreshed patches:
    - vimrc.tiny.diff
  * Register the justify and editexisting plugins for use with
    - justify.vim right and left aligns text by inserting extra spaces into
      the specified text. (Closes: #431945)
    - editexisting.vim will attempt to bring a running gvim to the foreground
      if 1) only one filename was given when invoking Vim and another Vim
      instance is editing it or 2) a swapfile for a file exists. (Closes:
  * debian/rules:
    - Add patch/unpatch targets.
    - Fix how quilt is invoked so it doesn't use the local user's settings.
      Thanks to Teemu Likonen for the patch. (Closes: #463775)
  * debian/copyright:
    - Adjust copyright string (capitalize the C) so it's recognized by
  * New upstream patches (232 - 241), see README.gz for details.
  * Remove vim-gui-common.menu and provide one menu file for each gvim
    package. (Closes: #461805)
  * debian/control:
    - Re-add ruby1.8 Build-Depends since that's required for Vim to detect
      that it can build with Ruby support. (Closes: #462284)
  * Updated patches:
    - netrwPlugin.vim-bwipe.diff:
      + Do a full refresh of NetRW since the functionality is spread out among
        multiple files.
    - python.vim-ftplugin_include.diff:
      + Fix an unescaped backslash so the option correctly matches whitespace
        instead of the letter s.
  * Removed patches:
    - patches/ruby.vim-ftplugin_ri.diff:
      + The ruby.vim in 7.1 already handles what the feature the patch was
        adding. (Closes: #462418)
  [ Debian Vim Maintainers ]
  * New upstream patches (176 - 231), see README.gz for details.
    - 7.1.227 fixes an issue where syntax highlighting could cause Vim to
      hang. (Closes: #400771)
  [ James Vega ]
  * debian/control:
    - Bump policy version to - no changes needed.
    - Drop Build-Conflicts on old version of libperl-dev.
    - Drop versioning from Build-Depends that are available in Sarge.
    - Drop unnecessary ruby and perl Build-Depends.
    - Suggest ttf-dejavu instead of ttf-bitstream-vera for the gvim packages.
      (Closes: #461295)
    - Remove dpkg Pre-Depends now that dak is accepting data.tar.bz2.
  * runtime/syntax/debchangelog.vim:
    - Adjust the "Closes" syntax highlighting to allow newlines as part of the
      whitespace. (Closes: #460074)
    - Recognize lenny-backports/lenny-volatile. (Closes: #461059)
  * runtime/syntax/debcontrol.vim: Add s390x, sh3, sh3eb, sh4, sh4eb to the
    list of recognized architectures. (Closes: #455993)
  * Added patches:
    - configure-tcl_detection.diff:
      + Update Vim's configure script to detect Tcl again after the Tcl
        maintainers' decision to move /usr/lib/tcl8.4/ to
    - tex.vim-syntax_additions.diff:
      + Disable spell checking for verbatim sections. (Closes: #445295)
    - netrwPlugin.vim-bwipe.diff:
      + Call bwipe when opening file:// URLs to remove the extra buffers that
        get created. Their creation is inevitable but this will clean up the
        buffer list. (Closes: #370082)
    - filetype.vim-udev.d.diff:
      + Detect /etc/udev.d/*.rules files as 'udevrules' instead of 'hog'
        filetype. (Closes: #437434)
    - vimspell.sh-typo.diff:
      + Fix a missing end-quote in tools/vimspell.sh.
    - mve.awk-interpreter.diff:
      + Adjust the #! line to use awk instead of nawk.
  * Updated patches:
    - fstab.vim-syntax.diff:
      + Added more sshfs support based on feedback from upstream.
  * Removed patches:
    - gui_gtk_x11.c_g_thread_init.diff:
      + This patch was initially added to silence a GLib warning (#428854)
        which isn't occurring anymore.
  * Stop removing vimspell, vim132, and maze from the runtime tools/
    directory. The issues leading to their removal should be addressed
    instead of removing them from the package.
    - vimspell - The tempfile vulnerability (CAN-2005-0069) has been fixed
      upstream for some time now.
    - vim132 - Add lintian overrides for "csh is harmful" and not having a
      Depends/Recommends/Suggests on tcsh | csh. This is the only file in the
      package that would use the shell and its an example script.
    - maze - maze.c doesn't work properly and its README suggests this may be
      the case on newer compilers and to use mazeansi.c, which does work.
  * runtime/syntax/debcontrol.vim:
    - Reworked the URL regex so that it should properly match any non-local
      domain name as specified in RFC 1738.
  * debian/rules:
    - Use bzip2 to compress the vim-runtime package.
  * Add tex.vim-update.diff, which syncs from upstream to fix some folding
    issues. (Closes: #456168)
  * debian/control:
    - Add Pre-Depends on dpkg (>= 1.10.24) for vim-runtime to please dak even
      though Sarge has a newer dpkg.
  [ James Vega ]
  * debian/rules:
    - Add LDFLAGS="-Wl,--as-needed" when calling configure.
  * Fix a typo in debsources.vim-syntax.diff. (Closes: #454672)
  [ Debian Vim Maintainers ]
  * New upstream patches (168 - 175), see README.gz for details.
  [ James Vega ]
  * Add spellfile.vim-doc.diff, which explains that a writable spell directory
    must exist for the plugin to download spell files. (Closes: #421045)
  * Lintian cleanup:
    - Remove /usr/share/vim/addons/plugins/ from vim-common.dirs.
    - Remove /usr/share/vim/vim71/tools/vim132 to silence a warning and error
      about csh.
    - Remove /usr/share/consolefonts/ from vim-runtime.dirs.
    - Remove /usr/share/doc/vim-common/html/policy/ from vim-doc.dirs.
    - Override the "desktop-command-not-in-package" warning for
      vim-gui-common. We make use of TryExec which should prevent the menu
      entry from showing up if none of the gvim-providing packages are
  * Move Vim's policy documentation to /usr/share/doc/vim-common/ instead of
    being under a separate policy/ directory.
  * runtime/ftplugin/debcontrol.vim: Correct a function definition to use !.
    (Closes: #454933)
  * runtime/syntax/debcontrol.vim: Don't require a three part domain for the
    Homepage field. (Closes: #455341)
  * Install the presubj file under /usr/share/bug/ for every vim variant, not
    just vim.
  * Add versioned Conflicts/Replaces on vim-common for the vim package since
    it contains /usr/share/bug/vim/presubj now.
  [ Debian Vim Maintainers ]
  * New upstream patches (139 - 167), see README.gz for details.
    - 7.1.147 fixes a crash when tab completing a user's home directory.
      (Closes: #453049)
    - 7.1.167 fixes a crash with large values for the -c option of xxd
      (Closes: #452789)
  [ James Vega ]
  * runtime/ftplugin/debchangelog.vim:
    - Fix NewVersion() to use the distribution from the previous changelog
      entry. (Closes: #446728)
    - Fix NewVersion() to increment the version of the first changelog entry
      regardless of how 'startofline' is set.
  * runtime/syntax/debchangelog.vim:
    - Recognize oldstable* upload targets.
  * Refreshed patches:
    - vimrc.tiny.diff
  * Added patches:
    - sh.vim_syntax.diff, which fixes the syntax highlighting of escaped
      single-quotes and comments. (Closes: #425443, #425797)
    - gnuada.diff, which updates the ada runtime files so they gracefully
      handle the user not having certain variables defined. (Closes: #440221)
  * syntax/debcontrol.vim:
    - Add syntax highlighting for Vcs-* control fields. (Closes: #448543)
  * Bump debhelper compat to 5.
  * debian/vim-runtime.install:
    - Remove usr/share/consolefonts/* since that's not shipped any more.
  * debian/control:
    - Add vim-dbg package to supply debugging symbols for the various vim
    - Fix a typo in the long description for the vim package.
    - Make use of multi-line (Build-)Depends support.
  * debian/rules:
    - Add binary-arch target for the vim-dbg package.
  * debian/gvim.desktop:
    - Add TryExec key so the menu entry is only shown if the gvim alternative
      has been setup.
  * Merges from Ubuntu:
    - runtime/syntax/debcontrol.vim:
      + Recognize restricted, universe, multiverse as part of the Section
      + Recognize XSBC-Original-Maintainer as a legal field.
    - runtime/syntax/debchangelog.vim:
      + Recognize Ubuntu releases as upload targets.
      + Recognize syntax for closing Launchpad bugs.
    - Add debsources.vim-syntax.diff:
      + Recognize restricted, universe, multiverse Sections.
      + Add more recent Ubuntu releases as recognized distributions.
  [ Stefano Zacchiroli ]
  * debian/README.Debian
    - fix typo in vim policy URL (Closes: #452555)
  [ James Vega ]
  * Add lhaskell.vim-syntax.diff, which restricts the matching of % to the
    beginning of the line when determining if the file is a TeX document.
    Thanks to Chung-chieh Shan for the patch. (Closes: #451440)
  * Add fstab.vim-syntax.diff, which adds support for sshfs syntax.
    (Closes: #451754)
  * Add filetype.vim-debfiles.diff, which improves detection of debcontrol and
    debsources files. Thanks to Loïc Minier for the debsources part of the
    patch. (Closes: #435552)
  * debian/control:
    - Remove Norbert Tretowski from Uploaders with his permission. Thanks for
      all your work.

e34ca75... by Colin Watson on 2008-01-31

Import patches-unapplied version 1:7.1-138+1ubuntu3 to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 8934f6dbe584a0a5c008c8fdd93b3471dcdac38b

New changelog entries:
  * patches/debchangelog_launchpad.diff:
    - Add omni completion support for Launchpad bugs via

8934f6d... by Michael Vogt on 2007-11-20

Import patches-unapplied version 1:7.1-138+1ubuntu2 to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 22515c967d710d8c24b3f79f72ca5a81e69228be

New changelog entries:
  * debian/control:
    - re-add the removed conflicts/replaces that apply for the
      dapper->hardy upgrades

22515c9... by Soren Hansen on 2007-10-19

Import patches-unapplied version 1:7.1-138+1ubuntu1 to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 55ccf04459fe940d9d29758c7c16071e4e5331e6

New changelog entries:
  * Merge from debian unstable, remaining changes:
    + debian/runtime/debian.vim.in:
      - Disable autoindent, linebreak and backup files
    + debian/rules:
      - Enable pythoninterpreter on basic builds
      - Skip -lesstif variant
      - Create a .pot file for translations
      - Use bzip2 compression for vim-runtime
    + debian/vim-common.dirs:
      - Include /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1} to help with
        upgrade problems from dapper; retain this until at least the first
        Ubuntu LTS release after 6.06
    + debian/gvim.desktop:
      - Add NoDisplay=true
    + debian/control:
      - DebianMaintainerField
      - Drop lesstif2-dev from Build-Depends
      - Add libxt-dev to Build-Depends to fix build
      - Drop vim-lesstif package
    + patches/debcontrol.vim.diff:
      - Add XSBC-Original-Maintainer as legal field
    + patches/900_debcontrol.vim.diff:
      - Add restricted, universe, multiverse, and metapackages to allowed
    + patches/screen-mouse-support.diff:
      - Enable detection of GNU screen as a mouse-capable terminal
        (LP #113227)
    + patches/901_debchangelog.vim.diff:
      - Add warty, hoary, breezy, dapper, edgy, feisty, gutsy, hardy,
        *-proposed, *-updates, *-security, *-backports, *-commercial, and
        *-partner to allowed distributions.
    + patches/add-ubuntu-sources.diff:
      - Add restricted, universe, multiverse to allowed sections
      - Add dapper, edgy, feisty, gutsy, hardy, *-proposed, *-updates,
        *-security, *-backports, *-commercial, and *-partner to allowed
    + patches/debchangelog_launchpad.diff:
      - Highlight Launchpad bug-closing syntax in debian/changelog files.
  * New changes:
    + debian/control:
      - Add dpkg-dev (>= 1.13.19) dependency (Debian removed it because
        stable has new enough dpkg-dev, but Dapper doesn't, so we keep it)
  * The following changes were dropped:
    + debian/control:
      - Pre-Depend on dpkg with bzip2 support (oldest support release has this
  [ Debian Vim Maintainers ]
  * New upstream patches (136 - 138), see README.gz for details.
  [ James Vega ]
  * Fix the lintian override files to match Lintian's output.
  * debian/rules
    - Remove a useless command from the variant clean target
    - Clean vim-tiny's generated debhelper files
    - Clean generated vim-policy files
  * Brown-paper bag bug in vim-full.preinst. Need to grep for bin/vim.full
    not vim/vim.full. (Closes: #446462)
  [ Debian Vim Maintainers ]
  * New upstream patches (057 - 135), see README.gz for details.
    - Patch 125 corrects Vim's TermResponse autocmd behavior.
      (Closes: #436452)
  [ Stefano Zacchiroli ]
  * debian/control
    - removing idle contributors from the Uploaders field
  [ James Vega ]
  * Add a slave link for gnome-text-editor.1.gz when we add the
    gnome-text-editor alternative. (Closes: #439549)
  * Update debcontrol.vim.diff to recognize "Homepage:" (Closes: #443444) and
    "XS-Vcs-*:" fields.
  * Update patches/filetype.vim-better_tex_vs_plaintex.diff so it properly
    escapes the pattern alternator (|) when determining whether the file is
    latex. Thanks Martin Krafft. (Closes: #444346)
  * Update patches/debchangelog-ftplugin.vim.diff to remove an extra
    "foldopen" command. (Closes: #441315)
  * Add de.po.diff to fix the translation of "Load File". Thanks Torsten
    Werner. (Closes: #443529)
  * Add samba.vim.diff which fixes the highlighting for "smb ports". Thanks
    Alberto Reyes. (Closes: #386064)
  * Add tex.vim-syntax_additions.diff, which adds syntax highlighting for
    acronyms, URLs, and citetest. (Closes: #444411, #444408, #444301)
  * Update menu file to use Applications instead of Apps and to require the
    gvim package to be installed in order to display the entry.
  * Update desktop file to remove legacy category.
  * debian/rules:
    - Remove vim-{python,perl,tcl,ruby,full} variants.
    - Add vim-nox which has all language bindings but no X requirement.
    - Include all language bindings when building vim-gtk.
  * debian/control:
    - Add Homepage field.
    - Remove Build-Depends on dpkg and dpkg-dev since the specific versions we
      need are older than what's in stable.
    - Make vim-full a transition package Depending on vim-gnome.
    - Make vim-{python,perl,tcl,ruby} transition packages Depending on

55ccf04... by LaMont Jones on 2007-10-04

Import patches-unapplied version 1:7.1-056+2ubuntu2 to ubuntu/gutsy

Imported using git-ubuntu import.

Changelog parent: d73dc9566141c61d17a9dfe32c70b5875ba00ffd

New changelog entries:
  * Trigger rebuild for hppa