[vim] 01/01: Turn vim-gnome into a transitional package to vim-gtk3

[James McCoy]

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

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

commit 0328a096c18ed300c772ec978d375435ed3b9f88
Author: James McCoy <jamessan at debian.org>
Date:   Sun Sep 4 15:10:38 2016 -0400

    Turn vim-gnome into a transitional package to vim-gtk3
    
    vim-gnome used deprecated GNOME2 libraries, and doesn't actually provide
    useful functionality for users of the current GNOME (3).
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog |  2 ++
 debian/control   | 29 +++++++++++------------------
 debian/rules     | 11 -----------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ded1f2e..cac6e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ vim (2:7.4.2295-1) UNRELEASED; urgency=medium
   * Add mips64el as a recognized architecture in debcontrol files.  Thanks to
     Reiner Herrmann for the patch.  (Closes: #830545)
   * Update supported Ubuntu releases in debsources files.
+  * Remove vim-gnome (which uses deprecated gnome2 libraries) in favor of
+    vim-gtk3.  (Closes: #820239)
 
  -- James McCoy <jamessan at debian.org>  Tue, 30 Aug 2016 21:28:21 -0400
 
diff --git a/debian/control b/debian/control
index 8e9dd81..e60105b 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, libgtk-3-dev, libxaw7-dev, libxt-dev, libxpm-dev, libgnomeui-dev,
+ 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, tcl-dev, python3-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-gtk3 | vim-athena | vim-nox | vim-tiny
+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~)
@@ -42,7 +42,7 @@ Description: Vi IMproved - Common files
 Package: vim-gui-common
 Architecture: all
 Multi-Arch: foreign
-Recommends: vim-gnome | vim-gtk | vim-gtk3 | vim-athena
+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.
@@ -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-gtk3 | vim-athena | vim-nox | vim-tiny
+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.
@@ -96,7 +96,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, vim-gtk3, or vim-gnome.
+ packages: vim, vim-nox, vim-athena, vim-gtk, or vim-gtk3.
 
 Package: vim
 Architecture: any
@@ -181,16 +181,9 @@ Description: Vi IMproved - enhanced vi editor - with Athena GUI
 
 Package: vim-gnome
 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
- 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, Python, Ruby, and Tcl.
+Architecture: all
+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
+ remove this package if nothing depends on it.
diff --git a/debian/rules b/debian/rules
index a291a06..62b6055 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,13 +87,6 @@ GTK3FLAGS+=--disable-motif-check
 GTK3FLAGS+=--disable-athena-check
 GTK3FLAGS+=--disable-fontset
 
-GNOMEFLAGS:=--enable-gui=gnome2
-GNOMEFLAGS+=--disable-gtk2-check
-GNOMEFLAGS+=--enable-gnome-check
-GNOMEFLAGS+=--disable-motif-check
-GNOMEFLAGS+=--disable-athena-check
-GNOMEFLAGS+=--disable-fontset
-
 ATHENAFLAGS:=--enable-gui=athena
 ATHENAFLAGS+=--disable-gtk2-check
 ATHENAFLAGS+=--disable-gtk3-check
@@ -133,7 +126,6 @@ ALLINTERPFLAGS+=--with-tclsh=/usr/bin/tclsh
 VARIANTS+=vim-tiny
 VARIANTS+=vim-gtk
 VARIANTS+=vim-gtk3
-VARIANTS+=vim-gnome
 VARIANTS+=vim-athena
 VARIANTS+=vim-nox
 VARIANTS+=vim-basic
@@ -154,9 +146,6 @@ CFGFLAGS_vim-gtk:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTK2FLAGS) $(ALLINTERPFL
 CFLAGS_vim-gtk3:=$(CFLAGS)
 CFGFLAGS_vim-gtk3:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTK3FLAGS) $(ALLINTERPFLAGS)
 
-CFLAGS_vim-gnome:=$(CFLAGS)
-CFGFLAGS_vim-gnome:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
-
 CFLAGS_vim-athena:=$(CFLAGS)
 CFGFLAGS_vim-athena:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(ATHENAFLAGS) $(ALLINTERPFLAGS)
 

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