r102 - in trunk/vim/debian: . manpage

Matthijs Mohlmann active2-guest@costa.debian.org
Wed, 23 Mar 2005 00:27:11 +0100


Author: active2-guest
Date: 2005-03-23 00:27:10 +0100 (Wed, 23 Mar 2005)
New Revision: 102

Added:
   trunk/vim/debian/kvim-variant.menu
   trunk/vim/debian/manpage/
   trunk/vim/debian/manpage/eview.1
   trunk/vim/debian/manpage/gview.1
   trunk/vim/debian/manpage/gvim.1
   trunk/vim/debian/manpage/gvimdiff.1
   trunk/vim/debian/manpage/kvim.1
   trunk/vim/debian/manpage/kvimdiff.1
   trunk/vim/debian/manpage/rgview.1
   trunk/vim/debian/manpage/rgvim.1
   trunk/vim/debian/manpage/rkview.1
   trunk/vim/debian/manpage/rkvim.1
Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/rules
Log:
 * Add manpages for several binaries
 * Add a kvim-variant.menu to fix lintian warning pkg-not-in-package-test
 * Modified rules file to reflect these changes


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/changelog	2005-03-22 23:27:10 UTC (rev 102)
@@ -14,8 +14,13 @@
     + Added patch 111_fstab.vim.diff (Fixes highlighting in fstab)
       (closes: #300108)
     + Removed Suggests: vim from vim-doc in debian/control
+    + Fixed binary-without-manpage for several packages.
+    + Fixed pkg-not-in-package-test in kvim-tcl, kvim-ruby, kvim-python and
+      kvim-perl.
+    + Fixed the errors postinst-does-not-call-updatemenus and
+       postrm-does-not-call-updatemenus
 
- -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Tue, 22 Mar 2005 14:07:27 +0100
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Tue, 22 Mar 2005 23:27:00 +0100
 
 vim (1:6.3-067+2) unstable; urgency=medium
 

Added: trunk/vim/debian/kvim-variant.menu
===================================================================
--- trunk/vim/debian/kvim-variant.menu	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/kvim-variant.menu	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1,4 @@
+?package(@PKG@):needs="X11" section="Apps/Editors"\
+	hints="KDE,Editors"\
+	title="KVim" command="kvim"\
+	kderemove="y"

Added: trunk/vim/debian/manpage/eview.1
===================================================================
--- trunk/vim/debian/manpage/eview.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/eview.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/vim.1

Added: trunk/vim/debian/manpage/gview.1
===================================================================
--- trunk/vim/debian/manpage/gview.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/gview.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/rview.1

Added: trunk/vim/debian/manpage/gvim.1
===================================================================
--- trunk/vim/debian/manpage/gvim.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/gvim.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/vim.1

Added: trunk/vim/debian/manpage/gvimdiff.1
===================================================================
--- trunk/vim/debian/manpage/gvimdiff.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/gvimdiff.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/vimdiff.1

Added: trunk/vim/debian/manpage/kvim.1
===================================================================
--- trunk/vim/debian/manpage/kvim.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/kvim.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/vim.1

Added: trunk/vim/debian/manpage/kvimdiff.1
===================================================================
--- trunk/vim/debian/manpage/kvimdiff.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/kvimdiff.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/vimdiff.1

Added: trunk/vim/debian/manpage/rgview.1
===================================================================
--- trunk/vim/debian/manpage/rgview.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/rgview.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/view.1

Added: trunk/vim/debian/manpage/rgvim.1
===================================================================
--- trunk/vim/debian/manpage/rgvim.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/rgvim.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/vim

Added: trunk/vim/debian/manpage/rkview.1
===================================================================
--- trunk/vim/debian/manpage/rkview.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/rkview.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/rview.1

Added: trunk/vim/debian/manpage/rkvim.1
===================================================================
--- trunk/vim/debian/manpage/rkvim.1	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/manpage/rkvim.1	2005-03-22 23:27:10 UTC (rev 102)
@@ -0,0 +1 @@
+.so man1/rvim.1

Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules	2005-03-22 13:07:59 UTC (rev 101)
+++ trunk/vim/debian/rules	2005-03-22 23:27:10 UTC (rev 102)
@@ -248,6 +248,8 @@
 	$(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 $@
@@ -262,11 +264,15 @@
 	  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 -m 644 -D $(CURDIR)/debian/kvim.menu $(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 $@
 
@@ -307,6 +313,8 @@
 	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
 
+	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
 	dh_installman debian/helpztags.1
 # disabled, waiting for an update
@@ -334,6 +342,9 @@
 	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