r137 - in trunk/vim: debian upstream
Norbert Tretkowski
nobse@costa.debian.org
Tue, 29 Mar 2005 09:34:15 +0000
Author: nobse
Date: 2005-03-29 09:34:14 +0000 (Tue, 29 Mar 2005)
New Revision: 137
Removed:
trunk/vim/debian/kvim-variant.menu
trunk/vim/debian/kvim.dirs
trunk/vim/debian/kvim.install
trunk/vim/debian/kvim.links
trunk/vim/debian/kvim.menu
trunk/vim/debian/kvim.mime
trunk/vim/debian/kvim.postinst
trunk/vim/debian/kvim.postrm
trunk/vim/debian/kvim.preinst
trunk/vim/upstream/kvim/
Modified:
trunk/vim/debian/rules
Log:
remove kvim packages, part 2
Deleted: trunk/vim/debian/kvim-variant.menu
===================================================================
--- trunk/vim/debian/kvim-variant.menu 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/kvim-variant.menu 2005-03-29 09:34:14 UTC (rev 137)
@@ -1,4 +0,0 @@
-?package(@PKG@):needs="X11" section="Apps/Editors"\
- hints="KDE,Editors"\
- title="KVim" command="kvim"\
- kderemove="y"
Deleted: trunk/vim/debian/kvim.dirs
===================================================================
--- trunk/vim/debian/kvim.dirs 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/kvim.dirs 2005-03-29 09:34:14 UTC (rev 137)
@@ -1 +0,0 @@
-usr/share/doc
Deleted: trunk/vim/debian/kvim.install
===================================================================
--- trunk/vim/debian/kvim.install 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/kvim.install 2005-03-29 09:34:14 UTC (rev 137)
@@ -1,2 +0,0 @@
-debian/lintian/kvim usr/share/lintian/overrides
-debian/runtime/gvimrc etc/vim
Deleted: trunk/vim/debian/kvim.links
===================================================================
--- trunk/vim/debian/kvim.links 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/kvim.links 2005-03-29 09:34:14 UTC (rev 137)
@@ -1,2 +0,0 @@
-usr/share/doc/vim usr/share/doc/kvim
-etc/vim/gvimrc usr/share/vim/gvimrc
Deleted: trunk/vim/debian/kvim.menu
===================================================================
--- trunk/vim/debian/kvim.menu 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/kvim.menu 2005-03-29 09:34:14 UTC (rev 137)
@@ -1,4 +0,0 @@
-?package(kvim):needs="X11" section="Apps/Editors"\
- hints="KDE,Editors"\
- title="KVim" command="kvim"\
- kderemove="y"
Deleted: trunk/vim/debian/kvim.mime
===================================================================
--- trunk/vim/debian/kvim.mime 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/kvim.mime 2005-03-29 09:34:14 UTC (rev 137)
@@ -1,2 +0,0 @@
-text/plain; kvim %s; edit=kvim -f %s; compose=kvim -f %s; test=test "$DISPLAY" != ""; priority=4
-text/*; kvim %s; edit=kvim -f %s; compose=kvim -f %s; test=test "$DISPLAY" != "" ; priority=2
Deleted: trunk/vim/debian/kvim.postinst
===================================================================
--- trunk/vim/debian/kvim.postinst 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/kvim.postinst 2005-03-29 09:34:14 UTC (rev 137)
@@ -1,15 +0,0 @@
-#! /bin/sh -e
-
-pkg=kvim
-
-case "$1" in
- configure)
- if [ -L /usr/doc/$pkg ] ; then
- rm /usr/doc/$pkg
- fi
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/vim/debian/kvim.postrm
===================================================================
--- trunk/vim/debian/kvim.postrm 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/kvim.postrm 2005-03-29 09:34:14 UTC (rev 137)
@@ -1,18 +0,0 @@
-#! /bin/sh -e
-
-pkg=kvim
-
-remove_diversion() {
- dpkg-divert --package $pkg --remove --rename \
- --divert /usr/bin/vim.org /usr/bin/vim
-}
-
-if [ "$1" = "failed-upgrade" ] && $(dpkg --compare-versions $2 lt 6.0) ; then
- remove_diversion
-elif [ "$1" = "remove" ] ; then
- remove_diversion
-fi
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/vim/debian/kvim.preinst
===================================================================
--- trunk/vim/debian/kvim.preinst 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/kvim.preinst 2005-03-29 09:34:14 UTC (rev 137)
@@ -1,18 +0,0 @@
-#! /bin/sh -e
-
-pkg=kvim
-
-add_diversion() {
- dpkg-divert --package $pkg --add --rename \
- --divert /usr/bin/vim.org /usr/bin/vim
-}
-
-if [ "$1" = "install" ] ; then
- add_diversion
-elif [ "$1" = "upgrade" ] && $(dpkg --compare-versions $2 lt 6.0) ; then
- add_diversion
-fi
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules 2005-03-29 09:32:10 UTC (rev 136)
+++ trunk/vim/debian/rules 2005-03-29 09:34:14 UTC (rev 137)
@@ -82,11 +82,6 @@
VARIANTS+=vim-perl
VARIANTS+=vim-python
VARIANTS+=vim-gnome
- VARIANTS+=kvim-basic
- VARIANTS+=kvim-python
- VARIANTS+=kvim-perl
- VARIANTS+=kvim-ruby
- VARIANTS+=kvim-tcl
VARIANTS_SKIP+=vim-tiny
else
VARIANTS+=vim-basic
@@ -98,12 +93,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
endif
ifeq ($(origin VARIANT), command line)
VARIANTS = vim-basic $(VARIANT)
@@ -136,21 +125,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)
-
NAME=vim
VERSION=6.3
SOURCES+=$(NAME)-$(VERSION).tar.bz2
@@ -172,9 +146,6 @@
echo "applying upstream patch: $$f" ;\
cat upstream/patches/$$f | patch -s -d$(SRCDIR) -p0 ;\
done
- echo "applying KVim patches";
- cd vim63; cat ../upstream/kvim/vim2kvim.diff | patch -p1;
- cd vim63/runtime; uudecode ../../upstream/kvim/runtime/*.uu;
@for f in `find debian/patches -type f -printf "%P\n" | grep -v .svn | sort -n` ; do\
echo "applying debian patch: $$f" ;\
cat debian/patches/$$f | patch -s -d$(SRCDIR) -p1 ;\
@@ -192,7 +163,7 @@
clean: $(foreach v,$(VARIANTS),clean-$(v))
dh_testdir
dh_testroot
- rm -f extract-stamp* build-stamp* install-stamp* install-kvim
+ rm -f extract-stamp* build-stamp* install-stamp*
rm -rf $(SRCDIR)
dh_clean
@@ -236,48 +207,6 @@
dh_installmime
touch $@
-install-stamp-kvim-basic: DH_OPTIONS=-pkvim
-install-stamp-kvim-basic: PKG=kvim
-install-stamp-kvim-basic:
- dh_testdir
- dh_testroot
- dh_clean -k
- for x in preinst postinst postrm install dirs links ; do \
- sed -e s/@PKG@/kvim/ debian/vim-variant.$$x >debian/kvim.$$x ;\
- done
- sed -e s/@PKG@/kvim/ debian/lintian/vim-variant >debian/lintian/kvim
- $(INSTALL) -D $(SRCDIR)/src/kvim-basic $(CURDIR)/debian/kvim/usr/bin/vim
- $(MAKE) -C $(SRCDIR)/src KDE_DIR=/usr DESTDIR=$(CURDIR)/debian/kvim installklinks installkdeicons
- rm -f $(CURDIR)/debian/kvim/usr/bin/eview $(CURDIR)/debian/kvim/usr/bin/evim $(CURDIR)/debian/kvim/usr/bin/kview
- rm -f $(CURDIR)/debian/kvim/usr/lib/menu/kvim
- mkdir -p $(CURDIR)/debian/kvim/usr/share/man/man1
- cp $(CURDIR)/debian/manpage/{kvim.1,kvimdiff.1,rkview.1,rkvim.1} $(CURDIR)/debian/kvim/usr/share/man/man1
- install -m 644 -D $(CURDIR)/debian/kvim.menu $(CURDIR)/debian/kvim/usr/lib/menu/kvim
- install -m 644 -D $(CURDIR)/debian/kvim.mime $(CURDIR)/debian/kvim/usr/lib/mime/packages/kvim
- touch $@
-
-install-stamp-kvim-%: DH_OPTIONS=-p$(*)
-install-stamp-kvim-%: PKG=kvim-$(*)
-install-stamp-kvim-%:
- dh_testdir
- dh_testroot
- dh_clean -k
- for x in preinst postinst postrm install dirs links ; do \
- sed -e s/@PKG@/kvim-$*/ debian/vim-variant.$$x >debian/kvim-$*.$$x ;\
- done
- sed -e s/@PKG@/kvim-$*/ debian/lintian/vim-variant >debian/lintian/kvim-$*
- sed -e s/@PKG@/kvim-$*/ debian/kvim-variant.menu >debian/kvim-$*.menu
- $(INSTALL) -D $(SRCDIR)/src/kvim-$* $(CURDIR)/debian/kvim-$*/usr/bin/vim
- $(MAKE) -C $(SRCDIR)/src KDE_DIR=/usr DESTDIR=$(CURDIR)/debian/$(PKG) installklinks installkdeicons
- rm -f $(CURDIR)/debian/$(PKG)/usr/bin/eview $(CURDIR)/debian/$(PKG)/usr/bin/evim $(CURDIR)/debian/$(PKG)/usr/bin/kview
- rm -f $(CURDIR)/debian/$(PKG)/usr/lib/menu/$(PKG)
-# install manpages
- mkdir -p $(CURDIR)/debian/$(PKG)/usr/share/man/man1
- cp $(CURDIR)/debian/manpage/{kvim.1,kvimdiff.1,rkview.1,rkvim.1} $(CURDIR)/debian/$(PKG)/usr/share/man/man1/
- install -m 644 -D $(CURDIR)/debian/kvim-$*.menu $(CURDIR)/debian/$(PKG)/usr/lib/menu/$(PKG)
- install -m 644 -D $(CURDIR)/debian/kvim.mime $(CURDIR)/debian/$(PKG)/usr/lib/mime/packages/$(PKG)
- touch $@
-
# the 'tiny' variant includes all the runtime files
install-stamp-vim-basic: DH_OPTIONS=-pvim
install-stamp-vim-basic: DESTDIR=$(PWD)/debian/vim
@@ -307,11 +236,6 @@
rm -f $(DESTDIR)/usr/bin/gvimdiff
rm -f $(DESTDIR)/usr/bin/k{view,vim}
rm -f $(DESTDIR)/usr/bin/rk{view,vim}
- rm -f $(DESTDIR)/usr/bin/kvimdiff
- rm -rf $(DESTDIR)/usr/share/apps/kvim
- rm -f $(DESTDIR)/usr/share/applnk/Editors/KVim.desktop
- rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/kvim.png
- rm -f $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/kvim.png
rm -f $(DESTDIR)/usr/share/icons/hicolor/16x16/actions/hi16-action-make.png
rm -f $(DESTDIR)/usr/share/icons/hicolor/22x22/actions/hi22-action-make.png