r410 - trunk/vim/debian
Stefano Zacchiroli
zack at costa.debian.org
Fri Nov 18 21:36:39 UTC 2005
Author: zack
Date: 2005-11-18 21:36:38 +0000 (Fri, 18 Nov 2005)
New Revision: 410
Added:
trunk/vim/debian/vim-gui-common.dirs
trunk/vim/debian/vim-gui-common.install
trunk/vim/debian/vim-gui-common.links
trunk/vim/debian/vim-gui-common.manpages
trunk/vim/debian/vim-gui-common.menu
trunk/vim/debian/vim-gui-common.mime
Removed:
trunk/vim/debian/vim-common.menu
Modified:
trunk/vim/debian/changelog
trunk/vim/debian/control
trunk/vim/debian/rules
trunk/vim/debian/vim-common.dirs
trunk/vim/debian/vim-common.install
trunk/vim/debian/vim-common.links
trunk/vim/debian/vim-common.manpages
trunk/vim/debian/vim-common.mime
Log:
moved GUI related stuff to a separate "vim-gui-common" package
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/changelog 2005-11-18 21:36:38 UTC (rev 410)
@@ -2,10 +2,13 @@
[ Stefano Zacchiroli ]
* Added back vim-tiny package. (closes: #222138)
- * Reshaped vim packaging: vim-common now contains arch-dependent common
- files, vim-runtime the vim runtime (arch-independent), vim the standard
- variant, vim-* the other variants. vim-tiny is a special variant which
- does not depend on vim-runtime.
+ * Reshaped vim packaging as follows:
+ - vim-common -> arch-dependent common files (variants w/o GUI)
+ - vim-gui-common -> arch-dependent common files (variants w GUI)
+ - vim-runtime -> vim runtime (arch-independent)
+ - vim -> default variant
+ - vim-* -> other variants
+ - vim-tiny -> tiny variant, no vim-runtime dependency
* Added symlink /usr/share/vim/vimcurrent -> vim64, will be kept
proper in future releases. /etc/vim/vimrc no longer version-aware.
* Removed duplicate /usr/share/vim/vimfiles entry in vimrc.
Modified: trunk/vim/debian/control
===================================================================
--- trunk/vim/debian/control 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/control 2005-11-18 21:36:38 UTC (rev 410)
@@ -12,7 +12,7 @@
Architecture: any
Conflicts: vim (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-full (<< 6.4-001+3)
Replaces: vim (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-full (<< 6.4-001+3)
-Recommends: vim | vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full | vim-tiny
+Recommends: vim | vim-tiny
Description: Vi IMproved - Common files
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -20,11 +20,30 @@
highlighting, command line history, on-line help, filename
completion, block operations, folding, Unicode support, etc.
.
- This package contains files shared by all vim variants
- (vim-tiny, vim-perl, vim-gnome, ...) available in Debian.
+ This package contains files shared by all non GUI-enabled vim
+ variants (vim and vim-tiny currently) available in Debian.
Examples of such shared files are: manpages, common executables
- like vimtutor and xxd, configuration files, and icons.
+ like vimtutor and xxd, and configuration files.
+Package: vim-gui-common
+Priority: optional
+Architecture: any
+Depends: vim-common (= ${Source-Version})
+Conflicts: vim (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-full (<< 6.4-001+3)
+Replaces: vim (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-full (<< 6.4-001+3)
+Recommends: vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full
+Description: Vi IMproved - Common GUI 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, on-line help, filename
+ completion, block operations, folding, Unicode support, etc.
+ .
+ This package contains files shared by all GUI-enabled vim
+ variants (vim-tiny, vim-perl, vim-gnome, ...) available in
+ Debian. Examples of such shared files are: icons, desktop
+ environments settings, and icons.
+
Package: vim-runtime
Priority: optional
Architecture: all
@@ -99,7 +118,7 @@
Package: vim-perl
Priority: extra
Architecture: any
-Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${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 (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
@@ -117,7 +136,7 @@
Package: vim-python
Priority: extra
Architecture: any
-Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${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 (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
@@ -135,7 +154,7 @@
Package: vim-ruby
Priority: extra
Architecture: any
-Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
Provides: gvim
Conflicts: kvim, kvim-perl, kvim-python, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
@@ -153,7 +172,7 @@
Package: vim-tcl
Priority: extra
Architecture: any
-Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${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 (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
@@ -171,7 +190,7 @@
Package: vim-gtk
Priority: extra
Architecture: any
-Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${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 (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
@@ -189,7 +208,7 @@
Package: vim-lesstif
Priority: extra
Architecture: any
-Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${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 (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
@@ -207,7 +226,7 @@
Package: vim-gnome
Priority: extra
Architecture: any
-Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${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 (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
@@ -225,7 +244,7 @@
Package: vim-full
Priority: extra
Architecture: any
-Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${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 (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/rules 2005-11-18 21:36:38 UTC (rev 410)
@@ -84,9 +84,9 @@
# Each vim-xxx package is said to be a vim variant and contains only a vim
# binary built with some compile-time options. Makefile VARIANTS below are
# one-to-one with those packages with the exception of "vim-basic". In this
-# Makefile vim-basic is used to built 3 packages: "vim" (the actual variant),
-# "vim-runtime" (arch-indep common files), "vim-common" (arch-dep common
-# files). "vim-tiny" is the only variant package not depending on vim-runtime.
+# Makefile vim-basic is used to built 4 packages: "vim", "vim-runtime",
+# "vim-common", "vim-gui-common". "vim-tiny" is the only variant package not
+# depending on vim-runtime.
# vim-basic must be the last one
ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
@@ -246,17 +246,20 @@
dh_testroot
touch $@
-install-stamp-vim-basic: DH_OPTIONS=-pvim-runtime -pvim-common -pvim -pvim-doc
-install-stamp-vim-basic: DESTDIR=$(PWD)/debian/tmp
+install-stamp-vim-basic: DH_OPTIONS=-pvim-runtime -pvim-common -pvim-gui-common -pvim -pvim-doc
+install-stamp-vim-basic: DESTDIR=$(CURDIR)/debian/tmp
install-stamp-vim-basic: build-stamp-vim-basic
dh_testdir
dh_testroot
dh_clean -k $(DH_OPTIONS)
dh_installdirs $(DH_OPTIONS)
- # upstream installation
+ # UPSTREAM INSTALLATION
+
$(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) install
- # debian installation
+
+ # DEBIAN INSTALLATION
+
# disabled, waiting for an update
#cp debian/vim-install $(DESTDIR)/usr/bin
mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
@@ -289,9 +292,12 @@
dh_installman $(DH_OPTIONS)
dh_install $(DH_OPTIONS) --fail-missing
+ # evim is GUI related, move its manpage to vim-gui-common
+ mv debian/{vim-common,vim-gui-common}/usr/share/man/man1/evim.1
dh_link $(DH_OPTIONS)
- dh_installchangelogs -pvim-runtime -pvim-common -pvim-doc
+ # all excepts vim
+ dh_installchangelogs -pvim-runtime -pvim-common -pvim-gui-common -pvim-doc
dh_installdocs $(DH_OPTIONS)
dh_installmenu $(DH_OPTIONS)
dh_installmime $(DH_OPTIONS)
@@ -300,7 +306,7 @@
# the other variants only include the binary
install-stamp-%: DH_OPTIONS=-p$*
-install-stamp-%: DESTDIR=$(PWD)/debian/$*
+install-stamp-%: DESTDIR=$(CURDIR)/debian/$*
install-stamp-%: build-stamp-%
dh_testdir
dh_testroot
@@ -345,7 +351,7 @@
binary-arch: build install
binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v))
-binary-arch-vim-basic: DH_OPTIONS=-pvim-common -pvim
+binary-arch-vim-basic: DH_OPTIONS=-pvim-common -pvim-gui-common -pvim
binary-arch-vim-basic:
dh_testdir
dh_testroot
Modified: trunk/vim/debian/vim-common.dirs
===================================================================
--- trunk/vim/debian/vim-common.dirs 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-common.dirs 2005-11-18 21:36:38 UTC (rev 410)
@@ -1,6 +1,4 @@
/etc/
/usr/bin/
-/usr/share/applications/
/usr/share/bug/
-/usr/share/pixmaps/
/usr/share/vim/addons/plugin/
Modified: trunk/vim/debian/vim-common.install
===================================================================
--- trunk/vim/debian/vim-common.install 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-common.install 2005-11-18 21:36:38 UTC (rev 410)
@@ -1,20 +1,10 @@
-debian/tmp/usr/bin/eview usr/bin/
-debian/tmp/usr/bin/evim usr/bin/
-debian/tmp/usr/bin/gview usr/bin/
-debian/tmp/usr/bin/gvimdiff usr/bin/
-debian/tmp/usr/bin/gvim usr/bin/
-debian/tmp/usr/bin/rgview usr/bin/
-debian/tmp/usr/bin/rgvim usr/bin/
debian/tmp/usr/bin/rview usr/bin/
debian/tmp/usr/bin/rvim usr/bin/
debian/tmp/usr/bin/vimdiff usr/bin/
debian/tmp/usr/bin/vimtutor usr/bin/
debian/tmp/usr/bin/xxd usr/bin/
-debian/gvim.desktop usr/share/applications/
debian/helpztags usr/bin/
-debian/icons/* usr/share/pixmaps/
-debian/runtime/gvimrc etc/vim/
debian/runtime/vimrc etc/vim/
debian/tmp/usr/share/man/man1/* usr/share/man/man1/
debian/vim.presubj usr/share/bug/vim/
Modified: trunk/vim/debian/vim-common.links
===================================================================
--- trunk/vim/debian/vim-common.links 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-common.links 2005-11-18 21:36:38 UTC (rev 410)
@@ -1,3 +1,2 @@
etc/vim usr/share/vim/vimfiles
etc/vim/vimrc usr/share/vim/vimrc
-etc/vim/gvimrc usr/share/vim/gvimrc
Modified: trunk/vim/debian/vim-common.manpages
===================================================================
--- trunk/vim/debian/vim-common.manpages 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-common.manpages 2005-11-18 21:36:38 UTC (rev 410)
@@ -1,2 +1 @@
-debian/manpage/*
debian/helpztags.1
Deleted: trunk/vim/debian/vim-common.menu
===================================================================
--- trunk/vim/debian/vim-common.menu 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-common.menu 2005-11-18 21:36:38 UTC (rev 410)
@@ -1,8 +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"
Modified: trunk/vim/debian/vim-common.mime
===================================================================
--- trunk/vim/debian/vim-common.mime 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-common.mime 2005-11-18 21:36:38 UTC (rev 410)
@@ -1,4 +1,2 @@
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
Added: trunk/vim/debian/vim-gui-common.dirs
===================================================================
--- trunk/vim/debian/vim-gui-common.dirs 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-gui-common.dirs 2005-11-18 21:36:38 UTC (rev 410)
@@ -0,0 +1,4 @@
+/etc/
+/usr/bin/
+/usr/share/applications/
+/usr/share/pixmaps/
Added: trunk/vim/debian/vim-gui-common.install
===================================================================
--- trunk/vim/debian/vim-gui-common.install 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-gui-common.install 2005-11-18 21:36:38 UTC (rev 410)
@@ -0,0 +1,11 @@
+debian/tmp/usr/bin/eview usr/bin/
+debian/tmp/usr/bin/evim usr/bin/
+debian/tmp/usr/bin/gview usr/bin/
+debian/tmp/usr/bin/gvimdiff usr/bin/
+debian/tmp/usr/bin/gvim usr/bin/
+debian/tmp/usr/bin/rgview usr/bin/
+debian/tmp/usr/bin/rgvim usr/bin/
+
+debian/gvim.desktop usr/share/applications/
+debian/icons/* usr/share/pixmaps/
+debian/runtime/gvimrc etc/vim/
Added: trunk/vim/debian/vim-gui-common.links
===================================================================
--- trunk/vim/debian/vim-gui-common.links 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-gui-common.links 2005-11-18 21:36:38 UTC (rev 410)
@@ -0,0 +1 @@
+etc/vim/gvimrc usr/share/vim/gvimrc
Added: trunk/vim/debian/vim-gui-common.manpages
===================================================================
--- trunk/vim/debian/vim-gui-common.manpages 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-gui-common.manpages 2005-11-18 21:36:38 UTC (rev 410)
@@ -0,0 +1 @@
+debian/manpage/*
Copied: trunk/vim/debian/vim-gui-common.menu (from rev 409, trunk/vim/debian/vim-common.menu)
Added: trunk/vim/debian/vim-gui-common.mime
===================================================================
--- trunk/vim/debian/vim-gui-common.mime 2005-11-18 15:52:18 UTC (rev 409)
+++ trunk/vim/debian/vim-gui-common.mime 2005-11-18 21:36:38 UTC (rev 410)
@@ -0,0 +1,2 @@
+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
More information about the pkg-vim-maintainers
mailing list