[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-95-gb8bc1b0

[James Vega]

The following commit has been merged in the debian branch:
commit b8bc1b0948b736f16f2e3fe3c2a6d853120c319b
Author: James Vega <jamessan at debian.org>
Date:   Sun May 4 03:35:36 2008 -0400

    Separate build-arch and build-indep targets.
    
    Instead of using the architecture specific jade Build-Depends, I've created
    separate build-arch and build-indep targets.  This will prevent Vim's policy
    documents from being uselessly rebuilt on the buildds.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/control b/debian/control
index 48af0cc..81e765e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: vim
 Section: editors
 Priority: optional
-Maintainer: Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
+Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
 Uploaders: Pierre Habouzit <madcoder at debian.org>, Stefano Zacchiroli <zack at debian.org>, James Vega <jamessan at debian.org>
 Standards-Version: 3.7.3.0
 Build-Depends: debhelper, bzip2, libperl-dev, tcl-dev, libacl1-dev,
@@ -9,8 +9,6 @@ Build-Depends: debhelper, bzip2, libperl-dev, tcl-dev, libacl1-dev,
  libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev, lynx,
  libgnomeui-dev, lesstif2-dev, make (>= 3.80+3.81.b4), docbook-xml,
  docbook-utils, libselinux1-dev [!hurd-i386] | not+linux-gnu, autoconf,
-# Use jade for the docbook2* on arm since openjade is segfaulting
- jade [arm]
 Vcs-Git: git://git.debian.org/git/pkg-vim/vim.git
 Vcs-Browser: http://git.debian.org/?p=pkg-vim/vim.git
 Homepage: http://www.vim.org/
diff --git a/debian/rules b/debian/rules
index 3e47720..126e056 100755
--- a/debian/rules
+++ b/debian/rules
@@ -201,11 +201,18 @@ clean-%:
 	  rm -f $(DOT_IN_DEPS_TINY); \
 	fi
 
-build: build-stamp
-build-stamp: $(foreach v,$(VARIANTS),build-stamp-$(v))
+build:
+
+build-indep: build-stamp-indep
+build-stamp-indep:
+	dh_testdir
+	$(MAKE) -C runtime/doc html
+	$(MAKE) -C debian/policy text html
+	touch $@
+
+build-arch: build-stamp-arch
+build-stamp-arch: $(foreach v,$(VARIANTS),build-stamp-$(v))
 	dh_testdir
-	$(MAKE) -C runtime/doc html # gen html docs (destroys tags)
-	$(MAKE) -C debian/policy/ text html
 	touch $@
 
 autoconf-stamp:
@@ -230,7 +237,6 @@ build-stamp-%: configure-stamp-%
 	mv src/vim src/$(subst -,.,$*)
 	touch $@
 
-install: build
 install: install-stamp
 install-stamp: $(foreach v,$(VARIANTS),install-stamp-$(v))
 	dh_testdir
@@ -444,7 +450,7 @@ install-stamp-%: build-stamp-%
 	cat $< | sed 's/@VIMCUR@/$(VIMCUR)/' > $@
 
 binary-indep: export DH_OPTIONS=-i
-binary-indep: build install
+binary-indep: build-stamp-indep build-stamp-arch install
 	dh_testdir
 	dh_testroot
 	dh_compress
@@ -456,11 +462,11 @@ binary-indep: build install
 	dh_builddeb -pvim-runtime -- -Zbzip2
 	dh_builddeb -Nvim-runtime
 
-binary-arch: build install
+binary-arch: build-stamp-arch install
 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:
+binary-arch-vim-basic: install-stamp-vim-basic
 	dh_testdir
 	dh_testroot
 	dh_desktop
@@ -474,7 +480,7 @@ binary-arch-vim-basic:
 	dh_builddeb
 
 binary-arch-%: export DH_OPTIONS=-p$* $(foreach v,$(VARIANTS_SKIP),-N$(v))
-binary-arch-%: build install
+binary-arch-%: install-stamp-%
 	dh_testdir
 	dh_testroot
 	dh_desktop

-- 
Vim packaging