r456 - in trunk/vim: . debian
Stefano Zacchiroli
zack at costa.debian.org
Sun Jan 8 10:54:22 UTC 2006
Author: zack
Date: 2006-01-08 10:54:21 +0000 (Sun, 08 Jan 2006)
New Revision: 456
Added:
trunk/vim/patches/
Removed:
trunk/vim/debian/patches/
Modified:
trunk/vim/debian/changelog
trunk/vim/debian/control
trunk/vim/debian/rules
Log:
merged in trunk the quilt branch
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-12-26 13:29:23 UTC (rev 455)
+++ trunk/vim/debian/changelog 2006-01-08 10:54:21 UTC (rev 456)
@@ -13,8 +13,10 @@
[ Stefano Zacchiroli ]
* debian/rules: added 'export' target to generate source package
+ * debian/rules: uses quilt to manage debian-specific patches, changed
+ build-deps accordingly
- -- Norbert Tretkowski <nobse at debian.org> Mon, 26 Dec 2005 11:28:38 +0100
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org> Sun, 8 Jan 2006 11:52:10 +0100
vim (1:6.4-006+1) unstable; urgency=low
Modified: trunk/vim/debian/control
===================================================================
--- trunk/vim/debian/control 2005-12-26 13:29:23 UTC (rev 455)
+++ trunk/vim/debian/control 2006-01-08 10:54:21 UTC (rev 456)
@@ -4,7 +4,7 @@
Maintainer: Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
Uploaders: Norbert Tretkowski <nobse at debian.org>, Pierre Habouzit <madcoder at debian.org>, Matthijs Mohlmann <matthijs at cacholong.nl>, Stefano Zacchiroli <zack at debian.org>, Alexis Sukrieh <sukria at sukria.net>, Pepijn de Langen <pepijn at ce.et.tudelft.nl>, James Vega <jamessan at debian.org>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev
+Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt
Build-Conflicts: libperl-dev (= 5.8.4-1)
Package: vim-common
Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules 2005-12-26 13:29:23 UTC (rev 455)
+++ trunk/vim/debian/rules 2006-01-08 10:54:21 UTC (rev 456)
@@ -163,15 +163,6 @@
# nothing to do per default
all:
-PATCH_NAME=new
-make_patch: extract
- mv $(SRCDIR) $(SRCDIR).new
- rm -f extract-stamp*
- ./debian/rules extract
- - diff -urN $(SRCDIR) $(SRCDIR).new > $(PATCH_NAME).diff
- rm -rf $(SRCDIR)
- mv $(SRCDIR).new $(SRCDIR)
-
sources:
cd upstream/tarballs \
&& rm -f $(MAIN_TARBALL) $(EXTRA_TARBALL) $(LANG_TARBALL) \
@@ -197,14 +188,14 @@
extract: extract-stamp
extract-stamp: $(foreach s,$(SOURCES),extract-stamp-$(s))
+ if [ ! -L vim -o "`readlink vim`" != "$(VIMCUR)" ]; then \
+ ln -fs $(VIMCUR) vim; \
+ 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 ;\
done
- @for f in `find debian/patches -maxdepth 1 -type f -printf "%P\n" | grep -v .svn | sort -n` ; do\
- echo "applying debian patch: $$f" ;\
- cat debian/patches/$$f | patch -s -d$(SRCDIR) -p1 ;\
- done
+ quilt push -a
touch $@
extract-stamp-%.bz2:
@@ -220,7 +211,9 @@
dh_testroot
rm -f extract-stamp* build-stamp* install-stamp*
rm -f debian/helpztags.1
+ - quilt pop -a
rm -rf $(SRCDIR)
+ rm -f vim
dh_clean
clean-vim-basic:
Copied: trunk/vim/patches (from rev 455, branches/quilt/vim/patches)
More information about the pkg-vim-maintainers
mailing list