[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-98-g35419f0

James Vega jamessan at debian.org
Sun May 4 15:07:34 UTC 2008


The following commit has been merged in the debian branch:
commit fd642dedc902f45224fd751ec34bba023afcbef0
Author: James Vega <jamessan at debian.org>
Date:   Sun May 4 11:01:23 2008 -0400

    Fix archonly only builds.
    
    install-stamp-vim-basic was trying to install the files for vim-doc, which
    isn't built when doing a archonly build.  Separated that out to its own
    install-stamp-indep target.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index 126e056..673b9f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -245,7 +245,19 @@ install-stamp: $(foreach v,$(VARIANTS),install-stamp-$(v))
 	dh_installdocs -pvim-python -pvim-perl -pvim-ruby -pvim-tcl -pvim-full
 	touch $@
 
-install-stamp-vim-basic: export DH_OPTIONS=-pvim-runtime -pvim-common -pvim-gui-common -pvim -pvim-doc
+install-stamp-indep: export DH_OPTIONS=-pvim-doc
+install-stamp-indep: build-stamp-indep
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_install --fail-missing
+	dh_link
+	dh_installchangelogs
+	dh_installdocs
+	touch $@
+
+install-stamp-vim-basic: export DH_OPTIONS=-pvim-runtime -pvim-common -pvim-gui-common -pvim
 install-stamp-vim-basic: DESTDIR=$(CURDIR)/debian/tmp
 install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
 	dh_testdir
@@ -450,7 +462,7 @@ install-stamp-%: build-stamp-%
 	cat $< | sed 's/@VIMCUR@/$(VIMCUR)/' > $@
 
 binary-indep: export DH_OPTIONS=-i
-binary-indep: build-stamp-indep build-stamp-arch install
+binary-indep: build-stamp-indep build-stamp-arch install install-stamp-indep
 	dh_testdir
 	dh_testroot
 	dh_compress

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list