r451 - trunk/vim/debian
Stefano Zacchiroli
zack at costa.debian.org
Mon Dec 26 10:35:39 UTC 2005
Author: zack
Date: 2005-12-26 10:35:38 +0000 (Mon, 26 Dec 2005)
New Revision: 451
Removed:
trunk/vim/debian/vim.install
trunk/vim/debian/vim.postrm
trunk/vim/debian/vim.prerm
Modified:
trunk/vim/debian/changelog
trunk/vim/debian/rules
trunk/vim/debian/vim-common.install
Log:
- next attempt at fixing FTBFS on s390
- better cleanup of files generated by vim-basic variant
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-12-26 10:29:12 UTC (rev 450)
+++ trunk/vim/debian/changelog 2005-12-26 10:35:38 UTC (rev 451)
@@ -5,6 +5,12 @@
* Added sarge-backports and sarge-volatile to debchangelog hilighting.
* Removed build-dependencies added for woody backport a while ago.
+ [ Matthijs Mohlmann and Stefano Zacchiroli ]
+ * debian/rules: moved "export DH_OPTIONS" back to the beginning of the
+ file since old versions of make can't cope with it on
+ target-specific variables. Fixes FTBFS on some archs.
+ (closes: #344658)
+
-- Norbert Tretkowski <nobse at debian.org> Mon, 26 Dec 2005 11:28:38 +0100
vim (1:6.4-006+1) unstable; urgency=low
Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules 2005-12-26 10:29:12 UTC (rev 450)
+++ trunk/vim/debian/rules 2005-12-26 10:35:38 UTC (rev 451)
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
export SHELL=/bin/bash
+export DH_OPTIONS
DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
@@ -206,9 +207,14 @@
rm -rf $(SRCDIR)
dh_clean
+clean-vim-basic:
+ for x in $(PER_VARIANT_FILES) ; do \
+ rm -f debian/vim.$$x ; \
+ done
+
clean-%:
for x in $(PER_VARIANT_FILES) ; do \
- rm -f debian/$*.$$x ;\
+ rm -f debian/$*.$$x ; \
done
rm -f debian/vim.links
rm -f debian/lintian/$*
@@ -246,7 +252,7 @@
dh_testroot
touch $@
-install-stamp-vim-basic: export DH_OPTIONS=-pvim-runtime -pvim-common -pvim-gui-common -pvim -pvim-doc
+install-stamp-vim-basic: DH_OPTIONS=-pvim-runtime -pvim-common -pvim-gui-common -pvim -pvim-doc
install-stamp-vim-basic: DESTDIR=$(CURDIR)/debian/tmp
install-stamp-vim-basic: build-stamp-vim-basic
dh_testdir
@@ -305,7 +311,7 @@
touch $@
# the other variants only include the binary
-install-stamp-%: export DH_OPTIONS=-p$*
+install-stamp-%: DH_OPTIONS=-p$*
install-stamp-%: DESTDIR=$(CURDIR)/debian/$*
install-stamp-%: build-stamp-%
dh_testdir
@@ -336,7 +342,7 @@
rm -f install-stamp*
dh_clean
-binary-indep: export DH_OPTIONS=-i
+binary-indep: DH_OPTIONS=-i
binary-indep: build install
dh_testdir
dh_testroot
@@ -351,7 +357,7 @@
binary-arch: build install
binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v))
-binary-arch-vim-basic: export DH_OPTIONS=-pvim-common -pvim-gui-common -pvim
+binary-arch-vim-basic: DH_OPTIONS=-pvim-common -pvim-gui-common -pvim
binary-arch-vim-basic:
dh_testdir
dh_testroot
@@ -365,7 +371,7 @@
dh_md5sums
dh_builddeb
-binary-arch-%: export DH_OPTIONS=-p$* $(foreach v,$(VARIANTS_SKIP),-N$(v))
+binary-arch-%: DH_OPTIONS=-p$* $(foreach v,$(VARIANTS_SKIP),-N$(v))
binary-arch-%: build install
dh_testdir
dh_testroot
Modified: trunk/vim/debian/vim-common.install
===================================================================
--- trunk/vim/debian/vim-common.install 2005-12-26 10:29:12 UTC (rev 450)
+++ trunk/vim/debian/vim-common.install 2005-12-26 10:35:38 UTC (rev 451)
@@ -1,7 +1,7 @@
-debian/tmp/usr/bin/rview usr/bin/
-debian/tmp/usr/bin/rvim usr/bin/
-debian/tmp/usr/bin/vimdiff usr/bin/
-debian/tmp/usr/bin/xxd usr/bin/
+debian/tmp/usr/bin/rview usr/bin/
+debian/tmp/usr/bin/rvim usr/bin/
+debian/tmp/usr/bin/vimdiff usr/bin/
+debian/tmp/usr/bin/xxd usr/bin/
debian/helpztags usr/bin/
debian/runtime/vimrc etc/vim/
debian/tmp/usr/share/man/man1/* usr/share/man/man1/
Deleted: trunk/vim/debian/vim.install
===================================================================
--- trunk/vim/debian/vim.install 2005-12-26 10:29:12 UTC (rev 450)
+++ trunk/vim/debian/vim.install 2005-12-26 10:35:38 UTC (rev 451)
@@ -1,2 +0,0 @@
-debian/lintian/vim usr/share/lintian/overrides/
-debian/tmp/usr/bin/vim.basic usr/bin/
Deleted: trunk/vim/debian/vim.postrm
===================================================================
--- trunk/vim/debian/vim.postrm 2005-12-26 10:29:12 UTC (rev 450)
+++ trunk/vim/debian/vim.postrm 2005-12-26 10:35:38 UTC (rev 451)
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-pkg=vim
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/vim/debian/vim.prerm
===================================================================
--- trunk/vim/debian/vim.prerm 2005-12-26 10:29:12 UTC (rev 450)
+++ trunk/vim/debian/vim.prerm 2005-12-26 10:35:38 UTC (rev 451)
@@ -1,31 +0,0 @@
-#! /bin/sh -e
-
-pkg=vim
-variant=basic
-
-# two things to do:
-# 1) remove /usr/bin/vim.variant as alternative for /usr/bin/vim
-# 2) remove /usr/bin/gvim as an alternative for gnome-text-editor for
-# variants built with gnome support
-
-remove_gnome_alternative() {
- if [ -f /usr/bin/gvim ]; then
- update-alternatives --remove gnome-text-editor /usr/bin/vim.$variant
- fi
-}
-
-case "$1" in
- remove)
- case "$pkg" in
- vim-gnome|vim-full) # gnome enabled variants
- remove_gnome_alternative
- ;;
- esac
- remove_gnome_alternative
- update-alternatives --remove vim /usr/bin/vim.$variant
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
More information about the pkg-vim-maintainers
mailing list