Author: jamessan
Date: 2006-02-08 20:10:14 +0000 (Wed, 08 Feb 2006)
New Revision: 492
Modified:
trunk/vim/debian/changelog
trunk/vim/debian/control
trunk/vim/debian/rules
trunk/vim/debian/vim-gui-common.links
trunk/vim/debian/vim-variant.links
Log:
Added a Depends line for vim-common.
Changed /usr/share/doc/vim-gui-common to be a symlink to
/usr/share/doc/vim-common.
Changed the GUI variants to depend on vim-gui-common instead of vim-common.
Specify a mode when installing the console font in vim-runtime.
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2006-02-08 11:58:36 UTC (rev 491)
+++ trunk/vim/debian/changelog 2006-02-08 20:10:14 UTC (rev 492)
@@ -1,5 +1,8 @@
-vim (1:6.4-006+3) UNRELEASED; urgency=low
+vim (1:6.4-007+1) UNRELEASED; urgency=low
+ [ Debian VIM Maintainers ]
+ * New upstream patch (007), see README.gz for details.
+
[ Stefano Zacchiroli ]
* Handle /usr/bin/gvim with alternatives, so that it can be configured
to a vim executable with gui support when /usr/bin/vim is configured
@@ -14,12 +17,11 @@
* enhances syntax/rst.vim. (Closes: #323044)
[ James Vega ]
- * Stop modifying alternatives when the files aren't around to be
- alternatives. Move update-alternatives handling out of vim-common.
- (closes: #348233)
+ * Move alternatives handling out of vim-common so that we aren't modifying
+ alternatives when the targets don't yet exist. (closes: #348233)
* Add 'armeb' to debcontrol syntax file. (closes: #350513)
- * Remove all binaries except xxd from vim-common. Handle the rest with
- alternatives in the variant packages.
+ * debian/rules: Remove all binaries except xxd from vim-common. Handle the
+ rest with alternatives in the variant packages.
* debian/control: Changed vim-gui-common to Arch: all
* Added patch 156_scripts.vim.diff which adds detection of svk diffs as diff
filetype. (closes: #349764)
@@ -27,8 +29,15 @@
slrnrc syntax file. (closes: #347801)
* Added commented out example autocmd for last-position-jump to
/etc/vim/vimrc. (closes: #347597)
+ * Lintian cleanup:
+ + debian/control: Added a Depends line for vim-common.
+ + debian/rules: Use proper permissions when installing the console font in
+ vim-runtime
+ + debian/rules: Create a symlink to /usr/share/doc/vim-gui-common for each
+ GUI variant package. This fixes a usr-doc-symlink-without-dependency
+ warning.
- -- James Vega <jamessan@xxxxxxxxxx> Sun, 5 Feb 2006 11:27:51 -0500
+ -- James Vega <jamessan@xxxxxxxxxx> Wed, 8 Feb 2006 15:07:28 -0500
vim (1:6.4-006+2) unstable; urgency=low
Modified: trunk/vim/debian/control
===================================================================
--- trunk/vim/debian/control 2006-02-08 11:58:36 UTC (rev 491)
+++ trunk/vim/debian/control 2006-02-08 20:10:14 UTC (rev 492)
@@ -10,6 +10,7 @@
Package: vim-common
Priority: optional
Architecture: any
+Depends: ${shlibs:Depends}
Conflicts: vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<<
1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3),
vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<<
1:6.4-001+3), vim-full (<< 1:6.4-001+3)
Replaces: vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<<
1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3),
vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<<
1:6.4-001+3), vim-full (<< 1:6.4-001+3)
Recommends: vim | vim-tiny
Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules 2006-02-08 11:58:36 UTC (rev 491)
+++ trunk/vim/debian/rules 2006-02-08 20:10:14 UTC (rev 492)
@@ -282,7 +282,7 @@
mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
ln -fs $(VIMCUR) $(DESTDIR)/usr/share/vim/vimcurrent # vimcur symlink
# console fonts
- install -D $(VIMCUR)/farsi/fonts/UNIXs/far-a01.pcf.gz \
+ install -m0644 -D $(VIMCUR)/farsi/fonts/UNIXs/far-a01.pcf.gz \
$(DESTDIR)/usr/share/consolefonts/far-a01.pcf.gz
# rm stuff handled by alternatives
rm -f $(DESTDIR)/usr/bin/{ex,view,rvim,rview,vimdiff}
@@ -298,7 +298,9 @@
# variant-related installations for package "vim"
# to be kept in sync with those in "install-stamp-%" target
for x in $(PER_VARIANT_FILES) ; do \
- sed -e
"s:@PKG@:vim:;s:@VARIANT@:basic:;s:@DESTDIR@:debian/tmp/usr/bin:" \
+ sed -e "s:@PKG@:vim:;s:@VARIANT@:basic:" \
+ -e "s:@DESTDIR@:debian/tmp/usr/bin:" \
+ -e "s:@COMMON@:vim-common:" \
debian/vim-variant.$$x > debian/vim.$$x ;\
done
sed -e
"s:@PKG@:vim:;s:@VARIANT@:basic:;s:@DESTDIR@:debian/tmp/usr/bin:" \
@@ -331,11 +333,19 @@
# variant-related installations
# to be kept in sync with those in "install-stamp-vim-basic" target
for x in $(PER_VARIANT_FILES) ; do \
- sed -e "s:@PKG@:$*:;s:@VARIANT@:$(patsubst
vim-%,%,$*):;s:@DESTDIR@:$(VIMCUR)/src:" \
- debian/vim-variant.$$x > debian/$*.$$x ;\
+ if [ "$*" = "vim-tiny" ]; then \
+ sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \
+ -e "s:@DESTDIR@:$(VIMCUR)/src:" -e "s:@COMMON@:vim-common:" \
+ debian/vim-variant.$$x > debian/$*.$$x ;\
+ else \
+ sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \
+ -e "s:@DESTDIR@:$(VIMCUR)/src:" -e "s:@COMMON@:vim-gui-common:"
\
+ debian/vim-variant.$$x > debian/$*.$$x ;\
+ fi \
done
- sed -e "s:@PKG@:$*:;s:@VARIANT@:$(patsubst
vim-%,%,$*):;s:@DESTDIR@:$(VIMCUR)/src:" \
- debian/lintian/vim-variant > debian/lintian/$*
+ sed -e "s:@PKG@:$*:;s:@VARIANT@:$(patsubst vim-%,%,$*):" \
+ -e "s:@DESTDIR@:$(VIMCUR)/src:" \
+ debian/lintian/vim-variant > debian/lintian/$*
# fake help installation for vim-tiny
if [ "$*" = "vim-tiny" ]; then \
echo "debian/tiny/doc/ usr/share/vim/" >> debian/$*.install; \
@@ -366,7 +376,7 @@
binary-arch: build install
binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v))
-binary-arch-vim-basic: export DH_OPTIONS=-pvim-common -pvim-gui-common -pvim
+binary-arch-vim-basic: export DH_OPTIONS=-pvim-common -pvim
binary-arch-vim-basic:
dh_testdir
dh_testroot
Modified: trunk/vim/debian/vim-gui-common.links
===================================================================
--- trunk/vim/debian/vim-gui-common.links 2006-02-08 11:58:36 UTC (rev
491)
+++ trunk/vim/debian/vim-gui-common.links 2006-02-08 20:10:14 UTC (rev
492)
@@ -1 +1,2 @@
etc/vim/gvimrc usr/share/vim/gvimrc
+usr/share/doc/vim-common usr/share/doc/vim-gui-common
Modified: trunk/vim/debian/vim-variant.links
===================================================================
--- trunk/vim/debian/vim-variant.links 2006-02-08 11:58:36 UTC (rev 491)
+++ trunk/vim/debian/vim-variant.links 2006-02-08 20:10:14 UTC (rev 492)
@@ -1 +1 @@
-usr/share/doc/vim-common usr/share/doc/@PKG@
+usr/share/doc/@COMMON@ usr/share/doc/@PKG@
|
