r376 - in trunk/vim/debian: . lintian

Stefano Zacchiroli zack at costa.debian.org
Sat Oct 22 22:45:16 UTC 2005


Author: zack
Date: 2005-10-22 22:45:15 +0000 (Sat, 22 Oct 2005)
New Revision: 376

Added:
   trunk/vim/debian/gvim.desktop
   trunk/vim/debian/vim-variant.postinst
   trunk/vim/debian/vim-variant.prerm
   trunk/vim/debian/vim.menu
Removed:
   trunk/vim/debian/vim-variant.conffiles
   trunk/vim/debian/vim-variant.desktop
   trunk/vim/debian/vim-variant.dirs
   trunk/vim/debian/vim-variant.links
   trunk/vim/debian/vim-variant.menu
   trunk/vim/debian/vim-variant.mime
   trunk/vim/debian/vim-variant.postinst
   trunk/vim/debian/vim-variant.preinst
Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/control
   trunk/vim/debian/lintian/vim-variant
   trunk/vim/debian/rules
   trunk/vim/debian/vim-variant.install
   trunk/vim/debian/vim-variant.postrm
   trunk/vim/debian/vim.dirs
   trunk/vim/debian/vim.install
   trunk/vim/debian/vim.links
   trunk/vim/debian/vim.mime
   trunk/vim/debian/vim.postinst
   trunk/vim/debian/vim.prerm
Log:
merged alternatives stuff (i.e. no longer conflicting vim variant packages)


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/changelog	2005-10-22 22:45:15 UTC (rev 376)
@@ -4,6 +4,12 @@
   * New upstream patch (001), see README.gz for details.
 
   [ Stefano Zacchiroli ]
+  * debian/*
+    - got rid of conflicts among vim-* packages (aka variants) using
+      alternatives for /usr/bin/vim
+    - got rid of ancient stuff
+      + removal of /usr/doc/* symlinks
+      + vim-tiny package
   * Added "sources" debian/rules target which downloads upstream
     tarballs.
   * Added patch 146_netrw.vim.diff, fixes some issues of netrw.vim with

Modified: trunk/vim/debian/control
===================================================================
--- trunk/vim/debian/control	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/control	2005-10-22 22:45:15 UTC (rev 376)
@@ -10,43 +10,25 @@
 Package: vim
 Priority: optional
 Architecture: any
-Pre-Depends: dpkg (>= 1.6.8)
 Depends: ${shlibs:Depends}, vim-common (= ${Source-Version})
 Suggests: ctags, vim-doc, vim-scripts
 Provides: editor, vim-rt
-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)
+Conflicts: vim-rt, vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny (<< 6.0), vim-tty (<< 6.0)
+Replaces: vim-rt, kvim (<< 1:6.2.135+1), vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny (<< 6.0), vim-tty (<< 6.0)
 Description: Vi IMproved - 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.
 
-Package: vim-tiny
-Priority: optional
-Architecture: any
-Pre-Depends: dpkg (>= 1.6.8)
-Depends: ${shlibs:Depends}
-Suggests: ctags, vim-doc
-Provides: editor, vim-rt
-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
- features have been added: multi level undo, syntax highlighting,
- command line history, on-line help, filename completion, block operations,
- .
- This package contains a minimalistic version of vim compiled without any
- additional features.
-
 Package: vim-perl
 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-full, vim-gnome, vim-gtk, vim-lesstif, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full, vim-gnome, vim-gtk, vim-lesstif, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
+Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
 Description: Vi IMproved, 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,
@@ -62,8 +44,8 @@
 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-full, vim-gnome, vim-gtk, vim-lesstif, vim-perl, vim-ruby, vim-tcl, vim-tiny, vim-tty
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full, vim-gnome, vim-gtk, vim-lesstif, vim-perl, vim-ruby, vim-tcl, vim-tiny, vim-tty
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
+Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
 Description: Vi IMproved, 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,
@@ -79,8 +61,8 @@
 Depends: vim (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-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: kvim, kvim-perl, kvim-python, kvim-tcl, vim (<= 1:6.3-068+1), vim-full, vim-gnome, vim-gtk, vim-lesstif, vim-perl, vim-python, vim-tcl, vim-tiny, vim-tty
+Conflicts: kvim, kvim-perl, kvim-python, kvim-tcl, vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
+Replaces: kvim, kvim-perl, kvim-python, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
 Description: Vi IMproved, 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,
@@ -96,8 +78,8 @@
 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-full, vim-gnome, vim-gtk, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tiny, vim-tty
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full, vim-gnome, vim-gtk, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tiny, vim-tty
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tiny, vim-tty
+Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tiny, vim-tty
 Description: Vi IMproved, 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,
@@ -113,8 +95,8 @@
 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-full, vim-gnome, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full, vim-gnome, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
+Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
 Description: Vi IMproved - GTK2 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,
@@ -129,8 +111,8 @@
 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-full, vim-gnome, vim-gtk, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full, vim-gnome, vim-gtk, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
+Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
 Description: Vi IMproved - LessTif 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,
@@ -145,8 +127,8 @@
 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-full, vim-gtk, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full, vim-gtk, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
+Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
 Description: Vi IMproved - GNOME2 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,
@@ -161,8 +143,8 @@
 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: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-gnome, vim-gtk, vim-lesstif, vim-perl, vim-python, vim-ruby, vim-tcl, vim-tiny, vim-tty
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
+Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-tiny, vim-tty
 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,
@@ -188,7 +170,8 @@
 Priority: optional
 Architecture: all
 Depends: vim (>> 1:6.3)
-Replaces: vim (<< 1:6.2-270+2)
+Conflicts: vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-full (<< 6.4-001+1)
+Replaces: vim (<< 1:6.2-270+2), vim-gnome (<< 6.4-001+1), vim-gtk (<< 6.4-001+1), vim-lesstif (<< 6.4-001+1), vim-perl (<< 6.4-001+1), vim-python (<< 6.4-001+1), vim-ruby (<< 6.4-001+1), vim-tcl (<< 6.4-001+1), vim-full (<< 6.4-001+1)
 Description: Vi IMproved - Common files
  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,

Copied: trunk/vim/debian/gvim.desktop (from rev 368, branches/alternatives/debian/gvim.desktop)

Modified: trunk/vim/debian/lintian/vim-variant
===================================================================
--- trunk/vim/debian/lintian/vim-variant	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/lintian/vim-variant	2005-10-22 22:45:15 UTC (rev 376)
@@ -1 +1 @@
- at PKG@: binary-without-manpage vim
+ at PKG@: binary-without-manpage vim. at VARIANT@

Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/rules	2005-10-22 22:45:15 UTC (rev 376)
@@ -63,11 +63,6 @@
 BASICFLAGS+=--disable-pythoninterp
 BASICFLAGS+=--disable-rubyinterp
 
-TINYFLAGS+=--without-x
-TINYFLAGS+=--disable-gui
-TINYFLAGS+=--disable-gpm
-TINYFLAGS+=--with-features=tiny
-
 ALLINTERPFLAGS+=--enable-perlinterp
 ALLINTERPFLAGS+=--enable-pythoninterp
 ALLINTERPFLAGS+=--enable-rubyinterp
@@ -83,14 +78,12 @@
   VARIANTS+=vim-python
   VARIANTS+=vim-gnome
   VARIANTS+=vim-full
-  VARIANTS_SKIP+=vim-tiny
 else
   VARIANTS+=vim-basic
   VARIANTS+=vim-ruby
   VARIANTS+=vim-gtk
   VARIANTS+=vim-python
   VARIANTS+=vim-lesstif
-  VARIANTS_SKIP+=vim-tiny
   VARIANTS_SKIP+=vim-perl
   VARIANTS_SKIP+=vim-gnome
   VARIANTS_SKIP+=vim-tcl
@@ -103,9 +96,6 @@
 CFLAGS_vim-basic=$(CFLAGS)
 CFGFLAGS_vim-basic=$(CFGFLAGS) $(OPTFLAGS) --without-x --enable-gui=no
 
-CFLAGS_vim-tiny=$(CFLAGS)
-CFGFLAGS_vim-tiny=$(CFGFLAGS) $(TINYFLAGS)
-
 CFLAGS_vim-perl=$(CFLAGS)
 CFGFLAGS_vim-perl=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(PERLFLAGS) $(GTK2FLAGS)
 
@@ -184,7 +174,7 @@
 	dh_clean
 
 clean-%:
-	for x in preinst postinst postrm menu mime install dirs links ; do \
+	for x in install postinst postrm prerm ; do	\
 	  rm -f debian/$*.$$x ;\
 	done
 	rm -f debian/lintian/$*
@@ -201,6 +191,7 @@
 
 build-stamp-%: DH_OPTIONS=
 build-stamp-%:
+	@echo "DEBIAN: BUILDING VIM VARIANT $*"
 	dh_testdir
 	$(MAKE) -C $(SRCDIR) clean
 	cd $(SRCDIR) && make distclean && CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
@@ -223,19 +214,26 @@
 	dh_installmime
 	touch $@
 
-# the 'tiny' variant includes all the runtime files
+# the 'basic' variant includes all the runtime files
 install-stamp-vim-basic: DH_OPTIONS=-pvim
 install-stamp-vim-basic: DESTDIR=$(PWD)/debian/vim
 install-stamp-vim-basic:
 	dh_testdir
 	dh_testroot
-	dh_installdirs
 	dh_clean -k
-	#mm : idea : don't use the install rule but : installvim installtools install-languages install-icons 
-	# and install-specific stuff for GUIs (install-icons for vim-gtk, installkdeicons for kvim ...)
-	$(MAKE) -C $(SRCDIR)/src KDE_DIR=/usr DESTDIR=$(DESTDIR) install
+	dh_installdirs
+#mm : idea : don't use the install rule but : installvim installtools install-languages install-icons 
+	# and install-specific stuff for GUIs (install-icons for vim-gtk, ...)
+	$(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) install
 # ensure that it is the vim-basic binary that is installed
-	$(INSTALL) -D $(SRCDIR)/src/vim-basic $(DESTDIR)/usr/bin/vim
+	rm -f $(DESTDIR)/usr/bin/vim
+	$(INSTALL) -D $(SRCDIR)/src/vim-basic $(DESTDIR)/usr/bin/vim.basic
+# gui symlinks, will be available for gui-enabled variants
+	ln -fs vim $(DESTDIR)/usr/bin/gvim
+	ln -fs vim $(DESTDIR)/usr/bin/gview
+	ln -fs vim $(DESTDIR)/usr/bin/rgvim
+	ln -fs vim $(DESTDIR)/usr/bin/rgview
+	ln -fs vim $(DESTDIR)/usr/bin/gvimdiff
 # install usr/share/bug/vim/presubj file
 	install -m 644 -D $(CURDIR)/debian/vim.presubj $(DESTDIR)/usr/share/bug/vim/presubj
 # make less.sh executable
@@ -246,26 +244,25 @@
 	rm -f $(DESTDIR)/usr/share/man/man1/[ce]tags.1
 # clean up the configuration files
 	rm $(DESTDIR)/usr/share/vim/$(SRCDIR)/*example.vim
-# remove not compiled-in gui symlinks and config file
-	rm -f $(DESTDIR)/usr/bin/g{view,vim}
-	rm -f $(DESTDIR)/usr/bin/rg{view,vim}
-	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/share/icons/hicolor/16x16/actions/hi16-action-make.png
 	rm -f $(DESTDIR)/usr/share/icons/hicolor/22x22/actions/hi22-action-make.png
 # remove manpages
 	rm -f $(DESTDIR)/usr/share/man/man1/{gview.1,gvim.1,gvimdiff.1,rgview.1,rgvim.1}
 
 	mkdir -p $(DESTDIR)/usr/share/man/man1
-	cp $(CURDIR)/debian/manpage/eview.1 $(DESTDIR)/usr/share/man/man1
-	pod2man -c "User Commands" -s 1 -q none -r "vim 6.2" -d "September 2003" debian/helpztags debian/helpztags.1
+	cp $(CURDIR)/debian/manpage/{eview,gview,gvim,gvimdiff,rgview,rgvim}.1	\
+		$(DESTDIR)/usr/share/man/man1/
+	pod2man -c "User Commands" -s 1 -q none -r "vim 6.4"	\
+		-d "September 2003" debian/helpztags debian/helpztags.1
 	dh_installman debian/helpztags.1
 # disabled, waiting for an update
 #	cp debian/vim-install $(DESTDIR)/usr/bin
 	cp debian/helpztags $(DESTDIR)/usr/bin
 # copying updated syntax files
 	cp debian/updates/*.vim $(DESTDIR)/usr/share/vim/vim64/syntax/
+# desktop entry
+	cp debian/gvim.desktop $(DESTDIR)/usr/share/applications/
+# it's over
 	touch $@
 
 # the other variants only include the binary
@@ -275,27 +272,14 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	for x in preinst postinst postrm menu mime install dirs ; do \
-	  sed -e s/@PKG@/$*/ debian/vim-variant.$$x >debian/$*.$$x ;\
+	for x in install postinst postrm prerm ; do	\
+	  sed -e "s/@PKG@/$*/;s/@VARIANT@/$(patsubst vim-%,%,$*)/"	\
+	  	debian/vim-variant.$$x > debian/$*.$$x ;\
 	done
 	dh_installdirs
-	if [ "$(*)" != "vim-tiny" ] ; then \
-	  for x in links ; do \
-	    sed -e s/@PKG@/$*/ debian/vim-variant.$$x >debian/$*.$$x ;\
-	  done ;\
-	fi
-	cp debian/vim-variant.desktop $(DESTDIR)/usr/share/applications/gvim.desktop
-	sed -e s/@PKG@/$*/ debian/lintian/vim-variant >debian/lintian/$*
-	$(INSTALL) -D $(SRCDIR)/src/$(*) $(DESTDIR)/usr/bin/vim
-# add manpages
-	mkdir -p $(DESTDIR)/usr/share/man/man1/
-	cp debian/manpage/{gview.1,gvim.1,gvimdiff.1,rgview.1,rgvim.1} ${DESTDIR}/usr/share/man/man1/
-# add compiled-in gui symlinks
-	ln -s vim $(DESTDIR)/usr/bin/gvim
-	ln -s vim $(DESTDIR)/usr/bin/gview
-	ln -s vim $(DESTDIR)/usr/bin/rgvim
-	ln -s vim $(DESTDIR)/usr/bin/rgview
-	ln -s vim $(DESTDIR)/usr/bin/gvimdiff
+	sed -e "s/@PKG@/$*/;s/@VARIANT@/$(patsubst vim-%,%,$*)/"	\
+		debian/lintian/vim-variant > debian/lintian/$*
+	$(INSTALL) -D $(SRCDIR)/src/$(*) $(DESTDIR)/usr/bin/vim.$(patsubst vim-%,%,$*)
 	touch $@
 
 uninstall:

Deleted: trunk/vim/debian/vim-variant.conffiles
===================================================================
--- trunk/vim/debian/vim-variant.conffiles	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.conffiles	2005-10-22 22:45:15 UTC (rev 376)
@@ -1 +0,0 @@
-/etc/vim/vimrc

Deleted: trunk/vim/debian/vim-variant.desktop
===================================================================
--- trunk/vim/debian/vim-variant.desktop	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.desktop	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=GVim Text Editor
-Comment=Edit text files
-Comment[af]=Redigeer tekslêers
-Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
-Comment[ar]=حرّر ملفات نصية
-Comment[az]=Mətn fayllarını redaktə edin
-Comment[be]=Рэдагаваньне тэкставых файлаў
-Comment[bg]=Редактиране на текстови файлове
-Comment[bn]=টেক্স্ট ফাইল এডিট করুন
-Comment[bs]=Izmijeni tekstualne datoteke
-Comment[ca]=Edita fitxers de text
-Comment[cs]=Úprava textových souborů
-Comment[cy]=Golygu ffeiliau testun
-Comment[da]=Redigér tekstfiler
-Comment[de]=Textdateien bearbeiten
-Comment[el]=Επεξεργασία αρχείων κειμένου
-Comment[en_CA]=Edit text files
-Comment[en_GB]=Edit text files
-Comment[es]=Edita archivos de texto
-Comment[et]=Redigeeri tekstifaile
-Comment[eu]=Editatu testu-fitxategiak
-Comment[fa]=ویرایش پرونده‌های متنی
-Comment[fi]=Muokkaa tekstitiedostoja
-Comment[fr]=Édite des fichiers texte
-Comment[ga]=Eagar comhad Téacs
-Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો
-Comment[he]=ערוך קבצי טקסט
-Comment[hi]=पाठ फ़ाइलें संपादित करें
-Comment[hr]=Uređivanje tekstualne datoteke
-Comment[hu]=Szövegfájlok szerkesztése
-Comment[id]=Edit file teks
-Comment[it]=Modifica file di testo
-Comment[ja]=テキスト・ファイルを編集します
-Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
-Comment[ko]=텍스트 파일을 편집합니다
-Comment[lt]=Redaguoti tekstines bylas
-Comment[lv]=Rediģēt teksta failus
-Comment[mk]=Уреди текстуални фајлови
-Comment[ml]=വാചക രചനകള് തിരുത്തുക
-Comment[mn]=Текст файл боловсруулах
-Comment[mr]=गद्य फाइल संपादित करा
-Comment[ms]=Edit fail teks
-Comment[nb]=Rediger tekstfiler
-Comment[ne]=पाठ फाइललाई संशोधन गर्नुहोस्
-Comment[nl]=Tekstbestanden bewerken
-Comment[nn]=Rediger tekstfiler
-Comment[no]=Rediger tekstfiler
-Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
-Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
-Comment[pl]=Edytor plików tekstowych
-Comment[pt]=Editar ficheiros de texto
-Comment[pt_BR]=Edite arquivos de texto
-Comment[ro]=Editare fişiere text
-Comment[ru]=Редактор текстовых файлов
-Comment[sk]=Úprava textových súborov
-Comment[sl]=Urejanje datotek z besedili
-Comment[sq]=Përpuno files teksti
-Comment[sr]=Измени текстуалне датотеке
-Comment[sr at Latn]=Izmeni tekstualne datoteke
-Comment[sv]=Redigera textfiler
-Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
-Comment[th]=แก้ไขแฟ้มข้อความ
-Comment[tk]=Metin faýllary editle
-Comment[tr]=Metin dosyalarını düzenle
-Comment[uk]=Редактор текстових файлів
-Comment[vi]=Soạn thảo tập tin văn bản
-Comment[wa]=Asspougnî des fitchîs tecses
-Comment[zh_CN]=编辑文本文件
-Comment[zh_TW]=編輯文字檔
-Exec=gvim -f %U
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/vim.svg
-Categories=Application;Utility;TextEditor;
-StartupNotify=true
-MimeType=text/plain;

Deleted: trunk/vim/debian/vim-variant.dirs
===================================================================
--- trunk/vim/debian/vim-variant.dirs	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.dirs	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,2 +0,0 @@
-usr/share/doc
-usr/share/applications

Modified: trunk/vim/debian/vim-variant.install
===================================================================
--- trunk/vim/debian/vim-variant.install	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.install	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,3 +1 @@
-debian/lintian/@PKG@	usr/share/lintian/overrides
-debian/runtime/gvimrc	etc/vim
-debian/vim*.xpm				usr/share/pixmaps
+debian/lintian/@PKG@			usr/share/lintian/overrides

Deleted: trunk/vim/debian/vim-variant.links
===================================================================
--- trunk/vim/debian/vim-variant.links	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.links	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,2 +0,0 @@
-usr/share/doc/vim	usr/share/doc/@PKG@
-etc/vim/gvimrc		usr/share/vim/gvimrc

Deleted: trunk/vim/debian/vim-variant.menu
===================================================================
--- trunk/vim/debian/vim-variant.menu	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.menu	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,7 +0,0 @@
-?package(@PKG@):needs="x11" section="Apps/Editors" \
-        title="GVIM" longtitle="GVIM, graphical Vi IMproved" \
-        command="/usr/bin/gvim -f" \
-        icon="/usr/share/pixmaps/vim-32.xpm" \
-        icon32x32="/usr/share/pixmaps/vim-32.xpm" \
-        icon16x16="/usr/share/pixmaps/vim-16.xpm"
-

Deleted: trunk/vim/debian/vim-variant.mime
===================================================================
--- trunk/vim/debian/vim-variant.mime	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.mime	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,2 +0,0 @@
-text/plain; gview -f %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""; priority=4
-text/*; gview -f %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != "" ; priority=2

Deleted: trunk/vim/debian/vim-variant.postinst
===================================================================
--- trunk/vim/debian/vim-variant.postinst	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.postinst	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,15 +0,0 @@
-#! /bin/sh -e
-
-pkg=@PKG@
-
-case "$1" in
-  configure)
-    if [ -L /usr/doc/$pkg ] ; then
-      rm /usr/doc/$pkg
-    fi
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

Copied: trunk/vim/debian/vim-variant.postinst (from rev 368, branches/alternatives/debian/vim-variant.postinst)

Modified: trunk/vim/debian/vim-variant.postrm
===================================================================
--- trunk/vim/debian/vim-variant.postrm	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.postrm	2005-10-22 22:45:15 UTC (rev 376)
@@ -2,15 +2,17 @@
 
 pkg=@PKG@
 
-remove_diversion() {
-  dpkg-divert --package $pkg --remove --rename \
+remove_old_diversion() {
+  if [ -f /usr/bin/vim.org ]; then
+    dpkg-divert --package $pkg --remove --rename \
               --divert /usr/bin/vim.org /usr/bin/vim
+  fi
 }
 
 if [ "$1" = "failed-upgrade" ] && $(dpkg --compare-versions $2 lt 6.0) ; then
-  remove_diversion
+  remove_old_diversion
 elif [ "$1" = "remove" ] ; then
-  remove_diversion
+  remove_old_diversion
 fi
 
 #DEBHELPER#

Deleted: trunk/vim/debian/vim-variant.preinst
===================================================================
--- trunk/vim/debian/vim-variant.preinst	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim-variant.preinst	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,25 +0,0 @@
-#! /bin/sh -e
-
-pkg=@PKG@
-
-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
-
-if [ ! -h /usr/share/doc/$pkg ] ; then
-  if [ -d /usr/share/doc/$pkg ] ; then
-    rm -f /usr/share/doc/$pkg/*
-    rmdir /usr/share/doc/$pkg/
-  fi
-fi
-
-#DEBHELPER#
-
-exit 0

Copied: trunk/vim/debian/vim-variant.prerm (from rev 368, branches/alternatives/debian/vim-variant.prerm)

Modified: trunk/vim/debian/vim.dirs
===================================================================
--- trunk/vim/debian/vim.dirs	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim.dirs	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,2 +1,3 @@
-/usr/share/vim/addons/plugin/
-/usr/share/pixmaps/
+usr/share/applications
+/usr/share/pixmaps
+/usr/share/vim/addons/plugin

Modified: trunk/vim/debian/vim.install
===================================================================
--- trunk/vim/debian/vim.install	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim.install	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,5 +1,7 @@
+debian/icons/vim.svg			usr/share/pixmaps
 debian/lintian/vim			usr/share/lintian/overrides
+debian/runtime/gvimrc			etc/vim
 debian/runtime/vimrc			etc/vim
+debian/vim*.xpm				usr/share/pixmaps
 vim64/runtime/doc/*.html		usr/share/doc/vim/html
 vim64/runtime/vimrc_example.vim		usr/share/vim/vim64
-debian/icons/vim.svg			usr/share/pixmaps

Modified: trunk/vim/debian/vim.links
===================================================================
--- trunk/vim/debian/vim.links	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim.links	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,3 +1,4 @@
-usr/share/vim/vim64/doc/version6.txt usr/share/doc/vim/changelog
+etc/vim					usr/share/vim/vimfiles
 etc/vim/vimrc				usr/share/vim/vimrc
-etc/vim					usr/share/vim/vimfiles
+etc/vim/gvimrc				usr/share/vim/gvimrc
+usr/share/vim/vim64/doc/version6.txt	usr/share/doc/vim/changelog

Copied: trunk/vim/debian/vim.menu (from rev 368, branches/alternatives/debian/vim.menu)

Modified: trunk/vim/debian/vim.mime
===================================================================
--- trunk/vim/debian/vim.mime	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim.mime	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,2 +1,4 @@
 text/plain; view %s; edit=vim %s; compose=vim %s; needsterminal; priority=4
+text/plain; gview -f %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""; priority=4
 text/*; view %s; edit=vim %s; compose=vim %s; needsterminal; priority=2
+text/*; gview -f %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != "" ; priority=2

Modified: trunk/vim/debian/vim.postinst
===================================================================
--- trunk/vim/debian/vim.postinst	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim.postinst	2005-10-22 22:45:15 UTC (rev 376)
@@ -1,22 +1,13 @@
 #! /bin/sh -e
 
 case "$1" in
-  abort-upgrade)
-    for i in vi view ex editor ; do
-      update-alternatives \
-        --install /usr/bin/$i $i /usr/bin/vim 120 \
-        --slave /usr/share/man/man1/$i.1.gz $i.1.gz /usr/share/man/man1/vim.1.gz
-    done
-    ;;
   configure)
     for i in vi view ex editor ; do
       update-alternatives \
         --install /usr/bin/$i $i /usr/bin/vim 120 \
         --slave /usr/share/man/man1/$i.1.gz $i.1.gz /usr/share/man/man1/vim.1.gz
     done
-    if [ -L /usr/doc/vim ] ; then
-      rm /usr/doc/vim
-    fi
+    update-alternatives --install /usr/bin/vim vim /usr/bin/vim.basic 10
     ;;
 esac
 

Modified: trunk/vim/debian/vim.prerm
===================================================================
--- trunk/vim/debian/vim.prerm	2005-10-22 18:46:21 UTC (rev 375)
+++ trunk/vim/debian/vim.prerm	2005-10-22 22:45:15 UTC (rev 376)
@@ -5,6 +5,7 @@
     for i in vi view ex editor ; do
       update-alternatives --remove $i /usr/bin/vim
     done
+    update-alternatives --remove vim /usr/bin/vim.basic
     ;;
 esac
 




More information about the pkg-vim-maintainers mailing list