[vim] 02/02: wrap-and-sort

James McCoy jamessan at debian.org
Wed Nov 30 05:10:49 UTC 2016


This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit fe5cb5af38f99077b270ac761adf4d7168d152cd
Author: James McCoy <jamessan at debian.org>
Date:   Tue Nov 29 23:08:52 2016 -0500

    wrap-and-sort
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/control         | 211 ++++++++++++++++++++++++++++++++++++-------------
 debian/vim-common.dirs |   4 +-
 debian/vim-doc.docs    |   2 +-
 3 files changed, 160 insertions(+), 57 deletions(-)

diff --git a/debian/control b/debian/control
index 020217e..4653c95 100644
--- a/debian/control
+++ b/debian/control
@@ -2,22 +2,37 @@ Source: vim
 Section: editors
 Priority: optional
 Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
-Uploaders: James McCoy <jamessan at debian.org>
+Uploaders:
+ James McCoy <jamessan at debian.org>,
 Standards-Version: 3.9.7
-Build-Depends: libacl1-dev, libgpmg1-dev [linux-any], autoconf,
- debhelper (>= 9.20160114), libtinfo-dev | libncurses5-dev, libselinux1-dev [linux-any],
-# B-D for GUI support
- libgtk2.0-dev, libgtk-3-dev, libxaw7-dev, libxt-dev, libxpm-dev,
-# B-D for language interpreters
-# Update d/rules when ruby version changes
- libperl-dev [!kfreebsd-any], tcl-dev, python3-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
-Build-Conflicts: ruby1.8 (<< 1.8.7.358-8), ruby1.8-dev (<< 1.8.7.358-8), autoconf2.13
-Build-Depends-Indep: docbook-xml, docbook-utils,
-# Building Vim's svg icons
- pdf2svg, ghostscript
+Build-Depends:
+ autoconf,
+ debhelper (>= 9.20160114),
+ libacl1-dev,
+ libgpmg1-dev [linux-any],
+ libgtk-3-dev,
+ libgtk2.0-dev,
+ liblua5.2-dev,
+ libperl-dev [!kfreebsd-any],
+ libselinux1-dev [linux-any],
+ libtinfo-dev | libncurses5-dev,
+ libxaw7-dev,
+ libxpm-dev,
+ libxt-dev,
+ lua5.2,
+ python3-dev,
+ ruby,
+ ruby-dev,
+ tcl-dev,
+Build-Conflicts:
+ autoconf2.13,
+ ruby1.8 (<< 1.8.7.358-8),
+ ruby1.8-dev (<< 1.8.7.358-8),
+Build-Depends-Indep:
+ docbook-utils,
+ docbook-xml,
+ ghostscript,
+ pdf2svg,
 Vcs-Git: https://anonscm.debian.org/cgit/pkg-vim/vim.git/
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-vim/vim.git
 Homepage: http://www.vim.org/
@@ -25,11 +40,16 @@ Homepage: http://www.vim.org/
 Package: vim-common
 Priority: important
 Architecture: all
-Depends: xxd, ${misc:Depends}, ${shlibs:Depends}
-Recommends: vim | vim-gtk | vim-gtk3 | vim-athena | vim-nox | vim-tiny
-# 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~)
+Depends:
+ xxd,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ vim | vim-gtk | vim-gtk3 | vim-athena | vim-nox | vim-tiny,
+Breaks:
+ vim-gui-common (<< 2:7.4.488-4~),
+Replaces:
+ vim-gui-common (<< 2:7.4.488-4~),
 Description: Vi IMproved - Common files
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -40,8 +60,10 @@ Description: Vi IMproved - Common files
 Package: vim-gui-common
 Architecture: all
 Multi-Arch: foreign
-Recommends: vim-gtk | vim-gtk3 | vim-athena
-Depends: ${misc:Depends}
+Recommends:
+ vim-gtk | vim-gtk3 | vim-athena,
+Depends:
+ ${misc:Depends},
 Description: Vi IMproved - Common GUI files
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -52,12 +74,14 @@ Description: Vi IMproved - Common GUI files
 Package: vim-runtime
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
-# Upgrades across major versions need to update vim-tiny first, otherwise
-# vim-runtime's removal of the old diversions will fail
-Breaks: vim-tiny (<< ${source:Version})
-Recommends: vim | vim-gtk | vim-gtk3 | vim-athena | vim-nox | vim-tiny
-Enhances: vim-tiny
+Depends:
+ ${misc:Depends},
+Breaks:
+ vim-tiny (<< ${source:Version}),
+Recommends:
+ vim | vim-gtk | vim-gtk3 | vim-athena | vim-nox | vim-tiny,
+Enhances:
+ vim-tiny,
 Description: Vi IMproved - Runtime files
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -70,7 +94,8 @@ Description: Vi IMproved - Runtime files
 Package: vim-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Vi IMproved - HTML documentation
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -80,12 +105,14 @@ Description: Vi IMproved - HTML documentation
 Package: vim-tiny
 Priority: important
 Architecture: any
-Depends: vim-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-# Vim automatically invokes the indent program if it isn't built with internal
-# indenting support (as is the case with vim-tiny) and the 'equalprg' option
-# isn't set.
-Suggests: indent
-Provides: editor
+Depends:
+ vim-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ indent,
+Provides:
+ editor,
 Description: Vi IMproved - enhanced vi editor - compact version
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -98,9 +125,17 @@ Description: Vi IMproved - enhanced vi editor - compact version
 
 Package: vim
 Architecture: any
-Depends: vim-common (= ${source:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Suggests: ctags, vim-doc, vim-scripts
-Provides: editor
+Depends:
+ vim-common (= ${source:Version}),
+ vim-runtime (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ ctags,
+ vim-doc,
+ vim-scripts,
+Provides:
+ editor,
 Description: Vi IMproved - enhanced vi editor
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -116,9 +151,26 @@ Description: Vi IMproved - enhanced vi editor
 Package: vim-gtk
 Priority: extra
 Architecture: any
-Depends: vim-gui-common (= ${source:Version}), vim-common (= ${source:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Suggests: cscope, vim-doc, fonts-dejavu, gnome-icon-theme
-Provides: vim, gvim, editor, ${vim:Perl-Provides}, vim-python, vim-ruby, vim-tcl, vim-lua
+Depends:
+ vim-common (= ${source:Version}),
+ vim-gui-common (= ${source:Version}),
+ vim-runtime (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ cscope,
+ fonts-dejavu,
+ gnome-icon-theme,
+ vim-doc,
+Provides:
+ editor,
+ gvim,
+ vim,
+ vim-lua,
+ vim-python,
+ vim-ruby,
+ vim-tcl,
+ ${vim:Perl-Provides},
 Description: Vi IMproved - enhanced vi editor - with GTK2 GUI
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -132,9 +184,26 @@ Description: Vi IMproved - enhanced vi editor - with GTK2 GUI
 Package: vim-gtk3
 Priority: extra
 Architecture: any
-Depends: vim-gui-common (= ${source:Version}), vim-common (= ${source:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Suggests: cscope, vim-doc, fonts-dejavu, gnome-icon-theme
-Provides: vim, gvim, editor, ${vim:Perl-Provides}, vim-python, vim-ruby, vim-tcl, vim-lua
+Depends:
+ vim-common (= ${source:Version}),
+ vim-gui-common (= ${source:Version}),
+ vim-runtime (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ cscope,
+ fonts-dejavu,
+ gnome-icon-theme,
+ vim-doc,
+Provides:
+ editor,
+ gvim,
+ vim,
+ vim-lua,
+ vim-python,
+ vim-ruby,
+ vim-tcl,
+ ${vim:Perl-Provides},
 Description: Vi IMproved - enhanced vi editor - with GTK3 GUI
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -148,9 +217,22 @@ Description: Vi IMproved - enhanced vi editor - with GTK3 GUI
 Package: vim-nox
 Priority: extra
 Architecture: any
-Depends: vim-common (= ${source:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Suggests: cscope, vim-doc
-Provides: vim, editor, ${vim:Perl-Provides}, vim-python, vim-ruby, vim-tcl, vim-lua
+Depends:
+ vim-common (= ${source:Version}),
+ vim-runtime (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ cscope,
+ vim-doc,
+Provides:
+ editor,
+ vim,
+ vim-lua,
+ vim-python,
+ vim-ruby,
+ vim-tcl,
+ ${vim:Perl-Provides},
 Description: Vi IMproved - enhanced vi editor - with scripting languages support
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -164,9 +246,24 @@ Description: Vi IMproved - enhanced vi editor - with scripting languages support
 Package: vim-athena
 Priority: extra
 Architecture: any
-Depends: vim-gui-common (= ${source:Version}), vim-common (= ${source:Version}), vim-runtime (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Suggests: cscope, vim-doc
-Provides: vim, gvim, editor, ${vim:Perl-Provides}, vim-python, vim-ruby, vim-tcl, vim-lua
+Depends:
+ vim-common (= ${source:Version}),
+ vim-gui-common (= ${source:Version}),
+ vim-runtime (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ cscope,
+ vim-doc,
+Provides:
+ editor,
+ gvim,
+ vim,
+ vim-lua,
+ vim-python,
+ vim-ruby,
+ vim-tcl,
+ ${vim:Perl-Provides},
 Description: Vi IMproved - enhanced vi editor - with Athena GUI
  Vim is an almost compatible version of the UNIX editor Vi.
  .
@@ -180,7 +277,9 @@ Description: Vi IMproved - enhanced vi editor - with Athena GUI
 Package: vim-gnome
 Priority: extra
 Architecture: all
-Depends: vim-gtk3, ${misc:Depends}
+Depends:
+ vim-gtk3,
+ ${misc:Depends},
 Section: oldlibs
 Description: Vi IMproved - enhanced vi editor (dummy package)
  This is a transitional package to install the vim-gtk3 package.  You may
@@ -189,9 +288,13 @@ Description: Vi IMproved - enhanced vi editor (dummy package)
 Package: xxd
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: vim-common (<< 2:7.4.2347-1~)
-Replaces: vim-common (<< 2:7.4.2347-1~)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks:
+ vim-common (<< 2:7.4.2347-1~),
+Replaces:
+ vim-common (<< 2:7.4.2347-1~),
 Description: tool to make (or reverse) a hex dump
  xxd creates a hex dump of a given file or standard input.  It can also convert
  a hex dump back to its original binary form.
diff --git a/debian/vim-common.dirs b/debian/vim-common.dirs
index 95ea086..44893ee 100644
--- a/debian/vim-common.dirs
+++ b/debian/vim-common.dirs
@@ -1,9 +1,9 @@
 /etc/
 /usr/bin/
 /usr/share/applications/
-/usr/share/icons/locolor/16x16/apps/
-/usr/share/icons/locolor/32x32/apps/
 /usr/share/icons/hicolor/48x48/apps/
 /usr/share/icons/hicolor/scalable/apps/
+/usr/share/icons/locolor/16x16/apps/
+/usr/share/icons/locolor/32x32/apps/
 /usr/share/pixmaps/
 /var/lib/vim/addons/
diff --git a/debian/vim-doc.docs b/debian/vim-doc.docs
index 98fb97b..2be9981 100644
--- a/debian/vim-doc.docs
+++ b/debian/vim-doc.docs
@@ -1,3 +1,3 @@
+debian/FAQ
 debian/policy/vim-policy.html
 debian/policy/vim-policy.txt
-debian/FAQ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git



More information about the pkg-vim-maintainers mailing list