[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-73-g952ee7a

James Vega jamessan at debian.org
Tue Apr 8 06:46:18 UTC 2008


The following commit has been merged in the debian branch:
commit ab444f0a7225d4172d011d0c21d582fd6abfdac3
Author: James Vega <jamessan at debian.org>
Date:   Tue Apr 8 02:22:27 2008 -0400

    Add SELinux support  (Closes: #474102)
    
    Patch provided by Vaclav Ovsik so the Debian packaging sanely builds with
    SELinux support.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 6187053..fde8905 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ vim (1:7.1.291-1) UNRELEASED; urgency=low
     - Change doc-base section to Editors.
     - Remove Encoding key from desktop entry.
   * New upstream patches (286 - 291), see README.gz for details.
+  * Add SELinux support  (Closes: #474102)
+    - Vim patch taken from Fedora's Vim packaging
+    - Thanks to Vaclav Ovsik for the patch to the Debian packaging.
+  * debian/control:
+    - Add libselinux1-dev and autoconf Build-Depends.
+  * debian/rules:
+    - Rule & dependency added for rebuilding src/auto/configure.
 
  -- James Vega <jamessan at debian.org>  Tue, 08 Apr 2008 02:02:12 -0400
 
diff --git a/debian/control b/debian/control
index 0b6393a..a04fcf9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ 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), docbook-xml,
- docbook-utils
+ docbook-utils, libselinux1-dev, autoconf
 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 c982014..3ea4597 100755
--- a/debian/rules
+++ b/debian/rules
@@ -173,6 +173,7 @@ 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
@@ -203,7 +204,14 @@ build-stamp: $(foreach v,$(VARIANTS),build-stamp-$(v))
 	$(MAKE) -C debian/policy/ text html
 	touch $@
 
-configure-stamp-%:
+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
 	dh_testdir
 	@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
 	if test -f src/auto/config.cache; then make distclean; fi

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list