[vim] 04/07: Add a vim-gtk3 package

James McCoy jamessan at debian.org
Tue Mar 29 05:07:06 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 7a1a6baa0562f52537e7b3919bf9891d0cafcacc
Author: James McCoy <jamessan at debian.org>
Date:   Mon Mar 28 22:19:29 2016 -0400

    Add a vim-gtk3 package
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog            |  1 +
 debian/control              | 26 +++++++++++++++++++++-----
 debian/rules                | 14 +++++++++++++-
 debian/vim-variant.postinst |  4 ++--
 debian/vim-variant.prerm    |  2 +-
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea13611..700bcfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ vim (2:7.4.1683-1) UNRELEASED; urgency=medium
       - 7.4.1402: GTK3 GUI support
       - 7.4.1578: Support running a function on a periodic basis with the
         timer_start()/timer_start() functions.
+  * Add a vim-gtk3 package.  (Closes: #815750)
 
  -- James McCoy <jamessan at debian.org>  Mon, 28 Mar 2016 21:14:49 -0400
 
diff --git a/debian/control b/debian/control
index 21b2548..7bc5812 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: libacl1-dev, libgpmg1-dev [linux-any], autoconf,
 # B-D for dpkg-vendor
  dpkg-dev (>= 1.15.1),
 # B-D for GUI support
- libgtk2.0-dev, libxaw7-dev, libxt-dev, libxpm-dev, libgnomeui-dev,
+ 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
@@ -28,7 +28,7 @@ Package: vim-common
 Priority: important
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: vim | vim-gnome | vim-gtk | vim-athena | vim-nox | vim-tiny
+Recommends: vim | vim-gnome | 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~)
@@ -42,7 +42,7 @@ Description: Vi IMproved - Common files
 Package: vim-gui-common
 Architecture: all
 Multi-Arch: foreign
-Recommends: vim-gnome | vim-gtk | vim-athena
+Recommends: vim-gnome | 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.
@@ -58,7 +58,7 @@ 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-gnome | vim-gtk | vim-athena | vim-nox | vim-tiny
+Recommends: vim | vim-gnome | 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.
@@ -95,7 +95,7 @@ Description: Vi IMproved - enhanced vi editor - compact version
  the vi binary for base installations.
  .
  If a vim binary is wanted, try one of the following more featureful
- packages: vim, vim-nox, vim-athena, vim-gtk, or vim-gnome.
+ packages: vim, vim-nox, vim-athena, vim-gtk, vim-gtk3, or vim-gnome.
 
 Package: vim
 Architecture: any
@@ -143,6 +143,22 @@ Description: Vi IMproved - enhanced vi editor - with GTK2 GUI
  This package contains a version of vim compiled with a GTK2 GUI
  and support for scripting with Lua, Perl, Python, Ruby, and Tcl.
 
+Package: vim-gtk3
+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
+ 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
 Priority: extra
 Architecture: any
diff --git a/debian/rules b/debian/rules
index fea806f..ef2be5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,6 +78,13 @@ GTK2FLAGS+=--disable-motif-check
 GTK2FLAGS+=--disable-athena-check
 GTK2FLAGS+=--disable-fontset
 
+GTK3FLAGS:=--enable-gui=gtk3
+GTK3FLAGS+=--enable-gtk3-check
+GTK3FLAGS+=--disable-gnome-check
+GTK3FLAGS+=--disable-motif-check
+GTK3FLAGS+=--disable-athena-check
+GTK3FLAGS+=--disable-fontset
+
 GNOMEFLAGS:=--enable-gui=gnome2
 GNOMEFLAGS+=--disable-gtk2-check
 GNOMEFLAGS+=--enable-gnome-check
@@ -87,6 +94,7 @@ GNOMEFLAGS+=--disable-fontset
 
 ATHENAFLAGS:=--enable-gui=athena
 ATHENAFLAGS+=--disable-gtk2-check
+ATHENAFLAGS+=--disable-gtk3-check
 ATHENAFLAGS+=--disable-gnome-check
 ATHENAFLAGS+=--disable-motif-check
 ATHENAFLAGS+=--enable-athena-check
@@ -122,6 +130,7 @@ ALLINTERPFLAGS+=--with-tclsh=/usr/bin/tclsh
 
 VARIANTS+=vim-tiny
 VARIANTS+=vim-gtk
+VARIANTS+=vim-gtk3
 VARIANTS+=vim-gnome
 VARIANTS+=vim-athena
 VARIANTS+=vim-nox
@@ -138,7 +147,10 @@ CFLAGS_vim-tiny:=$(CFLAGS) -DTINY_VIMRC
 CFGFLAGS_vim-tiny:=$(CFGFLAGS) $(TINYFLAGS)
 
 CFLAGS_vim-gtk:=$(CFLAGS)
-CFGFLAGS_vim-gtk:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTKFLAGS) $(ALLINTERPFLAGS)
+CFGFLAGS_vim-gtk:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTK2FLAGS) $(ALLINTERPFLAGS)
+
+CFLAGS_vim-gtk3:=$(CFLAGS)
+CFGFLAGS_vim-gtk3:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTK3FLAGS) $(ALLINTERPFLAGS)
 
 CFLAGS_vim-gnome:=$(CFLAGS)
 CFGFLAGS_vim-gnome:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
diff --git a/debian/vim-variant.postinst b/debian/vim-variant.postinst
index 0d04493..0ef69d1 100644
--- a/debian/vim-variant.postinst
+++ b/debian/vim-variant.postinst
@@ -38,7 +38,7 @@ add_variant_alternative () {
               $mandir/man1/vim.1.gz
   done
   case "$variant" in
-    gtk|gnome|athena) # gui enabled variants
+    gtk|gtk3|gnome|athena) # gui enabled variants
       add_gui_variant_alternative $1
       ;;
   esac
@@ -60,7 +60,7 @@ case "$pkg" in
   vim-nox)
     add_variant_alternative 40
     ;;
-  vim-gtk|vim-athena)
+  vim-gtk|vim-gtk3|vim-athena)
     add_variant_alternative 50
     ;;
   vim-gnome) # gnome enabled variant
diff --git a/debian/vim-variant.prerm b/debian/vim-variant.prerm
index d1aa23d..baee170 100644
--- a/debian/vim-variant.prerm
+++ b/debian/vim-variant.prerm
@@ -20,7 +20,7 @@ remove_variant_alternative () {
     update-alternatives --remove $i /usr/bin/vim.$variant
   done
   case "$variant" in
-    gtk|athena|gnome) # gui enabled variants
+    gtk|gtk3|athena|gnome) # gui enabled variants
       remove_gui_variant_alternative
       ;;
   esac

-- 
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