Hi,
please find attached a debdiff which builds with Python3 as the default, and
adds Python2 variants as extra packages. I worked with the ycmd amd
vim-youcompleteme maintainer to test these packages in Ubuntu. Ubuntu's
motivation was to get rid off Python2 from some CD images, defaulting to
Python3. People still can install the -py2 variants, but it would be nice to
move to Python3 by default in vim for the next Debian release as well.
Matthias
PS: I left the ubuntu patches in the diff, at least for the unsupported status
of trusty, the Debian package is doing it wrong.
PPS: The python extensions are not linked against libpython to avoid
dependencies on more than one Python version when we have more than one
Python3.x version in the archive.
diff -Nru vim-7.4.1689/debian/changelog vim-7.4.1689/debian/changelog
--- vim-7.4.1689/debian/changelog 2016-04-03 15:25:38.000000000 +0200
+++ vim-7.4.1689/debian/changelog 2016-04-05 17:42:46.000000000 +0200
@@ -1,3 +1,21 @@
+vim (2:7.4.1689-2ubuntu1) xenial; urgency=medium
+
+ * Merge with Debian; remaining changes:
+ - 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/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ - debian/patches/debian/ubuntu-releases.patch:
+ + Add support for xenial, drop utopic to unsupported.
+ - debian/rules: Stop ignoring failures from flaky test86.
+ - Build using Python3.
+ - Build python2 variants for gtk, gnome, athena, nox.
+ * Build a vim-gtk3-py2 package.
+
+ -- Matthias Klose <[email protected]> Tue, 05 Apr 2016 17:22:10 +0200
+
vim (2:7.4.1689-2) unstable; urgency=medium
* Stop installing a dangling symlink at
@@ -46,6 +64,34 @@
-- James McCoy <[email protected]> Thu, 31 Mar 2016 21:57:48 -0400
+vim (2:7.4.963-1ubuntu5) xenial; urgency=medium
+
+ * No-change rebuild for ruby2.3-only support.
+
+ -- Matthias Klose <[email protected]> Sun, 13 Mar 2016 21:18:03 +0000
+
+vim (2:7.4.963-1ubuntu4) xenial; urgency=medium
+
+ * Build python2 variants for gtk, gnome, athena, nox.
+
+ -- Matthias Klose <[email protected]> Thu, 18 Feb 2016 11:32:30 +0100
+
+vim (2:7.4.963-1ubuntu1) xenial; urgency=medium
+
+ * Merge with Debian; remaining changes:
+ - 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/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ - debian/patches/debian/ubuntu-releases.patch:
+ + Add support for xenial, drop utopic to unsupported.
+ - debian/rules: Stop ignoring failures from flaky test86.
+ - Build using Python3.
+
+ -- Matthias Klose <[email protected]> Wed, 17 Feb 2016 19:51:22 +0100
+
vim (2:7.4.963-1) unstable; urgency=medium
* Merge upstream tag v7.4.963.
@@ -75,6 +121,33 @@
-- James McCoy <[email protected]> Wed, 09 Dec 2015 23:31:36 -0500
+vim (2:7.4.826-1ubuntu3) xenial; urgency=medium
+
+ * Build using Python3. LP: #1538198.
+
+ -- Matthias Klose <[email protected]> Tue, 26 Jan 2016 18:08:02 +0100
+
+vim (2:7.4.826-1ubuntu2) xenial; urgency=medium
+
+ * Rebuild for Perl 5.22.1.
+
+ -- Colin Watson <[email protected]> Sat, 19 Dec 2015 00:02:59 +0000
+
+vim (2:7.4.826-1ubuntu1) xenial; urgency=medium
+
+ * Merge with Debian testing; remaining changes:
+ - 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/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ - debian/patches/debian/ubuntu-releases.patch:
+ + Add support for xenial, drop utopic to unsupported.
+ * debian/rules: Stop ignoring failures from flaky test86.
+
+ -- Adam Conrad <[email protected]> Fri, 23 Oct 2015 10:24:47 +0100
+
vim (2:7.4.826-1) unstable; urgency=medium
* Merge upstream tag v7-4-826. Remove merged patches.
@@ -106,6 +179,41 @@
-- James McCoy <[email protected]> Sat, 13 Jun 2015 01:16:02 -0400
+vim (2:7.4.712-2ubuntu4) wily; urgency=medium
+
+ * Update list of Ubuntu releases.
+
+ -- Iain Lane <[email protected]> Wed, 21 Oct 2015 13:04:02 +0100
+
+vim (2:7.4.712-2ubuntu3) wily; urgency=medium
+
+ * No-change rebuild to add ruby2.2 support.
+
+ -- Matthias Klose <[email protected]> Tue, 08 Sep 2015 14:49:53 +0000
+
+vim (2:7.4.712-2ubuntu2) wily; urgency=medium
+
+ * debian/patches/debian/ubuntu-releases.patch: Move Ubuntu release fixes
+ to new local patch, drop lucid, and add missing karmic to unsupported.
+
+ -- Adam Conrad <[email protected]> Thu, 14 May 2015 04:20:53 -0600
+
+vim (2:7.4.712-2ubuntu1) wily; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - 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/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ - debian/rules: Ignore failures from flaky test86.
+ * Add vivid and wily to list of known releases.
+ * debian/rules: Use ps2write. Ghostscript 9.10 removed the 'pswrite' device.
+ We need to write level 2 postscript now.
+
+ -- Iain Lane <[email protected]> Wed, 13 May 2015 13:14:47 +0100
+
vim (2:7.4.712-2) unstable; urgency=medium
* Add stretch to Debian syntax files. (Closes: #783506)
@@ -173,6 +281,26 @@
-- James McCoy <[email protected]> Mon, 29 Dec 2014 23:13:17 -0500
+vim (2:7.4.488-3ubuntu2) vivid; urgency=medium
+
+ * debian/patches/fixtest63.patch: Cherry-pick r6411 from upstream to fix
+ test63 on the buildds, where TERM is unset.
+
+ -- Iain Lane <[email protected]> Tue, 09 Dec 2014 16:56:44 +0000
+
+vim (2:7.4.488-3ubuntu1) vivid; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - 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/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ - debian/rules: Ignore failures from flaky test86.
+
+ -- Iain Lane <[email protected]> Tue, 09 Dec 2014 13:50:12 +0000
+
vim (2:7.4.488-3) unstable; urgency=medium
* Install icons to /usr/share/icons/hicolor to work around #765069.
@@ -227,6 +355,37 @@
-- James McCoy <[email protected]> Thu, 19 Jun 2014 23:02:17 -0400
+vim (2:7.4.273-2ubuntu5) vivid; urgency=medium
+
+ * Backport Debian change "Install icons to /usr/share/icons/hicolor
+ to work around #765069."
+
+ -- Sebastien Bacher <[email protected]> Tue, 09 Dec 2014 09:57:25 +0100
+
+vim (2:7.4.273-2ubuntu4) utopic; urgency=medium
+
+ * Add it to the other place too...
+
+ -- Stéphane Graber <[email protected]> Mon, 20 Oct 2014 11:54:15 -0400
+
+vim (2:7.4.273-2ubuntu3) utopic; urgency=medium
+
+ * Add vivid to the list of valid Ubuntu series.
+
+ -- Stéphane Graber <[email protected]> Mon, 20 Oct 2014 11:44:53 -0400
+
+vim (2:7.4.273-2ubuntu2) utopic; urgency=medium
+
+ * Rebuild for Perl 5.20.0.
+
+ -- Colin Watson <[email protected]> Thu, 21 Aug 2014 13:55:30 +0100
+
+vim (2:7.4.273-2ubuntu1) utopic; urgency=medium
+
+ * Merge with Debian unstable and drop debian/ubuntu-fix-arches.patch.
+
+ -- Adam Conrad <[email protected]> Fri, 02 May 2014 13:11:09 -0600
+
vim (2:7.4.273-2) unstable; urgency=medium
* syntax/debcontrol.vim:
@@ -234,6 +393,23 @@
-- James McCoy <[email protected]> Fri, 02 May 2014 00:17:48 -0400
+vim (2:7.4.273-1ubuntu1) utopic; urgency=medium
+
+ * Merge from Debian unstable. Remaining changes:
+ - 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/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ - debian/control: Transition from lua5.1 to lua5.2.
+ - debian/rules: Ignore failures from flaky test86.
+ * debian/patches/debian/ubuntu-fix-arches.patch: Fix arch highlighting.
+ * debian/patches/debian/ubuntu-arches.patch: Dropped, merged upstream.
+ * debian/patches/debian/ubuntu-dists.patch: Dropped, merged upstream.
+
+ -- Adam Conrad <[email protected]> Thu, 01 May 2014 21:47:46 -0600
+
vim (2:7.4.273-1) unstable; urgency=medium
* Merge upstream tag v7-4-273
@@ -245,6 +421,25 @@
-- James McCoy <[email protected]> Thu, 01 May 2014 21:50:24 -0400
+vim (2:7.4.253-1ubuntu1) utopic; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - 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/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ - debian/patches/debian/ubuntu-dists.patch:
+ + Add devel and utopic as valid distribution targets.
+ - debian/patches/debian/ubuntu-arches.patch:
+ + Support ppc64el as a valid architecture.
+ - debian/control: Transition from lua5.1 to lua5.2.
+ - debian/rules: Ignore failures from flaky test86.
+ * upstream/completion-crash.patch: Drop, merged upstream.
+
+ -- Adam Conrad <[email protected]> Mon, 21 Apr 2014 22:00:05 -0600
+
vim (2:7.4.253-1) unstable; urgency=medium
* Merge upstream tag v7-4-253
@@ -283,6 +478,34 @@
-- James McCoy <[email protected]> Sun, 02 Feb 2014 19:27:58 -0500
+vim (2:7.4.052-1ubuntu3) trusty; urgency=medium
+
+ * No-change rebuild for Tcl 8.6.
+
+ -- Matthias Klose <[email protected]> Thu, 02 Jan 2014 20:29:37 +0100
+
+vim (2:7.4.052-1ubuntu2) trusty; urgency=low
+
+ * upstream/completion-crash.patch: Fix crash with Insert mode completion.
+
+ -- Adam Conrad <[email protected]> Tue, 10 Dec 2013 15:32:41 -0700
+
+vim (2:7.4.052-1ubuntu1) trusty; urgency=low
+
+ * Merge with Debian unstable, remaining changes:
+ - 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/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ * debian/patches/debian/ubuntu-dists.patch:
+ - Add devel and trusty as valid distribution targets.
+ * debian/patches/debian/ubuntu-arches.patch:
+ - Support arm64, ppc64el, and x32 as valid arches.
+
+ -- Adam Conrad <[email protected]> Fri, 18 Oct 2013 15:02:17 +0100
+
vim (2:7.4.052-1) unstable; urgency=low
* Merge upstream tag v7-4-052
@@ -305,6 +528,26 @@
-- James McCoy <[email protected]> Tue, 17 Sep 2013 20:29:24 -0400
+vim (2:7.4.000-1ubuntu2) saucy; urgency=low
+
+ * Use lua5.2 for the current lua transition in main (LP: #1196921)
+ * Ignore test86 for now, as it seems to do goofy things on powerpc.
+
+ -- Adam Conrad <[email protected]> Sun, 11 Aug 2013 13:11:28 -0600
+
+vim (2:7.4.000-1ubuntu1) saucy; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - 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/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ * Drop ubuntu-multiarch.patch, no longer required.
+
+ -- Adam Conrad <[email protected]> Sun, 11 Aug 2013 12:23:25 -0600
+
vim (2:7.4.000-1) unstable; urgency=low
* New upstream release.
@@ -366,6 +609,22 @@
-- James McCoy <[email protected]> Sun, 26 May 2013 22:18:36 -0400
+vim (2:7.3.923-1ubuntu1) saucy; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - 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/ubuntu-multiarch.patch:
+ + Fix builds with multiarch python and tcl.
+ - debian/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ * Drop ubuntu-raring.patch and usr-share-upstart.patch, merged.
+ * Drop launchpad-integration delta, no longer used in Ubuntu.
+
+ -- Adam Conrad <[email protected]> Tue, 21 May 2013 12:43:50 -0600
+
vim (2:7.3.923-1) unstable; urgency=low
* Merge upstream tag v7-3-923
@@ -396,6 +655,28 @@
-- James McCoy <[email protected]> Thu, 21 Feb 2013 22:13:43 -0500
+vim (2:7.3.547-7ubuntu1) saucy; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - debian/runtime/debian.vim.in:
+ + Add Launchpad integration to the Help menu if
+ launchpad-integration is installed.
+ - 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/ubuntu-raring.patch:
+ + Allow raring in deb* syntax hilighting.
+ - debian/ubuntu-multiarch.patch:
+ + Fix builds with multiarch python and tcl.
+ - debian/usr-share-upstart.patch:
+ + Set syntax to upstart for usr/share/upstart files.
+ - debian/update-upstart-syntax.patch:
+ + Add setuid and setgid to syntax file.
+ * Update ubuntu-raring.patch to recognize saucy as well.
+
+ -- Adam Conrad <[email protected]> Fri, 26 Apr 2013 04:23:33 -0600
+
vim (2:7.3.547-7) unstable; urgency=low
* Add vim-lesstif.preinst to handle transitioning /usr/share/doc/vim-lesstif
@@ -404,12 +685,74 @@
-- James McCoy <[email protected]> Sat, 09 Feb 2013 18:43:57 -0500
+vim (2:7.3.547-6ubuntu5) raring; urgency=low
+
+ * Configure for the Tcl 8.5 multiarch installation.
+
+ -- Matthias Klose <[email protected]> Tue, 02 Apr 2013 10:57:32 +0200
+
+vim (2:7.3.547-6ubuntu4) raring; urgency=low
+
+ * New debian/usr-share-upstart patch to set syntax to upstart for
+ */usr/share/upstart/**/*.conf files.
+ * Rename Vcs-* to XS-Debian-Vcs-* in control.
+
+ -- Loïc Minier <[email protected]> Wed, 20 Feb 2013 15:21:14 +0100
+
+vim (2:7.3.547-6ubuntu3) raring; urgency=low
+
+ * Fix FTBFS with multi-arched Python (lp: #1095320):
+ + debian/rules:
+ Specify the Python library's config directory as the configure script
+ can't find it on its own since the library package got multi-arched.
+ + d/p/ubuntu-multiarch.patch:
+ Use the "python-config" script to determine libs and includes for
+ Python.
+
+ -- Michael Bienia <[email protected]> Wed, 02 Jan 2013 08:48:59 -0800
+
+vim (2:7.3.547-6ubuntu2) raring; urgency=low
+
+ * d/p/debian/update-upstart-syntax.patch: Add setuid and setgid to
+ syntax file.
+
+ -- Clint Byrum <[email protected]> Fri, 21 Dec 2012 09:42:11 -0800
+
+vim (2:7.3.547-6ubuntu1) raring; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - debian/runtime/debian.vim.in:
+ + Add Launchpad integration to the Help menu if
+ launchpad-integration is installed.
+ - 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/ubuntu-raring.patch:
+ + Allow raring in deb* syntax hilighting.
+
+ -- Adam Conrad <[email protected]> Sun, 02 Dec 2012 05:21:52 -0700
+
vim (2:7.3.547-6) unstable; urgency=low
* Always enable ACL support. (Closes: #693462)
-- James McCoy <[email protected]> Thu, 22 Nov 2012 09:37:52 -0500
+vim (2:7.3.547-5ubuntu1) raring; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - debian/runtime/debian.vim.in:
+ + Add Launchpad integration to the Help menu if
+ launchpad-integration is installed.
+ - 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.
+ * Add raring to the debchangelog and debsources syntax hilighting.
+
+ -- Adam Conrad <[email protected]> Mon, 22 Oct 2012 10:43:15 +0100
+
vim (2:7.3.547-5) unstable; urgency=low
* Use xz compression for all binary packages. (Closes: #687265)
@@ -418,6 +761,20 @@
-- James McCoy <[email protected]> Sat, 15 Sep 2012 23:59:18 -0400
+vim (2:7.3.547-4ubuntu1) quantal; urgency=low
+
+ * Make vim-* installable again (lp: #1043035) by merging with Debian
+ unstable:
+ - debian/runtime/debian.vim.in:
+ + Add Launchpad integration to the Help menu if launchpad-integration is
+ installed.
+ - 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.
+
+ -- Michael Bienia <[email protected]> Wed, 29 Aug 2012 09:30:43 +0200
+
vim (2:7.3.547-4) unstable; urgency=low
* Add remove-py_config.patch, removing the dependence on Python's config.c.
@@ -438,6 +795,19 @@
-- James McCoy <[email protected]> Thu, 21 Jun 2012 22:28:51 -0400
+vim (2:7.3.547-1ubuntu1) quantal; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - debian/runtime/debian.vim.in:
+ + Add Launchpad integration to the Help menu if launchpad-integration is
+ installed.
+ - 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.
+
+ -- Adam Conrad <[email protected]> Sun, 24 Jun 2012 03:13:56 -0600
+
vim (2:7.3.547-1) unstable; urgency=low
* Merge upstream tag v7-3-547
@@ -470,6 +840,35 @@
-- James McCoy <[email protected]> Thu, 24 May 2012 21:37:40 -0400
+vim (2:7.3.429-2ubuntu3) quantal; urgency=low
+
+ * Add quantal to the debchangelog and debsources syntax hilighting.
+
+ -- Adam Conrad <[email protected]> Fri, 27 Apr 2012 10:17:02 -0600
+
+vim (2:7.3.429-2ubuntu2) precise; urgency=low
+
+ * debian/runtime/vimrc, debian/runtime/gvimrc:
+ Undo the changes from the previous upload as they conflict with/override
+ user settings from ~/.vimrc (lp: #951440; re-open #871907).
+
+ -- Michael Bienia <[email protected]> Sun, 11 Mar 2012 14:30:55 +0100
+
+vim (2:7.3.429-2ubuntu1) precise; urgency=low
+
+ * Merge with Debian testing/unstable (lp: #927642). Remaining changes:
+ - debian/runtime/debian.vim.in:
+ + Add Launchpad integration to the Help menu if launchpad-integration is
+ installed.
+ - 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/runtime/vimrc, debian/runtime/gvimrc:
+ Set background=dark for vim and background=light for gvim (lp: #871907)
+
+ -- Michael Bienia <[email protected]> Sun, 26 Feb 2012 15:26:29 +0100
+
vim (2:7.3.429-2) unstable; urgency=low
* Ignore failures in test61 since it is highly sensitive to timing.
@@ -514,6 +913,19 @@
-- James McCoy <[email protected]> Wed, 30 Nov 2011 21:53:43 -0500
+vim (2:7.3.346-1ubuntu1) precise; urgency=low
+
+ * Merge with Debian testing/unstable (lp: #896587). Remaining changes:
+ - debian/runtime/debian.vim.in:
+ + Add Launchpad integration to the Help menu if launchpad-integration is
+ installed.
+ - 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.
+
+ -- Michael Bienia <[email protected]> Sat, 26 Nov 2011 14:40:17 +0100
+
vim (2:7.3.346-1) unstable; urgency=low
* Pull upstream tag v7-3-346
@@ -534,6 +946,29 @@
-- James McCoy <[email protected]> Thu, 20 Oct 2011 22:17:16 -0400
+vim (2:7.3.333-1ubuntu2) precise; urgency=low
+
+ * Rebuild for Perl 5.14.
+
+ -- Colin Watson <[email protected]> Tue, 15 Nov 2011 23:22:43 +0000
+
+vim (2:7.3.333-1ubuntu1) precise; urgency=low
+
+ * Merge with Debian testing/unstable; 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
+ installed.
+ - 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: add precise.
+
+ -- Loïc Minier <[email protected]> Mon, 17 Oct 2011 13:47:55 +0200
+
vim (2:7.3.333-1) unstable; urgency=low
* Pull upstream tag v7-3-333
@@ -591,6 +1026,40 @@
-- James Vega <[email protected]> Mon, 15 Aug 2011 06:35:08 -0400
+vim (2:7.3.154+hg~74503f6ee649-2ubuntu3) oneiric; urgency=low
+
+ * Update patch debian/ubuntu-version to list new "precise" dist/series in
+ debchangelog and debsources.vim.
+
+ -- Loïc Minier <[email protected]> Thu, 06 Oct 2011 12:03:26 +0200
+
+vim (2:7.3.154+hg~74503f6ee649-2ubuntu2) oneiric; urgency=low
+
+ * No-change rebuild with perl 5.12 (lp: #778053)
+
+ -- Michael Bienia <[email protected]> Thu, 05 May 2011 20:38:12 +0200
+
+vim (2:7.3.154+hg~74503f6ee649-2ubuntu1) oneiric; urgency=low
+
+ * 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
+ installed.
+ - 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).
+
+ -- Michael Bienia <[email protected]> Sat, 30 Apr 2011 17:21:30 +0200
+
vim (2:7.3.154+hg~74503f6ee649-2) unstable; urgency=low
* Remove upstream/Makefile-parallel.patch as many parallel invocations of
@@ -644,6 +1113,69 @@
-- James Vega <[email protected]> Sat, 09 Apr 2011 19:18:27 -0400
+vim (2:7.3.035+hg~8fdc12103333-1ubuntu7) natty; urgency=low
+
+ * Updated upstream/debian-runtime.patch to includes Multi-Arch field.
+
+ -- Kees Cook <[email protected]> Wed, 23 Mar 2011 22:45:53 -0700
+
+vim (2:7.3.035+hg~8fdc12103333-1ubuntu6) natty; urgency=low
+
+ * Update patch upstream/debian-runtime to also list oneiric in
+ runtime/syntax/debchangelog.vim and runtime/syntax/debsources.vim.
+
+ -- Loïc Minier <[email protected]> Wed, 23 Mar 2011 13:23:38 +0100
+
+vim (2:7.3.035+hg~8fdc12103333-1ubuntu5) natty; urgency=low
+
+ * runtime/syntax/upstart.vim: Improvements.
+
+ -- James Hunt <[email protected]> Fri, 11 Mar 2011 15:20:06 +0000
+
+vim (2:7.3.035+hg~8fdc12103333-1ubuntu4) natty; urgency=low
+
+ * runtime/syntax/upstart.vim: New syntax file for Upstart.
+ * runtime/filetype.vim: Updated to recognise Upstart configuration files.
+
+ -- James Hunt <[email protected]> Tue, 08 Mar 2011 12:14:56 +0000
+
+vim (2:7.3.035+hg~8fdc12103333-1ubuntu3) natty; urgency=low
+
+ * Work around ICE on ppc64 by exporting DEB_GCC_NO_O3=1.
+
+ -- Colin Watson <[email protected]> Fri, 18 Feb 2011 17:37:44 +0000
+
+vim (2:7.3.035+hg~8fdc12103333-1ubuntu2) natty; urgency=low
+
+ * No-change rebuild with Python 2.7 (lp: #688149).
+
+ -- Michael Bienia <[email protected]> Thu, 09 Dec 2010 17:24:51 +0100
+
+vim (2:7.3.035+hg~8fdc12103333-1ubuntu1) natty; urgency=low
+
+ * Merge with Debian unstable (lp: #662276):
+ - Use case-insensitive matching for month and day of week names in
+ crontab's syntax file (lp: #517019 aka Debian bug #568378).
+ - Fix sqlcomplete's <Left>/<Right> maps so they don't interfere with
+ normal usage (lp: #584797 aka Debian bug #560083).
+ - [7.2.386] KDE 3.1 focus hack causes problems for other window managers
+ (lp: #535341).
+ * Remaining changes:
+ - debian/control:
+ + Drop vim-lesstif package and lesstif2-dev build-dependency.
+ + Rename Vcs-* to XS-Debian-Vcs-*.
+ - debian/rules:
+ + Don't build the vim-lesstif variant in Ubuntu.
+ - debian/runtime/debian.vim.in:
+ + Add Launchpad integration to the Help menu if launchpad-integration is
+ installed.
+ - 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.
+
+ -- Michael Bienia <[email protected]> Mon, 25 Oct 2010 10:55:05 +0200
+
vim (2:7.3.035+hg~8fdc12103333-1) unstable; urgency=low
* Pull patches 001 - 035.
@@ -833,6 +1365,57 @@
-- James Vega <[email protected]> Tue, 18 May 2010 18:40:17 -0400
+vim (2:7.2.330-1ubuntu4) maverick; urgency=low
+
+ * runtime/syntax/debchangelog.vim, runtime/syntax/debsources.vim: add natty
+ to allowed dists.
+
+ -- Loïc Minier <[email protected]> Tue, 28 Sep 2010 02:49:59 +0200
+
+vim (2:7.2.330-1ubuntu3) lucid; urgency=low
+
+ * runtime/syntax/debchangelog.vim, runtime/syntax/debsources.vim: add
+ maverick to allowed dists.
+
+ -- Loïc Minier <[email protected]> Fri, 16 Apr 2010 11:31:40 +0200
+
+vim (2:7.2.330-1ubuntu2) lucid; urgency=low
+
+ * debian/rules: Temporarily disable parallel building until we figure out
+ where it is broken (fixes the current FTBFS).
+
+ -- Michael Bienia <[email protected]> Mon, 08 Mar 2010 20:35:33 +0100
+
+vim (2:7.2.330-1ubuntu1) lucid; urgency=low
+
+ [ Michael Bienia ]
+ * Merge with Debian unstable (LP: #509900):
+ - Highlight Breaks in debian/control (LP: #498303).
+ - [7.2.257] GTK 2.17: lots of assertion error messages (LP: #402188).
+ * Remaining changes:
+ - 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.
+ - Rename Vcs-* to XS-Debian-Vcs-*.
+ * runtime/ftplugin/debchangelog.vim: Use python-launchpadlib (and LP API)
+ instead of python-launchpad-bugs for bug completion for Ubuntu
+ (forwarded to Debian as bug #566841).
+ * src/configure.in, src/auto/configure:
+ As MODLIBS from python's config/Makefile includes LOCALMODLIBS which
+ shouldn't be used and breaks the build with newer python versions, use
+ BASEMODLIBS instead of MODLIBS (forwarded to Debian as bug #566842;
+ LP: #534251).
+
+ [ Colin Watson ]
+ * Add Launchpad integration to the Help menu if launchpad-integration is
+ installed (LP: #453103).
+
+ -- Colin Watson <[email protected]> Mon, 08 Mar 2010 17:08:44 +0000
+
vim (2:7.2.330-1) unstable; urgency=low
* [34a85b6] Update README for patches 285 - 330
@@ -880,6 +1463,33 @@
-- James Vega <[email protected]> Sun, 08 Nov 2009 16:51:59 -0500
+vim (2:7.2.245-2ubuntu3) lucid; urgency=low
+
+ * rebuild rest of main for armel armv7/thumb2 optimization;
+ UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <[email protected]> Sun, 07 Mar 2010 01:10:27 +0100
+
+vim (2:7.2.245-2ubuntu2) karmic; urgency=low
+
+ * Add lucid as a valid suite in changelogs and sources.list.
+ * Rename Vcs-* to XS-Debian-Vcs-*.
+
+ -- Loïc Minier <[email protected]> Mon, 21 Sep 2009 13:07:03 +0200
+
+vim (2:7.2.245-2ubuntu1) karmic; urgency=low
+
+ * 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.
+
+ -- Bhavani Shankar <[email protected]> Fri, 21 Aug 2009 20:07:37 +0530
+
vim (2:7.2.245-2) unstable; urgency=low
* [5263ec7] Add Suggests: indent to vim-tiny since it will invoke indent
@@ -957,6 +1567,33 @@
-- James Vega <[email protected]> Wed, 29 Jul 2009 20:18:17 +0200
+vim (2:7.2.148-2ubuntu2) karmic; urgency=low
+
+ * Drop the changes to debian/runtime/debian.vim.in, which were no-ops
+ since these options are already disabled by default. Thanks to James
+ Vega for pointing this out.
+
+ -- Steve Langasek <[email protected]> Tue, 05 May 2009 18:45:52 +0000
+
+vim (2:7.2.148-2ubuntu1) karmic; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - 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.
+ * Dropped changes, merged in Debian:
+ - Add jaunty, karmic to the list of valid suites.
+ - runtime/syntax/debsources.vim:
+ + Add "jaunty" to debsourcesDistrKeyword
+ - Create a .pot file for translations.
+ * Drop gutsy from the list of valid distro series, it's been EOLed.
+
+ -- Steve Langasek <[email protected]> Mon, 04 May 2009 11:13:42 +0000
+
vim (2:7.2.148-2) unstable; urgency=low
* [0657c8d] debian/rules: SHELL really does need to be bash...
@@ -1015,6 +1652,52 @@
-- James Vega <[email protected]> Thu, 05 Mar 2009 08:58:23 -0500
+vim (2:7.2.079-1ubuntu5) jaunty; urgency=low
+
+ * Guard "syntax on" default so that it's only used if the syntax feature
+ is available, since /etc/vim/vimrc is sometimes used by vim-tiny too
+ (LP: #342174).
+
+ -- Colin Watson <[email protected]> Thu, 19 Mar 2009 15:16:10 +0000
+
+vim (2:7.2.079-1ubuntu4) jaunty; urgency=low
+
+ * Added karmic to the list of valid distro series.
+
+ -- Soren Hansen <[email protected]> Fri, 13 Mar 2009 16:07:45 +0100
+
+vim (2:7.2.079-1ubuntu3) jaunty; urgency=low
+
+ * debian/runtime/vimrc: "syntax on" is a sane default for non-tiny vim,
+ LP: #63172
+
+ -- Dustin Kirkland <[email protected]> Thu, 05 Mar 2009 09:28:52 -0600
+
+vim (2:7.2.079-1ubuntu2) jaunty; urgency=low
+
+ * Rebuild for python2.6.
+
+ -- Matthias Klose <[email protected]> Mon, 02 Mar 2009 12:19:07 +0100
+
+vim (2:7.2.079-1ubuntu1) jaunty; urgency=low
+
+ * Resynchronise with Debian (diversions fix closes LP: #296324). Remaining
+ changes:
+ - runtime/syntax/debcontrol.vim:
+ + Add "metapackages" to the list of valid sections.
+ - runtime/syntax/debchangelog.vim:
+ + Add "jaunty" to the list of valid suites.
+ - Drop vim-lesstif package and lesstif2-dev build-dependency.
+ - Enable Python interpreter on basic builds.
+ - Create a .pot file for translations.
+ - Disable autoindent, line-wrapping, and backup files by default.
+ - runtime/syntax/debsources.vim:
+ + Add "jaunty" to debsourcesDistrKeyword
+ - runtime/syntax/grub.vim:
+ + Add Ubuntu-specific 'quiet' keyword.
+
+ -- Colin Watson <[email protected]> Tue, 13 Jan 2009 18:39:18 +0000
+
vim (2:7.2.079-1) unstable; urgency=low
* [4d191a4] Update README for patches 50 - 065
@@ -1064,6 +1747,24 @@
-- James Vega <[email protected]> Tue, 25 Nov 2008 23:38:38 -0500
+vim (2:7.2.025-2ubuntu1) jaunty; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - runtime/syntax/debcontrol.vim:
+ + Add "metapackages" to the list of valid sections.
+ - runtime/syntax/debchangelog.vim:
+ + Add "jaunty" to the list of valid suites.
+ - Drop vim-lesstif package and lesstif2-dev build-dependency.
+ - Enable Python interpreter on basic builds.
+ - Create a .pot file for translations.
+ - Disable autoindent, line-wrapping, and backup files by default.
+ - runtime/syntax/debsources.vim:
+ + Add "jaunty" to debsourcesDistrKeyword
+ - runtime/syntax/grub.vim:
+ + Add Ubuntu-specific 'quiet' keyword.
+
+ -- Soren Hansen <[email protected]> Wed, 05 Nov 2008 11:37:43 +0100
+
vim (2:7.2.025-2) unstable; urgency=low
* Remove "deprecated" warnings about (g)vimrc.local from /etc/vim/(g)vimrc.
@@ -1275,6 +1976,45 @@
-- James Vega <[email protected]> Thu, 26 Jun 2008 12:49:16 -0400
+vim (1:7.1.314-3ubuntu3) intrepid; urgency=low
+
+ * 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).
+
+ -- Colin Watson <[email protected]> Mon, 21 Jul 2008 14:22:09 +0100
+
+vim (1:7.1.314-3ubuntu2) intrepid; urgency=low
+
+ * Rebuild for libgpmg1 -> libgpm2 transistion.
+
+ -- Steve Kowalik <[email protected]> Sun, 20 Jul 2008 05:24:49 +1000
+
+vim (1:7.1.314-3ubuntu1) intrepid; urgency=low
+
+ * 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.
+
+ -- Colin Watson <[email protected]> Thu, 26 Jun 2008 13:42:18 +0100
+
vim (1:7.1.314-3) unstable; urgency=high
* Update runtime files affected by the filename escape vulnerability.
@@ -1337,6 +2077,23 @@
-- James Vega <[email protected]> Tue, 10 Jun 2008 22:28:10 -0400
+vim (1:7.1.293-3ubuntu1) intrepid; urgency=low
+
+ * 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.
+
+ -- Fabien Tassin <[email protected]> Sun, 25 May 2008 14:10:50 +0200
+
vim (1:7.1.293-3) unstable; urgency=low
* runtime/syntax/debchangelog.vim,debsources.vim:
@@ -1362,6 +2119,32 @@
-- James Vega <[email protected]> Sun, 04 May 2008 14:11:17 -0400
+vim (1:7.1.293-2ubuntu1) intrepid; urgency=low
+
+ * 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
+ python-launchpad-bugs.
+ * 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).
+
+ -- Colin Watson <[email protected]> Thu, 01 May 2008 21:56:46 +0100
+
vim (1:7.1.293-2) unstable; urgency=low
* debian/rules:
@@ -1762,6 +2545,73 @@
-- James Vega <[email protected]> Mon, 03 Dec 2007 15:53:27 -0500
+vim (1:7.1-138+1ubuntu3) hardy; urgency=low
+
+ * patches/debchangelog_launchpad.diff:
+ - Add omni completion support for Launchpad bugs via
+ python-launchpad-bugs.
+
+ -- Colin Watson <[email protected]> Thu, 31 Jan 2008 10:59:03 +0000
+
+vim (1:7.1-138+1ubuntu2) hardy; urgency=low
+
+ * debian/control:
+ - re-add the removed conflicts/replaces that apply for the
+ dapper->hardy upgrades
+
+ -- Michael Vogt <[email protected]> Tue, 20 Nov 2007 14:01:58 +0100
+
+vim (1:7.1-138+1ubuntu1) hardy; urgency=low
+
+ * 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
+ sections
+ + 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
+ distributions.
+ + 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
+ already)
+
+ -- Soren Hansen <[email protected]> Fri, 19 Oct 2007 15:37:56 +0200
+
vim (1:7.1-138+1) unstable; urgency=medium
[ Debian Vim Maintainers ]
@@ -1822,6 +2672,55 @@
-- James Vega <[email protected]> Sun, 07 Oct 2007 15:47:26 -0400
+vim (1:7.1-056+2ubuntu2) gutsy; urgency=low
+
+ * Trigger rebuild for hppa
+
+ -- LaMont Jones <[email protected]> Thu, 04 Oct 2007 12:26:15 -0600
+
+vim (1:7.1-056+2ubuntu1) gutsy; urgency=low
+
+ * 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 field
+ - Drop lesstif2-dev from Build-Depends
+ - Add libxt-dev to Build-Depends to fix build
+ - Pre-Depend on dpkg with bzip2 support
+ - 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
+ sections
+ + patches/901_debchangelog.vim.diff:
+ - Add warty, hoary, breezy, dapper, edgy, feisty, gutsy, *-proposed,
+ *-updates, *-security, *-backports, and *-commercial to allowed
+ distributions.
+ + patches/add-ubuntu-sources.diff:
+ - Add restricted, universe, multiverse to allowed sections
+ - Add dapper, edgy, feisty, gutsy, *-proposed, *-updates, *-security,
+ and *-backports to allowed distributions.
+ + patches/debchangelog_launchpad.diff:
+ - Highlight Launchpad bug-closing syntax in debian/changelog files.
+ + patches/screen-mouse-support.diff:
+ - Enable detection of GNU screen as a mouse-capable terminal
+ (LP #113227)
+
+ -- Soren Hansen <[email protected]> Tue, 28 Aug 2007 17:02:33 +0200
+
vim (1:7.1-056+2) unstable; urgency=low
* Brown paper bag release -- vimrc.tiny should not be calling :let since
@@ -1881,6 +2780,52 @@
-- James Vega <[email protected]> Wed, 08 Aug 2007 00:18:16 -0400
+vim (1:7.1-022+1ubuntu1) gutsy; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ + debian/runtime/debian.vim.in:
+ - disable autoindent and backup files
+ + debian/rules:
+ - enable pythoninterpreter on basic builds
+ - skip -lesstif and -full variants
+ - remove references to vim-full package
+ - 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 field
+ - drop lesstif2-dev from Build-Depends
+ - add libxt-dev to Build-Depends to fix build
+ - pre-depend on dpkg with bzip2 support
+ - drop vim-lesstif package
+ + patches/debcontrol.vim.diff:
+ - add XSBC-Original-Maintainer as legal field
+ + patches/add-ubuntu-sources.diff:
+ - add restricted, universe, multiverse to allowed sections
+ - add dapper, edgy, feisty, gutsy, *-proposed, *-updates, *-security,
+ and *-backports to allowed distributions.
+ + patches/901_debchangelog.vim.diff:
+ - add warty, hoary, breezy, dapper, edgy, feisty, gutsy, *-proposed,
+ *-updates, *-security, *-backports, and *-commercial to allowed
+ distributions.
+ + patches/900_debcontrol.vim.diff:
+ - add restricted, universe, multiverse, and metapackages to allowed
+ sections
+ + patches/screen-mouse-support.diff:
+ - Enable detection of GNU screen as a mouse-capable terminal
+ (LP #113227)
+ + patches/debchangelog_launchpad.diff:
+ - Highlight Launchpad bug-closing syntax in debian/changelog files.
+ * Dropped debian/kubuntu_01_xdg_menus.diff (hasn't been used in years) and
+ patches/proc-filetype-detection-fix.diff (applied upstream).
+
+ -- Soren Hansen <[email protected]> Fri, 13 Jul 2007 15:32:59 +0200
+
vim (1:7.1-022+1) unstable; urgency=low
[ Debian Vim Maintainers ]
@@ -1936,6 +2881,60 @@
-- James Vega <[email protected]> Sat, 07 Jul 2007 15:04:57 -0400
+vim (1:7.1-000+1ubuntu2) gutsy; urgency=low
+
+ [ Micah Cowan ]
+ * patches/screen-mouse-support.diff:
+ - Enable detection of GNU screen as a mouse-capable terminal
+ (LP: #113227)
+ * patches/proc-filetype-detection-fix.diff:
+ - Fix detection of files of type Oracle ProC (LP: #86916)
+
+ [ Colin Watson ]
+ * patches/debchangelog_launchpad.diff:
+ - Highlight Launchpad bug-closing syntax in debian/changelog files.
+
+ -- Colin Watson <[email protected]> Wed, 04 Jul 2007 04:38:55 +0100
+
+vim (1:7.1-000+1ubuntu1) gutsy; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ + debian/runtime/debian.vim.in:
+ - disable autoindent and backup files
+ + patches/debcontrol.vim.diff:
+ - add XSBC-Original-Maintainer as legal field
+ + patches/900_debcontrol.vim.diff:
+ - add restricted, universe, multiverse, and metapackages to allowed
+ sections
+ + patches/901_debchangelog.vim.diff:
+ - add breezy, dapper, edgy, feisty, gutsy, *-proposed, *-updates,
+ *-security, *-backports, and dapper-commercial to allowed
+ distributions
+ + patches/add-ubuntu-sources.diff:
+ - add restricted, universe, multiverse to allowed sections
+ - add dapper, edgy, feisty, gutsy, *-proposed, *-updates, *-security,
+ and *-backports to allowed distributions
+ + debian/control:
+ - drop lesstif2-dev from Build-Depends
+ - drop vim-lesstif package
+ - add libxt-dev to Build-Depends to fix build
+ - pre-depend on dpkg with bzip2 support
+ - Ubuntu-specific Maintainer field
+ + debian/rules:
+ - enable pythoninterpreter on basic builds
+ - skip -lesstif and -full variants
+ - remove references to vim-full package
+ - create a .pot file for translations
+ - use bzip2 compression for vim-runtime
+ + debian/gvim.desktop:
+ - add NoDisplay=true
+ + 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
+
+ -- Colin Watson <[email protected]> Thu, 24 May 2007 13:12:54 +0100
+
vim (1:7.1-000+1) unstable; urgency=low
[ Debian Vim Maintainers ]
@@ -1969,6 +2968,56 @@
-- James Vega <[email protected]> Sat, 12 May 2007 13:24:27 -0400
+vim (1:7.0-219+1ubuntu2) gutsy; urgency=low
+
+ [ Soren Hansen ]
+ * patches/901_debchangelog.vim.diff:
+ - Simplify regex for Ubuntu distributions.
+
+ -- Colin Watson <[email protected]> Fri, 20 Apr 2007 21:25:54 +0100
+
+vim (1:7.0-219+1ubuntu1) gutsy; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ + debian/runtime/debian.vim.in:
+ - disable autoindent and backup files
+ + patches/debcontrol.vim.diff:
+ - add XSBC-Original-Maintainer as legal field
+ + patches/900_debcontrol.vim.diff:
+ - add restricted, universe, multiverse, and metapackages to allowed
+ sections
+ + patches/901_debchangelog.vim.diff:
+ - add breezy, dapper, edgy, feisty, *-proposed, *-updates, *-security,
+ *-backports, and dapper-commercial to allowed distributions
+ + patches/add-ubuntu-sources.diff:
+ - add restricted, universe, multiverse to allowed sections
+ - add dapper, edgy, feisty, *-proposed, *-updtaes, *-security, and
+ *-backports to allowed distributions
+ + debian/control:
+ - drop lesstif2-dev from Build-Depends
+ - drop vim-lesstif package
+ - add libxt-dev to Build-Depends to fix build
+ - pre-depend on dpkg with bzip2 support
+ - Ubuntu-specific Maintainer field
+ + debian/rules:
+ - enable pythoninterpreter on basic builds
+ - skip -lesstif and -full variants
+ - remove references to vim-full package
+ - create a .pot file for translations
+ - use bzip2 compression for vim-runtime
+ + debian/gvim.desktop:
+ - add NoDisplay=true
+ + 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
+ * patches/901_debchangelog.vim.diff: Add gutsy, gutsy-security,
+ gutsy-proposed, gutsy-updates, and gutsy-backports targets.
+ * patches/add-ubuntu-sources.diff: Add gutsy distribution.
+ * patches/cindent-fix.patch: Remove; this is upstream patch 7.0.211.
+
+ -- Colin Watson <[email protected]> Fri, 20 Apr 2007 19:24:56 +0100
+
vim (1:7.0-219+1) unstable; urgency=low
[ Debian Vim Maintainers ]
@@ -2015,6 +3064,78 @@
-- James Vega <[email protected]> Thu, 4 Jan 2007 01:50:25 -0500
+vim (1:7.0-164+1ubuntu7) feisty; urgency=low
+
+ * Add XSBC-Original-Maintainer to debcontrol syntax highlighting.
+
+ -- Soren Hansen <[email protected]> Sat, 10 Mar 2007 22:07:48 +0100
+
+vim (1:7.0-164+1ubuntu6) feisty; urgency=low
+
+ * Ubuntu-specific Maintainer field (really, this time saving
+ the control file before building the package).
+
+ -- Ian Jackson <[email protected]> Tue, 20 Feb 2007 16:45:18 +0000
+
+vim (1:7.0-164+1ubuntu5) feisty; urgency=low
+
+ * Re-upload with .orig.tar.gz as intended, and bump version number.
+ * Ubuntu-specific Maintainer field.
+
+ -- Ian Jackson <[email protected]> Tue, 20 Feb 2007 14:13:33 +0000
+
+vim (1:7.0-164+1ubuntu4) feisty; urgency=low
+
+ * Include /usr/share/man/ru.{KOI8-R,UTF-8}{,/man1} in the
+ vim-common package which will help with some upgrade problems (LP
+ #84906). These directories should be retained until at least the
+ first Ubuntu LTS release after 6.06, to smooth upgrades from Dapper.
+
+ -- Ian Jackson <[email protected]> Tue, 20 Feb 2007 12:31:22 +0000
+
+vim (1:7.0-164+1ubuntu3) feisty; urgency=low
+
+ * Use bzip2 compression for vim-runtime, saving about 1MB of .deb size.
+
+ -- Colin Watson <[email protected]> Tue, 30 Jan 2007 16:08:49 +0000
+
+vim (1:7.0-164+1ubuntu2) feisty; urgency=low
+
+ * Rebuild for python2.5 as the default python version.
+
+ -- Matthias Klose <[email protected]> Sun, 14 Jan 2007 16:25:53 +0000
+
+vim (1:7.0-164+1ubuntu1) feisty; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ + debian/runtime/debian.vim.in:
+ - disable autoindent and backup files
+ + patches/900_debcontrol.vim.diff:
+ - add restricted, universe, multiverse, and metapackages to allowed
+ sections
+ + patches/901_debchangelog.vim.diff:
+ - add breezy, dapper, edgy, feisty, *-proposed, *-updates, *-security,
+ *-backports, and dapper-commercial to allowed distributions
+ + patches/add-ubuntu-sources.diff:
+ - add restricted, universe, multiverse to allowed sections
+ - add dapper, edgy, feisty, *-proposed, *-updtaes, *-security, and
+ *-backports to allowed distributions
+ + patches/cindent-fix.patch:
+ - added again
+ + debian/control:
+ - drop lesstif2-dev from Build-Depends
+ - drop vim-lesstif package
+ - add libxt-dev to Build-Depends to fix build
+ + debian/rules:
+ - enable pythoninterpreter on basic builds
+ - skip -lesstif and -full variants
+ - remove references to vim-full package
+ - create a .pot file for translations
+ + debian/gvim.desktop:
+ - add NoDisplay=true
+
+ -- Colin Watson <[email protected]> Fri, 15 Dec 2006 12:15:18 +0000
+
vim (1:7.0-164+1) unstable; urgency=low
[ Debian Vim Maintainers ]
@@ -2077,6 +3198,18 @@
-- Stefano Zacchiroli <[email protected]> Wed, 25 Oct 2006 17:07:37 +0200
+vim (1:7.0-122+1ubuntu1) feisty; urgency=low
+
+ * Resynchronise with Debian.
+ * patches/900_debcontrol.vim.diff: Add metapackages section.
+ * patches/901_debchangelog.vim.diff: Add dapper-proposed, edgy-proposed,
+ feisty, feisty-security, feisty-proposed, feisty-updates, and
+ feisty-backports targets.
+ * patches/add-ubuntu-sources.diff: Add feisty, *-proposed, and *-backports
+ distributions.
+
+ -- Colin Watson <[email protected]> Fri, 27 Oct 2006 11:57:31 +0100
+
vim (1:7.0-122+1) unstable; urgency=medium
[ Debian Vim Maintainers ]
@@ -2141,6 +3274,41 @@
-- Stefano Zacchiroli <[email protected]> Sun, 10 Sep 2006 11:59:14 +0200
+vim (1:7.0-035+1ubuntu5) edgy; urgency=low
+
+ * Backport from Debian (James Vega, closes: Malone #66733):
+ - Build vim-tiny with multibyte support. (closes: #361378)
+
+ -- Colin Watson <[email protected]> Wed, 18 Oct 2006 18:43:57 +0100
+
+vim (1:7.0-035+1ubuntu4) edgy; urgency=low
+
+ * patches/901_debchangelog.vim.diff: Add *-backports and
+ dapper-commercial.
+
+ -- Colin Watson <[email protected]> Mon, 11 Sep 2006 15:52:54 +0100
+
+vim (1:7.0-035+1ubuntu3) edgy; urgency=low
+
+ * patches/901_debchangelog.vim.diff: Fix a couple of misplaced spaces so
+ that dapper and edgy-updates are highlighted properly.
+
+ -- Colin Watson <[email protected]> Mon, 11 Sep 2006 13:53:48 +0100
+
+vim (1:7.0-035+1ubuntu2) edgy; urgency=low
+
+ * patches/add-ubuntu-sources.diff:
+ + Add Ubuntu specific parts to the sources.list syntax highlighting.
+ Thanks to Karl Goetz for the patch (Ubuntu: #30796)
+
+ -- Sebastian Dröge <[email protected]> Sat, 22 Jul 2006 17:13:23 +0200
+
+vim (1:7.0-035+1ubuntu1) edgy; urgency=low
+
+ * Merge from debian unstable.
+
+ -- Martin Pitt <[email protected]> Wed, 12 Jul 2006 15:16:50 +0200
+
vim (1:7.0-035+1) unstable; urgency=low
[ Debian Vim Maintainers ]
@@ -2162,6 +3330,45 @@
-- James Vega <[email protected]> Mon, 3 Jul 2006 01:43:11 -0400
+vim (1:7.0-017+8ubuntu2) edgy; urgency=low
+
+ * Cleaned up cruft in debian/rules diff.
+ * Build vim-full, since we can build it in main.
+ * Restore old changelog entries.
+ * patches/901_debchangelog: Add *-security and *-updates pockets for Ubuntu
+ releases.
+
+ -- Martin Pitt <[email protected]> Thu, 29 Jun 2006 12:47:54 +0200
+
+vim (1:7.0-017+8ubuntu1) edgy; urgency=low
+
+ * Sync with Debian:
+ Remaining Ubuntu Changes
+ + debian/runtime/debian.vim.in:
+ - disable autoindent and backup files
+ + patches/debcontrol.vim.diff:
+ - add restricted, universe, multiverse to allowed sections
+ + patches/debsources.vim.diff:
+ - add restricted, universe, multiverse to allowed sections
+ - add dapper and edgy to allowed distributions
+ + patches/debchangelog.syntax.vim.diff:
+ - add breezy, dapper and edgy to allowed distributions
+ + debian/control:
+ - drop lesstif2-dev from Build-Depends
+ - drop vim-lesstif and vim-full packages
+ - add libxt-dev to Build-Depends to fix build
+ + debian/rules:
+ - enable pythoninterpreter on basic builds
+ - skip -lesstif and -full variants
+ - remove references to vim-full package
+ - create a .pot file for translations
+ + debian/gvim.desktop:
+ - add NoDisplay=true
+ + patch/cindent-fix.patch:
+ - added again
+
+ -- Sebastian Dröge <[email protected]> Wed, 28 Jun 2006 00:58:52 +0200
+
vim (1:7.0-017+8) unstable; urgency=medium
* Rebuild with fixed libruby1.8. Urgency medium since vim-full and vim-ruby
@@ -2489,6 +3696,50 @@
-- James Vega <[email protected]> Wed, 8 Feb 2006 15:11:37 -0500
+vim (1:6.4-006+2ubuntu6) dapper; urgency=low
+
+ * debian/rules: Create a POT file on build.
+
+ -- Martin Pitt <[email protected]> Tue, 23 May 2006 11:39:49 +0200
+
+vim (1:6.4-006+2ubuntu5) dapper; urgency=low
+
+ * Apply patch from Ryan Lortie to fix Ubuntu #44431.
+ * Also add edgy to the Ubuntu releases list.
+
+ -- Scott James Remnant <[email protected]> Thu, 18 May 2006 06:11:48 +0100
+
+vim (1:6.4-006+2ubuntu4) dapper; urgency=low
+
+ * Reduce the vim alternative to 35 priority, it was having ideas
+ somewhat above its station.
+
+ -- Scott James Remnant <[email protected]> Thu, 27 Apr 2006 23:21:42 +0100
+
+vim (1:6.4-006+2ubuntu3) dapper; urgency=low
+
+ * debian/updates/deb{control,sources}.vim: Add Ubuntu releases and
+ components. Thanks to Karl Goetz <[email protected]> and
+ Barry deFreese <[email protected]> for their initial patches.
+ Closes: LP#30796
+
+ -- Martin Pitt <[email protected]> Wed, 26 Apr 2006 20:49:31 +0200
+
+vim (1:6.4-006+2ubuntu2) dapper; urgency=low
+
+ * Reenable vim-ruby since we can now build it in main.
+
+ -- Daniel Silverstone <[email protected]> Thu, 23 Mar 2006 12:32:25 +0000
+
+vim (1:6.4-006+2ubuntu1) dapper; urgency=low
+
+ * Synchronize with Debian unstable.
+ * Convert Ubuntu patches to use quilt.
+ * Re-register alternative for `editor'.
+ * Install .desktop file again, add attribute NoDisplay=true.
+
+ -- Matthias Klose <[email protected]> Thu, 2 Feb 2006 13:55:52 +0000
+
vim (1:6.4-006+2) unstable; urgency=low
[ Norbert Tretkowski ]
@@ -2609,6 +3860,35 @@
-- Debian VIM Maintainers <[email protected]> Sun, 23 Oct 2005 16:03:43 +0200
+vim (1:6.4-001+2ubuntu3) dapper; urgency=low
+
+ * Drop GTK support in vim-basic again, to stop blowing out ubuntu-minimal.
+
+ -- Adam Conrad <[email protected]> Thu, 10 Nov 2005 12:28:39 -0500
+
+vim (1:6.4-001+2ubuntu2) dapper; urgency=low
+
+ * Remove .desktop items -- oops.
+ * Re-enable GTK support in vim-basic.
+
+ -- Daniel Stone <[email protected]> Fri, 28 Oct 2005 09:44:51 +1000
+
+vim (1:6.4-001+2ubuntu1) dapper; urgency=low
+
+ * Resync with Debian.
+ * Add 'dapper' to the list of supported distribution keywords.
+ * Drop patch #990, as it has been merged upstream.
+
+ -- Daniel Stone <[email protected]> Tue, 25 Oct 2005 07:57:58 +1000
+
+vim (1:6.4-001+2) unstable; urgency=low
+
+ [ Stefano Zacchiroli ]
+ * Fixed debian/runtime/vimrc, last version broke some plugins behaviour
+ (e.g. gzip, netrw) on files specified on cmdline.
+
+ -- Debian VIM Maintainers <[email protected]> Sun, 23 Oct 2005 16:03:43 +0200
+
vim (1:6.4-001+1) unstable; urgency=low
[ Debian VIM Maintainers ]
@@ -2791,6 +4071,32 @@
-- Debian VIM Maintainers <[email protected]> Thu, 28 Jul 2005 12:16:06 +0200
+vim (1:6.3-078+1ubuntu3) breezy; urgency=low
+
+ * Rebuild for the cairo1 -> cairo2 transition.
+
+ -- Adam Conrad <[email protected]> Tue, 23 Aug 2005 01:57:09 +1000
+
+vim (1:6.3-078+1ubuntu2) breezy; urgency=low
+
+ * 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:
+ http://www.guninski.com/where_do_you_want_billg_to_go_today_5.html
+ * debian/patches/124_errorformat.vim.diff: Remove obsolete hunk that doesn't
+ apply any more.
+
+ -- Martin Pitt <[email protected]> Tue, 26 Jul 2005 11:30:46 +0000
+
+vim (1:6.3-078+1ubuntu1) breezy; urgency=low
+
+ * Resynchronise with Debian.
+
+ -- Michael Vogt <[email protected]> Thu, 23 Jun 2005 15:32:31 +0200
+
vim (1:6.3-078+1) unstable; urgency=low
* New upstream patches (073 to 078), see README.gz for details.
@@ -2890,6 +4196,25 @@
-- Norbert Tretkowski <[email protected]> Sun, 24 Apr 2005 17:26:49 +0200
+vim (1:6.3-68+4ubuntu3) breezy; urgency=low
+
+ * debian/control:
+ - Build-Depends on libxt-dev (Ubuntu: #11113).
+
+ -- Sebastien Bacher <[email protected]> Fri, 27 May 2005 19:46:38 +0200
+
+vim (1:6.3-68+4ubuntu2) breezy; urgency=low
+
+ * Drop vim-lesstif package.
+
+ -- Daniel Stone <[email protected]> Mon, 23 May 2005 22:19:45 +1000
+
+vim (1:6.3-68+4ubuntu1) breezy; urgency=low
+
+ * Add 'breezy' to the list of accepted distribution keywords.
+
+ -- Daniel Stone <[email protected]> Wed, 13 Apr 2005 12:44:25 +1000
+
vim (1:6.3-068+4) unstable; urgency=medium
* Norbert Tretkowski <[email protected]>:
@@ -3094,6 +4419,57 @@
-- Norbert Tretkowski <[email protected]> Wed, 05 Jan 2005 20:51:36 +0100
+vim (1:6.3-046+1ubuntu7) hoary; urgency=low
+
+ * Ensure kubuntu_01_xdg_menus.diff is not applied before uploading.
+
+ -- Jonathan Riddell <[email protected]> Sun, 3 Apr 2005 13:09:32 +0100
+
+vim (1:6.3-046+1ubuntu6) hoary; urgency=low
+
+ * Add kubuntu_01_xdg_menus.diff to make kvim menu entry XDG compliant.
+
+ -- Jonathan Riddell <[email protected]> Sun, 3 Apr 2005 00:44:21 +0000
+
+vim (1:6.3-046+1ubuntu5) hoary; urgency=low
+
+ * Revert KDE removal, thus making the kvim package actually have useful
+ content rather than just a broken diversion of vim. kvim-ruby is still
+ skipped.
+
+ -- Colin Watson <[email protected]> Tue, 8 Mar 2005 00:09:16 +0000
+
+vim (1:6.3-046+1ubuntu4) hoary; urgency=low
+
+ * Drop editor alternative priority to 35, since Ubuntu installs vim by
+ default (closes: Ubuntu #4710).
+
+ -- Colin Watson <[email protected]> Tue, 1 Mar 2005 15:37:33 +0000
+
+vim (1:6.3-046+1ubuntu3) hoary; urgency=low
+
+ * Don't autoindent by default (Ubuntu: #5602)
+
+ -- Thom May <[email protected]> Wed, 19 Jan 2005 12:10:29 +0000
+
+vim (1:6.3-046+1ubuntu2) hoary; urgency=low
+
+ * 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:
+ CAN-2005-0069
+ http://bugs.debian.org/289560
+
+ -- Martin Pitt <[email protected]> Tue, 18 Jan 2005 16:29:10 +0100
+
+vim (1:6.3-046+1ubuntu1) hoary; urgency=low
+
+ * Resynchronise with Debian.
+ * debian/vim-variant.desktop: Disable menu item again.
+
+ -- Colin Watson <[email protected]> Sun, 19 Dec 2004 11:42:55 +0000
+
vim (1:6.3-046+0sarge1) testing-proposed-updates; urgency=high
* Built on testing for testing-proposed-updates because patch 045 fixes
@@ -3111,6 +4487,35 @@
-- Norbert Tretkowski <[email protected]> Sun, 12 Dec 2004 02:36:11 +0100
+vim (1:6.3-031+3ubuntu4) hoary; urgency=low
+
+ * Rebuild with python2.4.
+
+ -- Matthias Klose <[email protected]> Thu, 16 Dec 2004 11:57:12 +0100
+
+vim (1:6.3-031+3ubuntu3) hoary; urgency=low
+
+ * 900_debcontrol.vim.diff: Add restricted, universe, and multiverse to
+ debcontrolSection.
+ * debian/rules (make_patch): Ignore error code from diff, since it'll
+ normally be non-zero.
+
+ -- Colin Watson <[email protected]> Fri, 10 Dec 2004 12:47:00 +0100
+
+vim (1:6.3-031+3ubuntu2) hoary; urgency=low
+
+ * 900_debcontrol.vim.diff: Add amd64 to debcontrolArchitecture.
+ * 901_debchangelog.vim.diff: Add warty and hoary to debchangelogTarget.
+ * Fix changelog ordering.
+
+ -- Colin Watson <[email protected]> Mon, 6 Dec 2004 18:23:01 +0100
+
+vim (1:6.3-031+3ubuntu1) hoary; urgency=low
+
+ * Resynchronise with Debian.
+
+ -- Scott James Remnant <[email protected]> Wed, 17 Nov 2004 00:17:02 +0000
+
vim (1:6.3-031+3) unstable; urgency=low
* Really add Brandens patch which adds XXX and FIXME comment hilighting
@@ -3138,6 +4543,30 @@
-- Norbert Tretkowski <[email protected]> Tue, 09 Nov 2004 18:56:42 +0100
+vim (1:6.3-025+1ubuntu2) warty; urgency=low
+
+ * debian/vim-gnome.desktop:
+ - Disable menu item.
+
+ -- Jeff Waugh <[email protected]> Fri, 8 Oct 2004 10:04:36 +1000
+
+vim (1:6.3-025+1ubuntu1) warty; urgency=low
+
+ * New version from sid (Closes: Warty#1687)
+ - Fixes diversions (Closes: Warty#834)
+ * Merge changes from 1:6.2-532+4ubuntu1
+ - Don't build kvim*
+ - Remove build-dependency on kdelibs
+ - Don't build vim-ruby
+ - Remove build-dependencies on ruby, ruby-dev
+ * Build vim-basic with python support
+ * Don't build with GNOME support, since that would bloat base
+ * Add conflicts: vim (= 1:6.2-532+4ubuntu2) to vim variants
+ due to moving of gvimrc
+ (Closes: Warty#1717
+
+ -- Matt Zimmerman <[email protected]> Fri, 24 Sep 2004 13:46:42 -0700
+
vim (1:6.3-025+1) unstable; urgency=low
* New upstream patches (020 to 025), see README.gz for details.
diff -Nru vim-7.4.1689/debian/control vim-7.4.1689/debian/control
--- vim-7.4.1689/debian/control 2016-04-03 15:25:38.000000000 +0200
+++ vim-7.4.1689/debian/control 2016-04-05 17:38:39.000000000 +0200
@@ -1,7 +1,8 @@
Source: vim
Section: editors
Priority: optional
-Maintainer: Debian Vim Maintainers <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Debian Vim Maintainers <[email protected]>
Uploaders: James McCoy <[email protected]>
Standards-Version: 3.9.7
Build-Depends: libacl1-dev, libgpmg1-dev [linux-any], autoconf,
@@ -14,7 +15,7 @@
libgtk2.0-dev, libgtk-3-dev, libxaw7-dev, libxt-dev, libxpm-dev, libgnomeui-dev,
# B-D for language interpreters
# Update d/rules when ruby version changes
- libperl-dev, tcl-dev, python-dev, ruby, ruby-dev, lua5.2, liblua5.2-dev
+ libperl-dev, tcl-dev, python3-dev, python-dev, ruby, ruby-dev, lua5.2, liblua5.2-dev
# ruby1.8{,-dev} Provides: ruby{,-dev} which can cause breakage on buildds if
# ruby/ruby1.8-dev or ruby1.8/ruby-dev pairs get installed due to a mismatch in
# the ruby binary version and the library version
@@ -29,6 +30,7 @@
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: vim | vim-gnome | vim-gtk | vim-gtk3 | vim-athena | vim-nox | vim-tiny
+Suggests: vim-gnome-py2 | vim-gtk-py2 | vim-gtk3-py2 | vim-athena-py2 | vim-nox-py2
# Move vim icon from vim-gui-common to vim-common
Breaks: vim-gui-common (<< 2:7.4.488-4~)
Replaces: vim-gui-common (<< 2:7.4.488-4~)
@@ -43,6 +45,7 @@
Architecture: all
Multi-Arch: foreign
Recommends: vim-gnome | vim-gtk | vim-gtk3 | vim-athena
+Suggests: vim-gnome-py2 | vim-gtk-py2 | vim-gtk3-py2 | vim-athena-py2
Depends: ${misc:Depends}
Description: Vi IMproved - Common GUI files
Vim is an almost compatible version of the UNIX editor Vi.
@@ -59,6 +62,7 @@
# vim-runtime's removal of the old diversions will fail
Breaks: vim-tiny (<< ${source:Version})
Recommends: vim | vim-gnome | vim-gtk | vim-gtk3 | vim-athena | vim-nox | vim-tiny
+Suggests: vim-gnome-py2 | vim-gtk-py2 | vim-gtk3-py2 | vim-athena-py2 | vim-nox-py2
Enhances: vim-tiny
Description: Vi IMproved - Runtime files
Vim is an almost compatible version of the UNIX editor Vi.
@@ -194,3 +198,83 @@
.
This package contains a version of vim compiled with a GNOME2 GUI
and support for scripting with Lua, Perl, Python, Ruby, and Tcl.
+
+Package: vim-gtk-py2
+Priority: extra
+Architecture: any
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Suggests: cscope, vim-doc, fonts-dejavu, gnome-icon-theme
+Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Description: Vi IMproved - enhanced vi editor - with GTK2 GUI (Python2)
+ Vim is an almost compatible version of the UNIX editor Vi.
+ .
+ Many new features have been added: multi level undo, syntax
+ highlighting, command line history, on-line help, filename
+ completion, block operations, folding, Unicode support, etc.
+ .
+ This package contains a version of vim compiled with a GTK2 GUI
+ and support for scripting with Lua, Perl, Python2, Ruby, and Tcl.
+
+Package: vim-gtk3-py2
+Priority: extra
+Architecture: any
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Suggests: cscope, vim-doc, fonts-dejavu, gnome-icon-theme
+Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Description: Vi IMproved - enhanced vi editor - with GTK3 GUI (Python2)
+ Vim is an almost compatible version of the UNIX editor Vi.
+ .
+ Many new features have been added: multi level undo, syntax
+ highlighting, command line history, on-line help, filename
+ completion, block operations, folding, Unicode support, etc.
+ .
+ This package contains a version of vim compiled with a GTK3 GUI
+ and support for scripting with Lua, Perl, Python, Ruby, and Tcl.
+
+Package: vim-nox-py2
+Priority: extra
+Architecture: any
+Depends: vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Suggests: cscope, vim-doc
+Provides: vim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Description: Vi IMproved - enhanced vi editor - with scripting languages support (Python2)
+ Vim is an almost compatible version of the UNIX editor Vi.
+ .
+ Many new features have been added: multi level undo, syntax
+ highlighting, command line history, on-line help, filename
+ completion, block operations, folding, Unicode support, etc.
+ .
+ This package contains a version of vim compiled with support for
+ scripting with Lua, Perl, Python2, Ruby, and Tcl but no GUI.
+
+Package: vim-athena-py2
+Priority: extra
+Architecture: any
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Suggests: cscope, vim-doc
+Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Description: Vi IMproved - enhanced vi editor - with Athena GUI (Python2)
+ Vim is an almost compatible version of the UNIX editor Vi.
+ .
+ Many new features have been added: multi level undo, syntax
+ highlighting, command line history, on-line help, filename
+ completion, block operations, folding, Unicode support, etc.
+ .
+ This package contains a version of vim compiled with a Athena GUI
+ and support for scripting with Lua, Perl, Python2, Ruby, and Tcl.
+
+Package: vim-gnome-py2
+Priority: extra
+Architecture: any
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Suggests: cscope, vim-doc, fonts-dejavu, gnome-icon-theme
+Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lua
+Description: Vi IMproved - enhanced vi editor - with GNOME2 GUI (Python2)
+ Vim is an almost compatible version of the UNIX editor Vi.
+ .
+ Many new features have been added: multi level undo, syntax
+ highlighting, command line history, on-line help, filename
+ completion, block operations, folding, Unicode support, etc.
+ .
+ This package contains a version of vim compiled with a GNOME2 GUI
+ and support for scripting with Lua, Perl, Python2, Ruby, and Tcl.
diff -Nru vim-7.4.1689/debian/patches/series vim-7.4.1689/debian/patches/series
--- vim-7.4.1689/debian/patches/series 2016-04-03 15:26:40.000000000 +0200
+++ vim-7.4.1689/debian/patches/series 2016-04-05 17:34:26.000000000 +0200
@@ -5,3 +5,6 @@
0004-Document-Debian-s-decision-to-disable-modelines-by-d.patch
0005-Support-defining-compilation-date-in-SOURCE_DATE_EPO.patch
0006-debsources.vim-Move-trusty-to-unsupported.patch
+ubuntu-grub-syntax.patch
+update-upstart-syntax.patch
+ubuntu-releases.patch
diff -Nru vim-7.4.1689/debian/patches/ubuntu-grub-syntax.patch vim-7.4.1689/debian/patches/ubuntu-grub-syntax.patch
--- vim-7.4.1689/debian/patches/ubuntu-grub-syntax.patch 1970-01-01 01:00:00.000000000 +0100
+++ vim-7.4.1689/debian/patches/ubuntu-grub-syntax.patch 2016-04-05 17:35:53.000000000 +0200
@@ -0,0 +1,13 @@
+Index: vim-7.3.000+hg~ee53a39d5896/runtime/syntax/grub.vim
+===================================================================
+--- vim-7.3.000+hg~ee53a39d5896.orig/runtime/syntax/grub.vim 2010-10-17 12:51:13.000000000 +0200
++++ vim-7.3.000+hg~ee53a39d5896/runtime/syntax/grub.vim 2010-10-17 12:51:29.000000000 +0200
+@@ -40,7 +40,7 @@
+ \ displaymem embed find fstest geometry halt help
+ \ impsprobe initrd install ioprobe kernel lock
+ \ makeactive map md5crypt module modulenounzip pause
+- \ quit reboot read root rootnoverify savedefault setup
++ \ quiet quit reboot read root rootnoverify savedefault setup
+ \ testload testvbe uppermem vbeprobe
+
+ syn keyword grubSpecial saved
diff -Nru vim-7.4.1689/debian/patches/ubuntu-releases.patch vim-7.4.1689/debian/patches/ubuntu-releases.patch
--- vim-7.4.1689/debian/patches/ubuntu-releases.patch 1970-01-01 01:00:00.000000000 +0100
+++ vim-7.4.1689/debian/patches/ubuntu-releases.patch 2016-04-05 17:45:35.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Add support for xenial, and drop support for utopic
+Author: Adam Conrad <[email protected]>
+
+Index: b/runtime/syntax/debsources.vim
+===================================================================
+--- a/runtime/syntax/debsources.vim
++++ b/runtime/syntax/debsources.vim
+@@ -36,7 +36,7 @@ let s:unsupported = [
+ \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
+ \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
+ \ 'maverick', 'natty', 'oneiric', 'quantal', 'raring', 'saucy',
+- \ 'trusty', 'utopic'
++ \ 'utopic', 'vivid'
+ \ ]
+ let &cpo=s:cpo
+
diff -Nru vim-7.4.1689/debian/patches/update-upstart-syntax.patch vim-7.4.1689/debian/patches/update-upstart-syntax.patch
--- vim-7.4.1689/debian/patches/update-upstart-syntax.patch 1970-01-01 01:00:00.000000000 +0100
+++ vim-7.4.1689/debian/patches/update-upstart-syntax.patch 2016-04-05 17:35:53.000000000 +0200
@@ -0,0 +1,17 @@
+Author: Clint Byrum <[email protected]>
+Description: Add missing setuid and setgid keywords.
+Forwarded: no
+
+Index: vim-7.3.547/runtime/syntax/upstart.vim
+===================================================================
+--- vim-7.3.547.orig/runtime/syntax/upstart.vim 2012-06-06 14:08:38.000000000 -0700
++++ vim-7.3.547/runtime/syntax/upstart.vim 2012-12-21 09:11:08.144350670 -0800
+@@ -36,7 +36,7 @@
+ " one argument
+ syn keyword upstartStatement description author version instance expect
+ syn keyword upstartStatement pid kill normal console env exit export
+-syn keyword upstartStatement umask nice oom chroot chdir exec
++syn keyword upstartStatement umask nice oom chroot chdir exec setuid setgid
+
+ " two arguments
+ syn keyword upstartStatement limit
diff -Nru vim-7.4.1689/debian/rules vim-7.4.1689/debian/rules
--- vim-7.4.1689/debian/rules 2016-04-03 15:25:38.000000000 +0200
+++ vim-7.4.1689/debian/rules 2016-04-05 17:39:44.000000000 +0200
@@ -106,7 +106,8 @@
NOINTERPFLAGS+=--disable-mzschemeinterp
NOINTERPFLAGS+=--disable-perlinterp
ifeq ($(DEB_VENDOR),Ubuntu)
- NOINTERPFLAGS+=--enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir)
+ NOINTERPFLAGS+=--enable-python3interp --with-python-config-dir=$(shell python3-config --configdir)
+ NOINTERPFLAGS+=--disable-pythoninterp
else
NOINTERPFLAGS+=--disable-pythoninterp
endif
@@ -117,8 +118,8 @@
ALLINTERPFLAGS:=--enable-luainterp
ALLINTERPFLAGS+=--disable-mzschemeinterp
ALLINTERPFLAGS+=--enable-perlinterp
-ALLINTERPFLAGS+=--enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir)
-ALLINTERPFLAGS+=--disable-python3interp
+ALLINTERPFLAGS+=--enable-python3interp --with-python-config-dir=$(shell python3-config --configdir)
+ALLINTERPFLAGS+=--disable-pythoninterp
ALLINTERPFLAGS+=--enable-rubyinterp
ALLINTERPFLAGS+=--enable-tclinterp
ALLINTERPFLAGS+=--with-tclsh=/usr/bin/tclsh
@@ -138,6 +139,12 @@
VARIANTS+=vim-nox
VARIANTS+=vim-basic
+VARIANTS+=vim-gtk-py2
+VARIANTS+=vim-gtk3-py2
+VARIANTS+=vim-gnome-py2
+VARIANTS+=vim-athena-py2
+VARIANTS+=vim-nox-py2
+
ifeq ($(origin VARIANT), command line)
VARIANTS = $(VARIANT) vim-basic
endif
@@ -163,6 +170,31 @@
CFLAGS_vim-nox:=$(CFLAGS)
CFGFLAGS_vim-nox:=$(CFGFLAGS) $(OPTFLAGS) $(NOXFLAGS) $(ALLINTERPFLAGS)
+CFLAGS_vim-gtk-py2:=$(CFLAGS)
+CFGFLAGS_vim-gtk-py2:= $(filter-out --enable-python3interp --disable-pythoninterp --with-python-config-dir=%, $(CFGFLAGS_vim-gtk)) \
+ --disable-python3interp \
+ --enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir)
+
+CFLAGS_vim-gtk3-py2:=$(CFLAGS)
+CFGFLAGS_vim-gtk3-py2:= $(filter-out --enable-python3interp --disable-pythoninterp --with-python-config-dir=%, $(CFGFLAGS_vim-gtk3)) \
+ --disable-python3interp \
+ --enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir)
+
+CFLAGS_vim-gnome-py2:=$(CFLAGS)
+CFGFLAGS_vim-gnome-py2:= $(filter-out --enable-python3interp --disable-pythoninterp --with-python-config-dir=%, $(CFGFLAGS_vim-gnome)) \
+ --disable-python3interp \
+ --enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir)
+
+CFLAGS_vim-athena-py2:=$(CFLAGS)
+CFGFLAGS_vim-athena-py2:= $(filter-out --enable-python3interp --disable-pythoninterp --with-python-config-dir=%, $(CFGFLAGS_vim-athena)) \
+ --disable-python3interp \
+ --enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir)
+
+CFLAGS_vim-nox-py2:=$(CFLAGS)
+CFGFLAGS_vim-nox-py2:= $(filter-out --enable-python3interp --disable-pythoninterp --with-python-config-dir=%, $(CFGFLAGS_vim-nox)) \
+ --disable-python3interp \
+ --enable-pythoninterp --with-python-config-dir=$(shell python-config --configdir)
+
NAME:=vim
# Convert x.y.z to x.y
VERSION:=$(basename $(DEB_VERSION_UPSTREAM))
@@ -484,19 +516,20 @@
@echo "*** DEBIAN *** INSTALLING VARIANT $*"
dh_installdirs
- mv src/$*/vim src/$*/$(subst -,.,$*)
+ mv src/$*/vim src/$*/$(subst .py2,-py2,$(subst -,.,$*))
# variant-related installations
# to be kept in sync with those in "install-stamp-vim-basic" target
for x in $(PER_VARIANT_FILES) ; do \
- if [ "$*" = "vim-nox" ]; then \
+ case "$*" in \
+ vim-nox*) \
sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(VARIANT):g" \
-e "s:@COMMON@:vim-common:" \
- debian/vim-variant.$$x > debian/$*.$$x ;\
- else \
+ debian/vim-variant.$$x > debian/$*.$$x ;;\
+ *) \
sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(VARIANT):g" \
-e "s:@COMMON@:vim-gui-common:" \
debian/vim-variant.$$x > debian/$*.$$x ;\
- fi \
+ esac; \
done
for L in $(LANGS); do \
sed -e "s:\(.*\)@LANG_ALTS@:\1--slave \$$mandir/$$L/man1/\$$i.1.gz \$$i.$$L.1.gz \$$mandir/$$L/man1/vim.1.gz \\\\\n&:" \
diff -Nru vim-7.4.1689/debian/runtime/vimrc vim-7.4.1689/debian/runtime/vimrc
--- vim-7.4.1689/debian/runtime/vimrc 2016-04-03 15:25:38.000000000 +0200
+++ vim-7.4.1689/debian/runtime/vimrc 2016-04-05 17:35:53.000000000 +0200
@@ -16,7 +16,9 @@
" Vim5 and later versions support syntax highlighting. Uncommenting the next
" line enables syntax highlighting by default.
-"syntax on
+if has("syntax")
+ syntax on
+endif
" If using a dark background within the editing area and syntax highlighting
" turn on this option as well
diff -Nru vim-7.4.1689/debian/vim-variant.postinst vim-7.4.1689/debian/vim-variant.postinst
--- vim-7.4.1689/debian/vim-variant.postinst 2016-04-03 15:25:38.000000000 +0200
+++ vim-7.4.1689/debian/vim-variant.postinst 2016-04-05 17:36:47.000000000 +0200
@@ -38,7 +38,7 @@
$mandir/man1/vim.1.gz
done
case "$variant" in
- gtk|gtk3|gnome|athena) # gui enabled variants
+ gtk*|gtk3*|gnome*|athena*) # gui enabled variants
add_gui_variant_alternative $1
;;
esac
@@ -67,6 +67,15 @@
add_variant_alternative 60
add_gnome_alternative 45
;;
+ vim-nox-py2)
+ add_variant_alternative 39
+ ;;
+ vim-gtk-py2|vim-gtk3-py2|vim-athena-py2)
+ add_variant_alternative 49
+ ;;
+ vim-gnome-py2) # gnome enabled variant
+ add_variant_alternative 59
+ add_gnome_alternative 44
esac
#DEBHELPER#
