r1233 - in /trunk/packages/vim/debian: changelog control rules

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Sat Mar 15 15:54:57 UTC 2008 

Author: jamessan
Date: Sat Mar 15 15:54:57 2008
New Revision: 1233

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1233
Log:
Cleanup debian/rules and allow vim-gnome to be built on hurd.
- Drop use of DEB_HOST_GNU_SYSTEM checks for determining which variants
  are built since Gnome looks to be useable on the non-linux-gnu buildds.
- Add a DEB_HOST_GNU_SYSTEM check for enabling gpm.
- Add a restrction on DEB_HOST_GNU_TYPE == DEB_BUILD_GNU_TYPE to run
  'make test'.
- Remove useless use of cat when applying upstream patches.
- Remove dead code.
- Remove a duplicate file in DOT_IN_DEPS
- Automate specifying the Vim version in helpztags.1
- Use non-recursive variables for the various CFLAGS and CFGFLAGS.
- Add .NOTPARALLEL target.

Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/control
    trunk/packages/vim/debian/rules

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1233&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Mar 15 15:54:57 2008
@@ -14,6 +14,15 @@
   * debian/rules:
     - Remove the special-case targets for vim-tiny and add -DTINY_VIMRC to the
       CFLAGS used when building vim-tiny.
+    - Cleanup dead/useless code from the makefile.
+    - Restrict 'make test' from running unless build and host types are the
+      same.
+    - Allow vim-gnome to build on non-linux-gnu systems.
+    - Only enable gpm on linux-gnu systems.
+    - Automatically specify the Vim version when generating helpztags.1.
+    - Add .NOTPARALLEL target.
+  * debian/control:
+    - Remove the [!hurd-i386] qualifier from libgnomeui-dev Build-Depend.
 
  -- James Vega <jamessan at debian.org>  Wed, 27 Feb 2008 12:34:27 -0500
 

Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=1233&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Sat Mar 15 15:54:57 2008
@@ -7,8 +7,8 @@
 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, quilt, lynx,
- libgnomeui-dev [!hurd-i386], lesstif2-dev, make (>= 3.80+3.81.b4),
- docbook-xml, docbook-utils
+ libgnomeui-dev, lesstif2-dev, make (>= 3.80+3.81.b4), docbook-xml,
+ docbook-utils
 Vcs-Svn: svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/
 Homepage: http://www.vim.org/

Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=1233&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Sat Mar 15 15:54:57 2008
@@ -3,7 +3,9 @@
 export SHELL=/bin/bash
 export DH_OPTIONS
 
-DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 BUILDER := $(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2> /dev/null))}})
 
@@ -15,10 +17,11 @@
   CFLAGS+=-O2
 endif
 
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-  MAKETEST = yes
-else
-  MAKETEST = no
+MAKETEST := no
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+  ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+    MAKETEST := yes
+  endif
 endif
 
 INSTALL+=install
@@ -27,9 +30,7 @@
 endif
 
 CFLAGS+=$(if $(findstring nodebug,$(DEB_BUILD_OPTIONS)),,-g -Wall)
-CFGFLAGS+=--prefix=/usr
-CFGFLAGS+=--mandir='$${prefix}'/share/man
-CFGFLAGS+=--with-compiledby="$(BUILDER)"
+CFGFLAGS:=--prefix=/usr --mandir='$${prefix}'/share/man --with-compiledby="$(BUILDER)"
 
 # "vim-tiny" features: in addition to those coming from the --with-features=xxx,
 # "vim-tiny" is built with those listed in debian/tiny/features.txt
@@ -43,7 +44,11 @@
 TINYFLAGS+=--enable-nls
 TINYFLAGS+=--enable-multibyte
 
-OPTFLAGS+=--enable-gpm
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+    OPTFLAGS+=--enable-gpm
+else
+    OPTFLAGS+=--disable-gpm
+endif
 OPTFLAGS+=--enable-cscope
 OPTFLAGS+=--with-features=huge
 OPTFLAGS+=--enable-multibyte
@@ -80,43 +85,34 @@
 # "vim-common", "vim-gui-common". "vim-tiny" is the only variant package not
 # depending on vim-runtime.
 
-# vim-basic must be the last one
-ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
-	VARIANTS+=vim-tiny
-	VARIANTS+=vim-gtk
-	VARIANTS+=vim-gnome
-	VARIANTS+=vim-lesstif
-	VARIANTS+=vim-nox
-	VARIANTS+=vim-basic
-else
-	VARIANTS+=vim-tiny
-	VARIANTS+=vim-gtk
-	VARIANTS_SKIP+=vim-gnome
-	VARIANTS+=vim-lesstif
-	VARIANTS+=vim-nox
-	VARIANTS+=vim-basic
-endif
+VARIANTS+=vim-tiny
+VARIANTS+=vim-gtk
+VARIANTS+=vim-gnome
+VARIANTS+=vim-lesstif
+VARIANTS+=vim-nox
+VARIANTS+=vim-basic
+
 ifeq ($(origin VARIANT), command line)
 	VARIANTS = $(VARIANT) vim-basic
 endif
 
-CFLAGS_vim-basic=$(CFLAGS)
-CFGFLAGS_vim-basic=$(CFGFLAGS) $(OPTFLAGS) $(NOXFLAGS) $(NOINTERPFLAGS)
-
-CFLAGS_vim-tiny=$(CFLAGS) -DTINY_VIMRC
-CFGFLAGS_vim-tiny=$(CFGFLAGS) $(TINYFLAGS)
-
-CFLAGS_vim-gtk=$(CFLAGS)
-CFGFLAGS_vim-gtk=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTKFLAGS) $(ALLINTERPFLAGS)
-
-CFLAGS_vim-gnome=$(CFLAGS)
-CFGFLAGS_vim-gnome=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
-
-CFLAGS_vim-lesstif=$(CFLAGS)
-CFGFLAGS_vim-lesstif=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(LESSTIFFLAGS) $(ALLINTERPFLAGS)
-
-CFLAGS_vim-nox=$(CFLAGS)
-CFGFLAGS_vim-nox=$(CFGFLAGS) $(OPTFLAGS) $(NOXFLAGS) $(ALLINTERPFLAGS)
+CFLAGS_vim-basic:=$(CFLAGS)
+CFGFLAGS_vim-basic:=$(CFGFLAGS) $(OPTFLAGS) $(NOXFLAGS) $(NOINTERPFLAGS)
+
+CFLAGS_vim-tiny:=$(CFLAGS) -DTINY_VIMRC
+CFGFLAGS_vim-tiny:=$(CFGFLAGS) $(TINYFLAGS)
+
+CFLAGS_vim-gtk:=$(CFLAGS)
+CFGFLAGS_vim-gtk:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTKFLAGS) $(ALLINTERPFLAGS)
+
+CFLAGS_vim-gnome:=$(CFLAGS)
+CFGFLAGS_vim-gnome:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
+
+CFLAGS_vim-lesstif:=$(CFLAGS)
+CFGFLAGS_vim-lesstif:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(LESSTIFFLAGS) $(ALLINTERPFLAGS)
+
+CFLAGS_vim-nox:=$(CFLAGS)
+CFGFLAGS_vim-nox:=$(CFGFLAGS) $(OPTFLAGS) $(NOXFLAGS) $(ALLINTERPFLAGS)
 
 NAME:=vim
 VERSION:=7.1
@@ -135,7 +131,6 @@
 LANGS += ru
 
 DOT_IN_DEPS := debian/vim-runtime.install
-DOT_IN_DEPS += debian/vim-runtime.install
 DOT_IN_DEPS += debian/vim-common.install
 DOT_IN_DEPS += debian/vim-gui-common.install
 DOT_IN_DEPS += debian/vim-common.links
@@ -177,7 +172,7 @@
 	fi
 	@for f in `find upstream/patches -type f -name '$(VERSION).*' -printf "%P\n" | grep -v .svn | sort -n` ; do\
 	  echo "applying upstream patch: $$f" ;\
-	  cat upstream/patches/$$f | patch -s -d$(SRCDIR) -p0 ;\
+	  patch -s -d$(SRCDIR) -p0 < upstream/patches/$$f;\
 	done
 	@echo "replacing upstream po files with our own"
 	cp $(wildcard runtime/lang/po/*) vim/src/po
@@ -231,9 +226,6 @@
 build-stamp: $(foreach v,$(VARIANTS),build-stamp-$(v))
 	$(MAKE) -C $(SRCDIR)/runtime/doc html # gen html docs (destroys tags)
 	$(MAKE) -C debian/policy/ text html
-# (re)generate the tags file
-#	$(SRCDIR)/src/vim-common -u /dev/null \
-#	  -c "helptags $(SRCDIR)/runtime/doc" -c quit
 	touch $@
 
 configure-stamp-%:
@@ -301,17 +293,17 @@
 	@for f in `find $(DESTDIR)/usr/share/man -name view.1 -o -name ex.1`; do \
 	  rm -f $$f; \
 	done
-	 # helpztags manpage
-	pod2man -c "User Commands" -s 1 -q none -r "vim 7.0aa"	\
+	# helpztags manpage
+	pod2man -c "User Commands" -s 1 -q none -r "vim $(VERSION)$(SNAPSHOT)"	\
 		-d "September 2003" debian/helpztags debian/helpztags.1
 	
-	 # variant-related installations for package "vim"
-	 # to be kept in sync with those in "install-stamp-%" target
+	# 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:" \
 	      -e "s:@DESTDIR@:debian/tmp/usr/bin:" \
 	      -e "s:@COMMON@:vim-common:" \
-	  	debian/vim-variant.$$x > debian/vim.$$x ;\
+	      debian/vim-variant.$$x > debian/vim.$$x ;\
 	done
 	for L in $(LANGS); do \
 	  sed -e "s:\(.*\)@LANG_ALTS@:\1--slave \$$mandir/$$L/man1/\$$i.1.gz \$$i.$$L.1.gz \$$mandir/$$L/man1/vim.1.gz \\\\\n&:" \
@@ -429,12 +421,6 @@
 	
 	touch $@
 
-uninstall:
-	dh_testdir
-	dh_testroot
-	rm -f install-stamp*
-	dh_clean
-
 %: %.in
 	cat $< | sed 's/@VIMCUR@/$(SRCDIR)/' > $@
 
@@ -494,7 +480,7 @@
 	dh_builddeb
 
 binary: beginlog binary-indep binary-arch endlog
-.PHONY: patch unpatch extract clean build install uninstall binary-indep binary-arch binary get-orig-source
+.PHONY: patch unpatch extract clean build install binary-indep binary-arch binary get-orig-source
 
 .PHONY: beginlog endlog
 beginlog:
@@ -504,4 +490,5 @@
 endlog:
 	@echo "*** DEBIAN *** BUILD COMPLETED"
 
+.NOTPARALLEL:
 # vim: set foldmethod=marker:

More information about the pkg-vim-maintainers mailing list