r431 - trunk/vim/debian
Stefano Zacchiroli
zack at costa.debian.org
Wed Dec 14 15:02:51 UTC 2005
Author: zack
Date: 2005-12-14 15:02:50 +0000 (Wed, 14 Dec 2005)
New Revision: 431
Added:
trunk/vim/debian/vim-common.preinst
trunk/vim/debian/vim-doc.preinst
Modified:
trunk/vim/debian/changelog
trunk/vim/debian/rules
Log:
- added removal of old /usr/share/doc symlinks on preinst
- proper use of target specific variables (we need "export" on each of them!) in debian/rules,
hopefully the file is clearer now ...
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-12-13 23:34:27 UTC (rev 430)
+++ trunk/vim/debian/changelog 2005-12-14 15:02:50 UTC (rev 431)
@@ -1,4 +1,4 @@
-vim (1:6.4-004+2) unstable; urgency=low
+vim (1:6.4-004+2) UNRELEASED; urgency=low
[ Norbert Tretkowski ]
* Applied patch from Adeodato Simó to fix broken syntax hilighting
@@ -6,6 +6,10 @@
[ Stefano Zacchiroli ]
* Fixed typo in vim-gui-common description. (closes: #343152)
+ * Remove old /usr/share/doc/vim-common symlink during vim-doc and
+ vim-common preinst phase. (closes: #343289)
+ * debian/rules: finally found the karma of target-specific variables,
+ hopefully the file is clearer now ...
-- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org> Tue, 13 Dec 2005 07:25:29 +0100
Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules 2005-12-13 23:34:27 UTC (rev 430)
+++ trunk/vim/debian/rules 2005-12-14 15:02:50 UTC (rev 431)
@@ -246,13 +246,13 @@
dh_testroot
touch $@
-install-stamp-vim-basic: DH_OPTIONS=-pvim-runtime -pvim-common -pvim-gui-common -pvim -pvim-doc
+install-stamp-vim-basic: export 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)
+ dh_clean -k
+ dh_installdirs
# UPSTREAM INSTALLATION
@@ -290,28 +290,28 @@
sed -e "s:@PKG@:vim:;s:@VARIANT@:basic:;s:@DESTDIR@:debian/tmp/usr/bin:" \
debian/lintian/vim-variant > debian/lintian/vim
- dh_installman $(DH_OPTIONS)
- dh_install $(DH_OPTIONS) --fail-missing
+ dh_installman
+ dh_install --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_link
# 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)
+ dh_installchangelogs -Nvim
+ dh_installdocs
+ dh_installmenu
+ dh_installmime
touch $@
# the other variants only include the binary
-install-stamp-%: DH_OPTIONS=-p$*
+install-stamp-%: export DH_OPTIONS=-p$*
install-stamp-%: DESTDIR=$(CURDIR)/debian/$*
install-stamp-%: build-stamp-%
dh_testdir
dh_testroot
- dh_clean -k $(DH_OPTIONS)
- dh_installdirs $(DH_OPTIONS)
+ dh_clean -k
+ dh_installdirs
# variant-related installations
# to be kept in sync with those in "install-stamp-vim-basic" target
@@ -325,8 +325,8 @@
if [ "$*" = "vim-tiny" ]; then \
echo "debian/tiny/doc/ usr/share/vim/" >> debian/$*.install; \
fi
- dh_install -X.svn $(DH_OPTIONS)
- dh_link $(DH_OPTIONS)
+ dh_install -X.svn
+ dh_link
touch $@
@@ -336,49 +336,48 @@
rm -f install-stamp*
dh_clean
-binary-indep: DH_OPTIONS=-i
+binary-indep: export DH_OPTIONS=-i
binary-indep: build install
dh_testdir
dh_testroot
- dh_compress $(DH_OPTIONS)
- dh_fixperms $(DH_OPTIONS)
- dh_installdeb $(DH_OPTIONS)
- dh_shlibdeps $(DH_OPTIONS)
- dh_gencontrol $(DH_OPTIONS)
- dh_md5sums $(DH_OPTIONS)
- dh_builddeb $(DH_OPTIONS)
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary-arch: build install
binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v))
-binary-arch-vim-basic: DH_OPTIONS=-pvim-common -pvim-gui-common -pvim
+binary-arch-vim-basic: export DH_OPTIONS=-pvim-common -pvim-gui-common -pvim
binary-arch-vim-basic:
dh_testdir
dh_testroot
- dh_desktop $(DH_OPTIONS)
- dh_strip $(DH_OPTIONS)
- dh_compress $(DH_OPTIONS)
- dh_fixperms $(DH_OPTIONS)
- dh_installdeb $(DH_OPTIONS)
- dh_shlibdeps $(DH_OPTIONS)
- dh_gencontrol $(DH_OPTIONS)
- dh_md5sums $(DH_OPTIONS)
- dh_builddeb $(DH_OPTIONS)
+ dh_desktop
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
-binary-arch-%: DH_OPTIONS=-p$* $(foreach v,$(VARIANTS_SKIP),-N$(v))
+binary-arch-%: export DH_OPTIONS=-p$* $(foreach v,$(VARIANTS_SKIP),-N$(v))
binary-arch-%: build install
dh_testdir
dh_testroot
- dh_desktop $(DH_OPTIONS)
- dh_strip $(DH_OPTIONS)
- dh_compress $(DH_OPTIONS)
- dh_fixperms $(DH_OPTIONS)
- dh_installdeb $(DH_OPTIONS)
- dh_shlibdeps $(DH_OPTIONS)
- dh_gencontrol $(DH_OPTIONS)
- dh_md5sums $(DH_OPTIONS)
- dh_builddeb $(DH_OPTIONS)
+ dh_desktop
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
.PHONY: extract clean build install uninstall binary-indep binary-arch binary
-
Added: trunk/vim/debian/vim-common.preinst
===================================================================
--- trunk/vim/debian/vim-common.preinst 2005-12-13 23:34:27 UTC (rev 430)
+++ trunk/vim/debian/vim-common.preinst 2005-12-14 15:02:50 UTC (rev 431)
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+remove_symlink () {
+ test -L $1 && rm $1
+}
+
+case "$1" in
+ upgrade)
+ remove_symlink /usr/share/doc/vim-common
+ ;;
+esac
+
+#DEBHELPER#
+
Added: trunk/vim/debian/vim-doc.preinst
===================================================================
--- trunk/vim/debian/vim-doc.preinst 2005-12-13 23:34:27 UTC (rev 430)
+++ trunk/vim/debian/vim-doc.preinst 2005-12-14 15:02:50 UTC (rev 431)
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+remove_symlink () {
+ test -L $1 && rm $1
+}
+
+case "$1" in
+ upgrade)
+ remove_symlink /usr/share/doc/vim-common
+ ;;
+esac
+
+#DEBHELPER#
+
More information about the pkg-vim-maintainers
mailing list