[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-110-g8bcd84f

[James Vega]

The following commit has been merged in the debian branch:
commit 8bcd84f790c9591528b2a13ccad8a3f0acdef9fa
Author: James Vega <jamessan at debian.org>
Date:   Thu May 8 17:43:12 2008 -0400

    Revert "Add SELinux support  (Closes: #474102)"
    
    There's no need to run autoconf or backup the configure file now that SELinux
    is supported upstream and therefore upstream's configure file has the proper
    tests.
    
    This reverts commit ab444f0a7225d4172d011d0c21d582fd6abfdac3.
    
    Conflicts:
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/control b/debian/control
index 761783d..c7853ba 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.3.0
 Build-Depends: debhelper, bzip2, libperl-dev, tcl-dev, libacl1-dev,
  libgpmg1-dev [!hurd-i386] | not+linux-gnu, python-dev, libxpm-dev,
  libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev, lynx,
- libgnomeui-dev, lesstif2-dev, make (>= 3.80+3.81.b4), autoconf,
+ libgnomeui-dev, lesstif2-dev, make (>= 3.80+3.81.b4),
  libselinux1-dev [!hurd-i386] | not+linux-gnu
 Build-Depends-Indep: docbook-xml, docbook-utils
 Vcs-Git: git://git.debian.org/git/pkg-vim/vim.git
diff --git a/debian/rules b/debian/rules
index da5d1c3..3dabc29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,7 +175,6 @@ clean: $(foreach v,$(VARIANTS),clean-$(v))
 	rm -f debian/helpztags.1
 	rm -rf debian/policy/vim-policy.html
 	rm -f debian/policy/vim-policy.txt
-	if test -f src/auto/configure.dist; then mv src/auto/configure{.dist,}; fi
 	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
@@ -216,14 +215,7 @@ build-stamp-arch: $(foreach v,$(VARIANTS),build-stamp-$(v))
 	dh_testdir
 	touch $@
 
-autoconf-stamp:
-	if ! test -f src/auto/configure.dist; then \
-	  cp -a src/auto/configure src/auto/configure.dist; \
-	fi
-	$(MAKE) -C src autoconf
-	touch $@
-
-configure-stamp-%: autoconf-stamp
+configure-stamp-%:
 	dh_testdir
 	@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
 	if test -f src/auto/config.cache; then make distclean; fi

-- 
Vim packaging