[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-113-g038d581
James Vega
jamessan at debian.org
Wed May 14 04:42:36 UTC 2008
The following commit has been merged in the debian branch:
commit 038d581f47d614aef1b742e224ef494a6e262a7b
Author: James Vega <jamessan at debian.org>
Date: Wed May 14 00:19:24 2008 -0400
Fix building in parallel with shadow directories.
- Shadow directories are actually src/$(SHADOWDIR), not $(SHADOWDIR)/src.
- sed replacements of @VARIANT@ need to replace all occurrences, not just the
first.
- dh_clean -k should be called at the start of the variant's build target, not
the install target.
- Upstream's Makefile doesn't create the necessary symlink to build the .mo
files when using shadow directories, so we need to set it up.
Signed-off-by: James Vega <jamessan at debian.org>
diff --git a/debian/rules b/debian/rules
index fe41dc0..1b9bc83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,6 +178,7 @@ clean: $(foreach v,$(VARIANTS),clean-$(v))
if test -f src/auto/config.cache; then make distclean; fi
rm -f runtime/doc/doctags runtime/doc/tags.ref
rm -f runtime/doc/*.html runtime/doc/*.log
+ rm -f src/pixmaps src/runtime
dh_clean
clean-vim-basic:
@@ -188,8 +189,9 @@ clean-vim-basic:
vim-runtime.install; do \
rm -f debian/$$x; \
done
+ [ ! -L src/vim-basic/po ] || $(MAKE) -C src/vim-basic/po clean
rm -f $(DOT_IN_DEPS)
- rm -rf vim-basic
+ rm -rf src/vim-basic
clean-%: SHADOWDIR=$*
clean-%:
@@ -200,13 +202,15 @@ clean-%:
if [ "$*" = "vim-tiny" ]; then \
rm -f $(DOT_IN_DEPS_TINY); \
fi
- rm -rf $(SHADOWDIR)
+ rm -rf src/$(SHADOWDIR)
build: build-stamp-arch
build-indep: build-stamp-indep
+build-stamp-indep: export DH_OPTIONS=-pvim-doc -pvim-python -pvim-perl -pvim-ruby -pvim-tcl -pvim-full
build-stamp-indep:
dh_testdir
+ dh_clean -k
$(MAKE) -C runtime/doc html
$(MAKE) -C debian/policy text html
touch $@
@@ -221,17 +225,21 @@ configure-stamp-%:
dh_testdir
@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
$(MAKE) -C src shadow SHADOWDIR=$(SHADOWDIR)
+ if [ "$*" = "vim-basic" ]; then \
+ cd src/vim-basic && ln -sf ../po; \
+ fi
if test -f src/auto/config.cache; then make distclean; fi
- cd $(SHADOWDIR) && LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
+ cd src/$(SHADOWDIR) && LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
touch $@
build-stamp-%: CURCFLAGS=$(CFLAGS_$*)
build-stamp-%: SHADOWDIR=$*
build-stamp-%: configure-stamp-%
dh_testdir
+ dh_clean -p$* -k
@echo "*** DEBIAN *** BUILDING VARIANT $*"
- $(MAKE) -C $(SHADOWDIR) CFLAGS="$(CURCFLAGS)"
- mv $(SHADOWDIR)/src/vim $(SHADOWDIR)/src/$(subst -,.,$*)
+ $(MAKE) -C src/$(SHADOWDIR) CFLAGS="$(CURCFLAGS)"
+ mv src/$(SHADOWDIR)/vim src/$(SHADOWDIR)/$(subst -,.,$*)
touch $@
install: install-stamp
@@ -241,9 +249,8 @@ install-stamp-indep: export DH_OPTIONS=-pvim-doc -pvim-python -pvim-perl -pvim-r
install-stamp-indep: build-stamp-indep
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs
- dh_install --fail-missing
+ dh_install
dh_link
dh_installchangelogs
dh_installdocs
@@ -255,25 +262,25 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
dh_testdir
dh_testroot
@echo "*** DEBIAN *** INSTALLING VARIANT vim-basic"
- dh_clean -k
dh_installdirs
# UPSTREAM INSTALLATION
- $(MAKE) -C vim-basic/src DESTDIR=$(DESTDIR) installvimbin \
+ $(MAKE) -C src/vim-basic DESTDIR=$(DESTDIR) installvimbin \
installtutorbin \
installruntime \
installtools \
install-icons \
install-languages
+
if [ $(MAKETEST) = "yes" ]; then \
- $(MAKE) -C vim-basic/src test; \
+ $(MAKE) -C src/vim-basic test; \
fi
# installvimbin installs the vim binary under debian/tmp but we install
# it into the vim package from src/. Need to rm it from debian/tmp so
# that dh_install doesn't fail
rm -f debian/tmp/usr/bin/vim
- cp vim-basic/src/vim vim-basic/src/vim.basic
+ cp src/vim-basic/vim src/vim-basic/vim.basic
# DEBIAN INSTALLATION
@@ -296,7 +303,7 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
# 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:" \
+ sed -e "s:@PKG@:vim:;s:@VARIANT@:basic:g" \
-e "s:@COMMON@:vim-common:" \
debian/vim-variant.$$x > debian/vim.$$x ;\
done
@@ -379,13 +386,12 @@ install-stamp-vim-tiny: build-stamp-vim-tiny $(DOT_IN_DEPS_TINY)
dh_testdir
dh_testroot
@echo "*** DEBIAN *** INSTALLING VARIANT vim-tiny"
- dh_clean -k
dh_installdirs
# 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@:vim-tiny:" -e "s:@VARIANT@:tiny:" \
+ sed -e "s:@PKG@:vim-tiny:" -e "s:@VARIANT@:tiny:g" \
-e "s:@COMMON@:vim-common:" \
debian/vim-variant.$$x > debian/vim-tiny.$$x ;\
done
@@ -417,18 +423,17 @@ install-stamp-%: build-stamp-%
dh_testdir
dh_testroot
@echo "*** DEBIAN *** INSTALLING VARIANT $*"
- dh_clean -k
dh_installdirs
# variant-related installations
# to be kept in sync with those in "install-stamp-vim-basic" target
for x in $(PER_VARIANT_FILES) ; do \
if [ "$*" = "vim-nox" ]; then \
- sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \
+ sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):g" \
-e "s:@COMMON@:vim-common:" \
debian/vim-variant.$$x > debian/$*.$$x ;\
else \
- sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \
+ sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):g" \
-e "s:@COMMON@:vim-gui-common:" \
debian/vim-variant.$$x > debian/$*.$$x ;\
fi \
@@ -465,24 +470,19 @@ binary-indep: install-stamp-vim-basic install-stamp-indep
dh_builddeb -pvim-runtime -- -Zbzip2
dh_builddeb -Nvim-runtime
-binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v)) binary-arch-vim-dbg
-
-binary-arch-vim-basic: export DH_OPTIONS=-pvim-common -pvim
-binary-arch-vim-basic: install-stamp-vim-basic
+binary-arch: export DH_OPTIONS=-pvim-dbg
+binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v))
dh_testdir
dh_testroot
- dh_desktop
- dh_strip --dbg-package=vim-dbg
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-binary-arch-%: export DH_OPTIONS=-p$* $(foreach v,$(VARIANTS_SKIP),-N$(v))
-binary-arch-%: install-stamp-%
+binary-arch-vim-basic: export DH_OPTIONS=-pvim-common -pvim
+binary-arch-vim-basic: install-stamp-vim-basic
dh_testdir
dh_testroot
dh_desktop
@@ -495,13 +495,16 @@ binary-arch-%: install-stamp-%
dh_md5sums
dh_builddeb
-binary-arch-vim-dbg: export DH_OPTIONS=-pvim-dbg
-binary-arch-vim-dbg:
+binary-arch-%: export DH_OPTIONS=-p$* $(foreach v,$(VARIANTS_SKIP),-N$(v))
+binary-arch-%: install-stamp-%
dh_testdir
dh_testroot
+ dh_desktop
+ dh_strip --dbg-package=vim-dbg
dh_compress
dh_fixperms
dh_installdeb
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git a/debian/vim-variant.install b/debian/vim-variant.install
index 28a1e98..06558e0 100644
--- a/debian/vim-variant.install
+++ b/debian/vim-variant.install
@@ -1,3 +1,3 @@
debian/lintian/@PKG@ usr/share/lintian/overrides/
debian/presubj usr/share/bug/@PKG@/
-vim- at VARIANT@/src/vim. at VARIANT@ usr/bin/
+src/vim- at VARIANT@/vim. at VARIANT@ usr/bin/
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list