r177 - trunk/vim/debian

Author: zack
Date: 2005-04-19 09:40:40 +0000 (Tue, 19 Apr 2005)
New Revision: 177

Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/control
   trunk/vim/debian/rules
Log:
added vim-full variant


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog  2005-04-19 07:34:11 UTC (rev 176)
+++ trunk/vim/debian/changelog  2005-04-19 09:40:40 UTC (rev 177)
@@ -8,6 +8,7 @@
     + Enabled backupcopy in global vimrc. (closes: #158657)
 
   * Stefano Zacchiroli <zack@xxxxxxxxxx>:
+    + Added vim-full variant with support for gnome and all interpreters
     + Updated patch 118_ocaml.vim.diff (new upstream).
     + Added patch 401_doc_exrc.diff, which fixes starting doc wrt "_exrc"
       (closes: #279378)

Modified: trunk/vim/debian/control
===================================================================
--- trunk/vim/debian/control    2005-04-19 07:34:11 UTC (rev 176)
+++ trunk/vim/debian/control    2005-04-19 09:40:40 UTC (rev 177)
@@ -14,7 +14,7 @@
 Depends: ${shlibs:Depends}, vim-common (= ${Source-Version})
 Suggests: ctags, vim-doc
 Provides: editor, vim-rt
-Conflicts: vim-rt, vim-tiny, vim-perl (<< 6.0), vim-python (<< 6.0), vim-tcl 
(<< 6.0), vim-tty (<< 6.0), vim-gtk (<< 6.0), vim-lesstif (<< 6.0)
+Conflicts: vim-gtk (<< 6.0), vim-lesstif (<< 6.0), vim-perl (<< 6.0), 
vim-python (<< 6.0), vim-rt, vim-tcl (<< 6.0), vim-tiny, vim-tty (<< 6.0)
 Replaces: vim-rt, vim-tiny (<< 6.0), vim-perl (<< 6.0), vim-python (<< 6.0), 
vim-tcl (<< 6.0), vim-tty (<< 6.0), vim-gtk (<< 6.0), vim-lesstif (<< 6.0), 
kvim (<< 1:6.2.135+1)
 Description: Vi IMproved - enhanced vi editor
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -29,7 +29,7 @@
 Depends: ${shlibs:Depends}
 Suggests: ctags, vim-doc
 Provides: editor, vim-rt
-Conflicts: vim, vim-rt, vim-perl (<< 6.0), vim-python (<< 6.0), vim-tcl (<< 
6.0), vim-tty (<< 6.0), vim-gtk (<< 6.0), vim-lesstif (<< 6.0)
+Conflicts: vim, vim-full, vim-gnome, vim-gtk (<< 6.0), vim-lesstif (<< 6.0), 
vim-perl (<< 6.0), vim-python (<< 6.0), vim-rt, vim-ruby, vim-tcl (<< 6.0), 
vim-tty (<< 6.0)
 Replaces: vim-rt, vim-tiny (<< 6.0), vim-perl (<< 6.0), vim-python (<< 6.0), 
vim-tcl (<< 6.0), vim-tty (<< 6.0), vim-gtk (<< 6.0), vim-lesstif (<< 6.0), 
kvim (<< 1:6.2.135+1)
 Description: Vi IMproved - minimalistic version of the enhanced vi editor
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -45,7 +45,7 @@
 Depends: vim (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: vim-tiny, vim-python, vim-gtk, vim-lesstif, vim-ruby, vim-tcl, 
vim-tty, vim-gnome, kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full, 
vim-gnome, vim-gtk, vim-lesstif, vim-python, vim-ruby, vim-tcl, vim-tiny, 
vim-tty
 Replaces: vim-tiny, vim-python, vim-gtk, vim-lesstif, vim-ruby, vim-tcl, 
vim-tty, vim-gnome, kvim, vim (<= 1:6.3-068+1), kvim-perl, kvim-python, 
kvim-ruby, kvim-tcl
 Description: Vi IMproved, with perl scripting support
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -62,7 +62,7 @@
 Depends: vim (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: vim-tiny, vim-perl, vim-gtk, vim-lesstif, vim-ruby, vim-tcl, 
vim-tty, vim-gnome, kvim, kvim-python, kvim-perl, kvim-tcl, kvim-ruby
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full, 
vim-gnome, vim-gtk, vim-lesstif, vim-perl, vim-ruby, vim-tcl, vim-tiny, vim-tty
 Replaces: vim-tiny, vim-perl, vim-gtk, vim-lesstif, vim-ruby, vim-tcl, 
vim-tty, vim-gnome, kvim, vim (<= 1:6.3-068+1), kvim-python, kvim-perl, 
kvim-tcl, kvim-ruby
 Description: Vi IMproved, with python scripting support
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -79,7 +79,7 @@
 Depends: vim (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: vim-tiny, vim-perl, vim-gtk, vim-lesstif, vim-python, vim-tcl, 
vim-tty, kvim, kvim-perl, kvim-python, kvim-tcl
+Conflicts: kvim, kvim-perl, kvim-python, kvim-tcl, vim-full, vim-gnome, 
vim-gtk, vim-lesstif, vim-perl, vim-python, vim-tcl, vim-tiny, vim-tty
 Replaces: vim-tiny, vim-perl, vim-gtk, vim-lesstif, vim-python, vim-tcl, 
vim-tty, kvim, vim (<= 1:6.3-068+1), kvim-perl, kvim-python, kvim-tcl
 Description: Vi IMproved, with ruby scripting support
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -96,7 +96,7 @@
 Depends: vim (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: vim-tiny, vim-perl, vim-gtk, vim-lesstif, vim-python, vim-ruby, 
vim-tty, vim-gnome, kvim, kvim-perl, kvim-ruby, kvim-tcl, kvim-python
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full, 
vim-gnome, vim-gtk, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tiny, 
vim-tty
 Replaces: vim-tiny, vim-perl, vim-gtk, vim-lesstif, vim-python, vim-ruby, 
vim-tty, vim-gnome, kvim, vim (<= 1:6.3-068+1), kvim-perl, kvim-ruby, kvim-tcl, 
kvim-python
 Description: Vi IMproved, with tcl scripting support
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -113,7 +113,7 @@
 Depends: vim (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: vim-tiny, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lesstif, 
vim-tty, vim-gnome, kvim, kvim-perl, kvim-ruby, kvim-tcl, kvim-python
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full, 
vim-gnome, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, 
vim-tty
 Replaces: vim-tiny, vim-perl, vim-python, vim-ruby, vim-tcl, vim-lesstif, 
vim-tty, vim-gnome, kvim, vim (<= 1:6.3-068+1), kvim-perl, kvim-ruby, kvim-tcl, 
kvim-python
 Description: Vi IMproved - GTK2 Version
  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
@@ -129,7 +129,7 @@
 Depends: vim (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: vim-tiny, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tty, 
vim-gtk, vim-gnome, kvim, kvim-perl, kvim-ruby, kvim-tcl, kvim-python
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full, 
vim-gnome, vim-gtk, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
 Replaces: vim-tiny, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tty, vim-gtk, 
vim-gnome, kvim, vim (<= 1:6.3-068+1), kvim-perl, kvim-ruby, kvim-tcl, 
kvim-python
 Description: Vi IMproved - LessTif Version
  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
@@ -145,7 +145,7 @@
 Depends: vim (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: vim-tiny, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tty, 
vim-gtk, vim-lesstif, kvim, kvim-perl, kvim-ruby, kvim-tcl, kvim-python
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full, 
vim-gtk, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
 Replaces: vim-tiny, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tty, vim-gtk, 
vim-lesstif, kvim, vim (<= 1:6.3-068+1), kvim-perl, kvim-ruby, kvim-tcl, 
kvim-python
 Description: Vi IMproved - GNOME2 Version
  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
@@ -155,6 +155,23 @@
  .
  This package contains a version of vim compiled with support for GNOME2 gui.
 
+Package: vim-full
+Priority: extra
+Architecture: any
+Depends: vim (= ${Source-Version}), ${shlibs:Depends}
+Suggests: cscope, vim-doc, ttf-bitstream-vera
+Provides: gvim
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-gnome, 
vim-gtk, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
+Replaces: vim-tiny, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tty, 
vim-gnome, vim-gtk, vim-lesstif, kvim, vim (<= 1:6.3-068+1), kvim-perl, 
kvim-ruby, kvim-tcl, kvim-python
+Description: Vi IMproved - full fledged version of the enhanced vi editor
+ 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 the GNOME2
+ GUI and scripting support for perl, python, ruby, and tcl.
+
 Package: vim-doc
 Priority: optional
 Architecture: all

Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules      2005-04-19 07:34:11 UTC (rev 176)
+++ trunk/vim/debian/rules      2005-04-19 09:40:40 UTC (rev 177)
@@ -30,18 +30,12 @@
 GUIFLAGS+=--with-x
 GUIFLAGS+=--enable-xim
 GUIFLAGS+=--enable-fontset
-
 GTK2FLAGS+=--enable-gui=gtk2
 GTK2FLAGS+=--with-features=big
 
 GNOMEFLAGS+=--enable-gui=gnome2
 
-KDEFLAGS+=--enable-gui=kde
-KDEFLAGS+=--enable-kde-toolbar
-KDEFLAGS+=--with-qt-dir=/usr/share/qt3
-KDEFLAGS+=--with-kde-includes=/usr/include/kde
-KDEFLAGS+=--disable-rpath
-KDEFLAGS+=--disable-xim
+LESSTIFFLAGS+=--enable-gui=motif
 
 PERLFLAGS+=--enable-perlinterp
 PERLFLAGS+=--disable-pythoninterp
@@ -73,6 +67,11 @@
 TINYFLAGS+=--disable-gpm
 TINYFLAGS+=--with-features=tiny
 
+ALLINTERPFLAGS+=--enable-perlinterp
+ALLINTERPFLAGS+=--enable-pythoninterp
+ALLINTERPFLAGS+=--enable-rubyinterp
+ALLINTERPFLAGS+=--enable-tclinterp
+
 ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
   VARIANTS+=vim-basic
   VARIANTS+=vim-ruby
@@ -82,6 +81,7 @@
   VARIANTS+=vim-perl
   VARIANTS+=vim-python
   VARIANTS+=vim-gnome
+  VARIANTS+=vim-full
   VARIANTS_SKIP+=vim-tiny
 else
   VARIANTS+=vim-basic
@@ -93,6 +93,7 @@
   VARIANTS_SKIP+=vim-perl
   VARIANTS_SKIP+=vim-gnome
   VARIANTS_SKIP+=vim-tcl
+  VARIANTS_SKIP+=vim-full
 endif
 ifeq ($(origin VARIANT), command line)
   VARIANTS = vim-basic $(VARIANT)
@@ -123,8 +124,11 @@
 CFGFLAGS_vim-gnome=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(BASICFLAGS) 
$(GNOMEFLAGS)
 
 CFLAGS_vim-lesstif=$(CFLAGS)
-CFGFLAGS_vim-lesstif=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(BASICFLAGS) 
--enable-gui=motif
+CFGFLAGS_vim-lesstif=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(BASICFLAGS) 
$(LESSTIFFLAGS)
 
+CFLAGS_vim-full=$(CFLAGS)
+CFGFLAGS_vim-full=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) 
$(ALLINTERPFLAGS)
+
 NAME=vim
 VERSION=6.3
 SOURCES+=$(NAME)-$(VERSION).tar.bz2