r1166 - in /trunk/packages/vim/debian: changelog lintian/vim-gnome.in lintian/vim-gtk.in lintian/vim-lesstif.in rules vim-gnome.menu vim-gtk.menu vim-gui-common.menu vim-lesstif.menu

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Wed Jan 23 19:09:23 UTC 2008


Author: jamessan
Date: Wed Jan 23 19:09:23 2008
New Revision: 1166

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1166
Log:
* Remove vim-gui-common.menu and provide one menu file for each gvim
  package.  (Closes: #461805)

Added:
    trunk/packages/vim/debian/lintian/vim-gnome.in
    trunk/packages/vim/debian/lintian/vim-gtk.in
    trunk/packages/vim/debian/lintian/vim-lesstif.in
    trunk/packages/vim/debian/vim-gnome.menu
    trunk/packages/vim/debian/vim-gtk.menu
    trunk/packages/vim/debian/vim-lesstif.menu
Removed:
    trunk/packages/vim/debian/vim-gui-common.menu
Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/rules

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1166&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Jan 23 19:09:23 2008
@@ -1,8 +1,9 @@
 vim (1:7.1-231+2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
- -- James Vega <jamessan at debian.org>  Thu, 17 Jan 2008 22:45:03 -0500
+  * Remove vim-gui-common.menu and provide one menu file for each gvim
+    package.  (Closes: #461805)
+
+ -- James Vega <jamessan at debian.org>  Wed, 23 Jan 2008 12:19:26 -0500
 
 vim (1:7.1-231+1) unstable; urgency=low
 

Added: trunk/packages/vim/debian/lintian/vim-gnome.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/lintian/vim-gnome.in?rev=1166&op=file
==============================================================================
--- trunk/packages/vim/debian/lintian/vim-gnome.in (added)
+++ trunk/packages/vim/debian/lintian/vim-gnome.in Wed Jan 23 19:09:23 2008
@@ -1,0 +1,2 @@
+vim-gnome binary: menu-icon-missing /usr/share/pixmaps/vim-32.xpm
+vim-gnome binary: menu-icon-missing /usr/share/pixmaps/vim-16.xpm

Added: trunk/packages/vim/debian/lintian/vim-gtk.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/lintian/vim-gtk.in?rev=1166&op=file
==============================================================================
--- trunk/packages/vim/debian/lintian/vim-gtk.in (added)
+++ trunk/packages/vim/debian/lintian/vim-gtk.in Wed Jan 23 19:09:23 2008
@@ -1,0 +1,2 @@
+vim-gtk binary: menu-icon-missing /usr/share/pixmaps/vim-32.xpm
+vim-gtk binary: menu-icon-missing /usr/share/pixmaps/vim-16.xpm

Added: trunk/packages/vim/debian/lintian/vim-lesstif.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/lintian/vim-lesstif.in?rev=1166&op=file
==============================================================================
--- trunk/packages/vim/debian/lintian/vim-lesstif.in (added)
+++ trunk/packages/vim/debian/lintian/vim-lesstif.in Wed Jan 23 19:09:23 2008
@@ -1,0 +1,2 @@
+vim-lesstif binary: menu-icon-missing /usr/share/pixmaps/vim-32.xpm
+vim-lesstif binary: menu-icon-missing /usr/share/pixmaps/vim-16.xpm

Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=1166&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Wed Jan 23 19:09:23 2008
@@ -387,7 +387,6 @@
 	 # all excepts vim
 	dh_installchangelogs -Nvim -pvim-dbg
 	dh_installdocs -pvim-dbg
-	dh_installmenu
 	dh_installmime
 	
 	touch $@
@@ -417,6 +416,10 @@
 	done
 	sed -e "s:@PKG@:$*:;s:@VARIANT@:$(patsubst vim-%,%,$*):" \
 	    debian/lintian/vim-variant > debian/lintian/$*
+	# Handle the gvim menu file overrides
+	if [ -e "debian/lintian/$*.in" ]; then \
+	    cat debian/lintian/$*.in >> debian/lintian/$*; \
+	fi
 	for L in $(LANGS); do \
 	  sed -e "s:\(.*\)@LANG_ALTS@:\1--slave \$$mandir/$$L/man1/\$$i.1.gz \$$i.$$L.1.gz \$$mandir/$$L/man1/vim.1.gz \\\\\n&:" \
 	      -i debian/$*.postinst; \
@@ -427,6 +430,7 @@
 		echo "debian/tiny/doc/	usr/share/vim/$(VIMCUR)" >> debian/$*.install; \
 	fi
 	dh_install -X.svn
+	dh_installmenu
 	dh_link
 	
 	touch $@

Added: trunk/packages/vim/debian/vim-gnome.menu
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-gnome.menu?rev=1166&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-gnome.menu (added)
+++ trunk/packages/vim/debian/vim-gnome.menu Wed Jan 23 19:09:23 2008
@@ -1,0 +1,8 @@
+?package(vim-gnome):needs="x11"		\
+	section="Applications/Editors" 			\
+	title="GVIM"					\
+	longtitle="GVIM, graphical Vi IMproved (Gnome GUI)" \
+	command="/usr/bin/vim.gnome -g -f"		\
+	icon="/usr/share/pixmaps/vim-32.xpm"		\
+	icon32x32="/usr/share/pixmaps/vim-32.xpm"	\
+	icon16x16="/usr/share/pixmaps/vim-16.xpm"

Added: trunk/packages/vim/debian/vim-gtk.menu
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-gtk.menu?rev=1166&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-gtk.menu (added)
+++ trunk/packages/vim/debian/vim-gtk.menu Wed Jan 23 19:09:23 2008
@@ -1,0 +1,8 @@
+?package(vim-gtk):needs="x11"		\
+	section="Applications/Editors" 			\
+	title="GVIM"					\
+	longtitle="GVIM, graphical Vi IMproved (GTK GUI)" \
+	command="/usr/bin/vim.gtk -g -f"		\
+	icon="/usr/share/pixmaps/vim-32.xpm"		\
+	icon32x32="/usr/share/pixmaps/vim-32.xpm"	\
+	icon16x16="/usr/share/pixmaps/vim-16.xpm"

Added: trunk/packages/vim/debian/vim-lesstif.menu
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-lesstif.menu?rev=1166&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-lesstif.menu (added)
+++ trunk/packages/vim/debian/vim-lesstif.menu Wed Jan 23 19:09:23 2008
@@ -1,0 +1,8 @@
+?package(vim-lesstif):needs="x11"		\
+	section="Applications/Editors" 			\
+	title="GVIM"					\
+	longtitle="GVIM, graphical Vi IMproved (lesstif GUI)" \
+	command="/usr/bin/vim.lesstif -g -f"		\
+	icon="/usr/share/pixmaps/vim-32.xpm"		\
+	icon32x32="/usr/share/pixmaps/vim-32.xpm"	\
+	icon16x16="/usr/share/pixmaps/vim-16.xpm"




More information about the pkg-vim-maintainers mailing list