r135 - trunk/vim7/debian

Norbert Tretkowski nobse@costa.debian.org
Tue, 29 Mar 2005 09:19:11 +0000


Author: nobse
Date: 2005-03-29 09:19:10 +0000 (Tue, 29 Mar 2005)
New Revision: 135

Modified:
   trunk/vim7/debian/changelog
   trunk/vim7/debian/control
   trunk/vim7/debian/rules
Log:
kicked out kvim packages


Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2005-03-29 08:14:56 UTC (rev 134)
+++ trunk/vim7/debian/changelog	2005-03-29 09:19:10 UTC (rev 135)
@@ -1,37 +1,39 @@
-vim (1:6.3+7.0aa.20050325-0pre1) UNRELEASED; urgency=low
+vim (1:6.3+7.0aa.20050328-1~pre1) UNRELEASED; urgency=low
 
-  * Updated to 7.00.64.
+  * Updated to 7.00.65.
+  * Merged some more changes from 6.3 branch.
+  * Completely kicked out kvim packages.
 
- -- Norbert Tretkowski <nobse@debian.org>  Sun, 27 Mar 2005 23:04:07 +0200
+ -- Norbert Tretkowski <nobse@debian.org>  Tue, 29 Mar 2005 11:16:02 +0200
 
-vim (1:6.3+7.0aa.20050205-0pre1) UNRELEASED; urgency=low
+vim (1:6.3+7.0aa.20050205-1~pre1) UNRELEASED; urgency=low
 
   * Updated to 7.0aa head.
   * Merged changes from 1:6.3-061+1.
 
  -- Norbert Tretkowski <nobse@debian.org>  Sat, 05 Feb 2005 23:21:25 +0100
 
-vim (1:6.3+7.0aa.20050127-0pre1) UNRELEASED; urgency=low
+vim (1:6.3+7.0aa.20050127-1~pre1) UNRELEASED; urgency=low
 
   * Updated to 7.0aa head.
   * Merged changes from 1:6.3-054+1 and 1:6.3-058+1.
 
  -- Norbert Tretkowski <nobse@debian.org>  Fri, 28 Jan 2005 00:38:45 +0100
 
-vim (1:6.3+7.0aa.20041229-0pre1) UNRELEASED; urgency=low
+vim (1:6.3+7.0aa.20041229-1~pre1) UNRELEASED; urgency=low
 
   * Updated to 7.0aa head.
 
  -- Norbert Tretkowski <nobse@debian.org>  Sat, 01 Jan 2005 22:55:31 +0100
 
-vim (1:6.3+7.0aa.20041224-0pre2) UNRELEASED; urgency=low
+vim (1:6.3+7.0aa.20041224-1~pre1) UNRELEASED; urgency=low
 
   * Added missing symlinks in /usr/bin to vim binary. 
   * Smooth upgrade from files and symlinks in /usr/share/doc.
 
  -- Norbert Tretkowski <nobse@debian.org>  Mon, 27 Dec 2004 15:45:35 +0100
 
-vim (1:6.3+7.0aa.20041224-0pre1) UNRELEASED; urgency=low
+vim (1:6.3+7.0aa.20041224-1~pre1) UNRELEASED; urgency=low
   
   * New major upstream alpha release (7.0aa).
   * Complete rewrite of build system, still incomplete.

Modified: trunk/vim7/debian/control
===================================================================
--- trunk/vim7/debian/control	2005-03-29 08:14:56 UTC (rev 134)
+++ trunk/vim7/debian/control	2005-03-29 09:19:10 UTC (rev 135)
@@ -2,7 +2,7 @@
 Section: editors
 Priority: optional
 Maintainer: Norbert Tretkowski <tretkowski@inittab.de>
-Build-Depends: debhelper (>= 4.1.16), bzip2, libgpmg1-dev [!hurd-i386] | not+linux-gnu, libncurses5-dev, perl (>= 5.8.4-2), libperl-dev (>= 5.8.4-2), tcl8.4-dev [!hurd-i386], python-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], libqt3-mt-dev [!hurd-i386], kdelibs4-dev [!hurd-i386], lesstif2-dev
+Build-Depends: debhelper (>= 4.1.16), bzip2, libgpmg1-dev [!hurd-i386] | not+linux-gnu, libncurses5-dev, perl (>= 5.8.4-2), libperl-dev (>= 5.8.4-2), tcl8.4-dev [!hurd-i386], python-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev
 Standards-Version: 3.6.1
 
 Package: vim
@@ -131,64 +131,3 @@
  etc.
  .
  This package contains a version of vim compiled with support for GTK2 gui.
-
-#Package: kvim
-#Architecture: any
-#Depends: ${shlibs:Depends}, vim (= ${Source-Version})
-#Description: Vi IMproved - KDE 3.x version
-# 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
-# KDE frontend.
-#
-#Package: kvim-perl
-#Architecture: any
-#Depends: ${shlibs:Depends}, vim (= ${Source-Version})
-#Description: Vi IMproved - KDE 3.x version with Perl scripting support
-# 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
-# KDE frontend.
-#
-#Package: kvim-python
-#Architecture: any
-#Depends: ${shlibs:Depends}, vim (= ${Source-Version})
-#Description: Vi IMproved - KDE 3.x version with Python scripting support
-# 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
-# KDE frontend.
-#
-#Package: kvim-ruby
-#Architecture: any
-#Depends: ${shlibs:Depends}, vim (= ${Source-Version})
-#Description: Vi IMproved - KDE 3.x version with Ruby scripting support
-# 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
-# KDE frontend.
-#
-#Package: kvim-tcl
-#Architecture: any
-#Depends: ${shlibs:Depends}, vim (= ${Source-Version})
-#Description: Vi IMproved - KDE 3.x version with TCL scripting support
-# 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
-# KDE frontend.
-#

Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules	2005-03-29 08:14:56 UTC (rev 134)
+++ trunk/vim7/debian/rules	2005-03-29 09:19:10 UTC (rev 135)
@@ -4,6 +4,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+BUILDER := $(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2> /dev/null))}})
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -14,7 +16,7 @@
 
 CFGFLAGS+=--prefix=/usr
 CFGFLAGS+=--mandir='$${prefix}'/share/man
-CFGFLAGS+=--with-compiledby="Norbert Tretkowski <nobse@debian.org>"
+CFGFLAGS+=--with-compiledby=$(BUILDER)
 
 OPTFLAGS+=--enable-gpm
 OPTFLAGS+=--enable-cscope
@@ -30,13 +32,6 @@
 
 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
-
 PERLFLAGS+=--enable-perlinterp
 PERLFLAGS+=--disable-pythoninterp
 PERLFLAGS+=--disable-rubyinterp
@@ -68,11 +63,6 @@
 TINYFLAGS+=--with-features=tiny
 
 ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
-  #VARIANTS+=kvim-basic
-  #VARIANTS+=kvim-python
-  #VARIANTS+=kvim-perl
-  #VARIANTS+=kvim-ruby
-  #VARIANTS+=kvim-tcl
   VARIANTS+=vim-ruby
   VARIANTS+=vim-gnome
   VARIANTS+=vim-gtk
@@ -91,12 +81,6 @@
   VARIANTS_SKIP+=vim-perl
   VARIANTS_SKIP+=vim-gnome
   VARIANTS_SKIP+=vim-tcl
-  VARIANTS_SKIP+=kvim
-  VARIANTS_SKIP+=kvim-basic
-  VARIANTS_SKIP+=kvim-python
-  VARIANTS_SKIP+=kvim-perl
-  VARIANTS_SKIP+=kvim-ruby
-  VARIANTS_SKIP+=kvim-tcl
   VARIANTS+=vim-basic
 endif
 
@@ -127,21 +111,6 @@
 CFLAGS_vim-lesstif=$(CFLAGS)
 CFGFLAGS_vim-lesstif=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(BASICFLAGS) --enable-gui=motif
 
-CFLAGS_kvim-basic=$(CFLAGS)
-CFGFLAGS_kvim-basic=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(BASICFLAGS) $(KDEFLAGS)
-
-CFLAGS_kvim-perl=$(CFLAGS)
-CFGFLAGS_kvim-perl=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(PERLFLAGS) $(KDEFLAGS)
-
-CFLAGS_kvim-ruby=$(CFLAGS)
-CFGFLAGS_kvim-ruby=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(RUBYFLAGS) $(KDEFLAGS)
-
-CFLAGS_kvim-python=$(CFLAGS)
-CFGFLAGS_kvim-python=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(PYTHONFLAGS) $(KDEFLAGS)
-
-CFLAGS_kvim-tcl=$(CFLAGS)
-CFGFLAGS_kvim-tcl=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(TCLFLAGS) $(KDEFLAGS)
-
 build: build-arch build-indep
 
 build-arch: build-arch-stamp