r296 - branches/sarge/vim/debian trunk/vim/debian trunk/vim7/debian
Norbert Tretkowski
nobse at costa.debian.org
Thu Sep 1 16:40:18 UTC 2005
Author: nobse
Date: 2005-09-01 16:40:16 +0000 (Thu, 01 Sep 2005)
New Revision: 296
Modified:
branches/sarge/vim/debian/changelog
trunk/vim/debian/changelog
trunk/vim7/debian/changelog
trunk/vim7/debian/control
trunk/vim7/debian/rules
Log:
Uhm... looks like I forgot to checkin some changes...
Modified: branches/sarge/vim/debian/changelog
===================================================================
--- branches/sarge/vim/debian/changelog 2005-08-31 19:46:55 UTC (rev 295)
+++ branches/sarge/vim/debian/changelog 2005-09-01 16:40:16 UTC (rev 296)
@@ -5,7 +5,7 @@
them in glob() or expand() function calls in modelines. (CAN-2005-2368)
(closes: #320017)
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org> Tue, 26 Jul 2005 17:28:37 +0200
+ -- Norbert Tretkowski <nobse at debian.org> Sat, 30 Jul 2005 12:16:45 +0200
vim (1:6.3-071+1) unstable; urgency=medium
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-08-31 19:46:55 UTC (rev 295)
+++ trunk/vim/debian/changelog 2005-09-01 16:40:16 UTC (rev 296)
@@ -18,15 +18,15 @@
+ Added patch 134_sshconfig.vim.diff, added HashKnownHosts to syn keyword
sshconfigKeyword (closes: #321119)
+ Added debsources.vim to debian/updates to add syntax highlighting for
- /etc/apt/sources.list and added this to filetype.vim (closes: #308947)
+ /etc/apt/sources.list and added this to filetype.vim. (closes: #308947)
+ Added patch 136_muttrc.vim.diff, added crypt_autosign, crypt_autoencrypt
- and xterm_set_titles to syn keyword (closes: #323278)
+ and xterm_set_titles to syn keyword. (closes: #323278)
- * Pierre Habouzit <madcoder at debian.org>
- + Fix patch 105_xmodmap.vim.diff : wrt XF86_ClearGrab. (Closes: #322355)
- + Fix typo in doc/editing.txt. (Closes: #322254)
+ * Pierre Habouzit <madcoder at debian.org>:
+ + Fix patch 105_xmodmap.vim.diff: wrt XF86_ClearGrab. (closes: #322355)
+ + Fix typo in doc/editing.txt. (closes: #322254)
- * James Vega <jamessan at jamessan.com>
+ * James Vega <jamessan at jamessan.com>:
+ Added patch 137_filetype.vim.diff, recognize mutt-ng rc/temp files as
muttrc/mail filetypes. (closes: #307946)
+ Added patch 138_filetype.txt.diff, fix a typo in the changelog-plugin
Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog 2005-08-31 19:46:55 UTC (rev 295)
+++ trunk/vim7/debian/changelog 2005-09-01 16:40:16 UTC (rev 296)
@@ -3,7 +3,7 @@
* Norbert Tretkowski <nobse at debian.org>:
+ New upstream release.
+ Temporary disabled all Debian-specific patches.
- + Added libxpm-dev to Build-Dependencies.
+ + Added libxpm-dev and zip to Build-Dependencies.
-- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org> Thu, 28 Jul 2005 17:29:51 +0200
Modified: trunk/vim7/debian/control
===================================================================
--- trunk/vim7/debian/control 2005-08-31 19:46:55 UTC (rev 295)
+++ trunk/vim7/debian/control 2005-09-01 16:40:16 UTC (rev 296)
@@ -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>, Torsten Landschoff <torsten 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 jamessan.com>
Standards-Version: 3.6.1.1
-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] | tcl8.3-dev [!hurd-i386], python-dev, libncurses5-dev, ruby, ruby1.8-dev | ruby-dev, libgtk2.0-dev (>= 2.2) | libgtk1.2-dev, libgnomeui-dev [!hurd-i386], lesstif2-dev, libxpm-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] | tcl8.3-dev [!hurd-i386], python-dev, libncurses5-dev, ruby, ruby1.8-dev | ruby-dev, libgtk2.0-dev (>= 2.2) | libgtk1.2-dev, libgnomeui-dev [!hurd-i386], lesstif2-dev, libxpm-dev, zip
Build-Conflicts: libperl-dev (= 5.8.4-1)
Package: vim
Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules 2005-08-31 19:46:55 UTC (rev 295)
+++ trunk/vim7/debian/rules 2005-09-01 16:40:16 UTC (rev 296)
@@ -135,7 +135,7 @@
SOURCES+=$(NAME)-$(VERSION)-lang.tar.gz
SOURCES+=$(NAME)-$(VERSION)-extra.tar.gz
SRCDIR=$(NAME)$(subst .,,$(VERSION))
-SRCDIR=vim7
+SRCDIR=vim70aa
clean: $(foreach v,$(VARIANTS),clean-$(v))
dh_testdir
@@ -154,7 +154,7 @@
build: build-stamp
build-stamp: $(foreach v,$(VARIANTS),build-stamp-$(v))
# generate the html documentation (destroys the tags file)
- $(MAKE) -C runtime/doc html
+# $(MAKE) -C runtime/doc html
# (re)generate the tags file
# $(SRCDIR)/src/vim-basic -u /dev/null \
# -c "helptags $(SRCDIR)/runtime/doc" -c quit
@@ -196,11 +196,11 @@
# and install-specific stuff for GUIs (install-icons for vim-gtk, installkdeicons for kvim ...)
$(MAKE) -C src KDE_DIR=/usr DESTDIR=$(DESTDIR) install
# ensure that it is the vim-basic binary that is installed
- $(INSTALL) -D $src/vim-basic $(DESTDIR)/usr/bin/vim
+ $(INSTALL) -D src/vim-basic $(DESTDIR)/usr/bin/vim
# install usr/share/bug/vim/presubj file
install -m 644 -D $(CURDIR)/debian/vim.presubj $(DESTDIR)/usr/share/bug/vim/presubj
# make less.sh executable
- chmod a+x $(DESTDIR)/usr/share/vim/vim63/macros/less.sh
+ chmod a+x $(DESTDIR)/usr/share/vim/vim70aa/macros/less.sh
# remove things which are handled via alternatives
rm -f $(DESTDIR)/usr/bin/{view,ex}
rm -f $(DESTDIR)/usr/bin/[ce]tags
@@ -226,7 +226,7 @@
# cp debian/vim-install $(DESTDIR)/usr/bin
cp debian/helpztags $(DESTDIR)/usr/bin
# copying updated syntax files
- cp debian/updates/*.vim $(DESTDIR)/usr/share/vim/vim63/syntax/
+ cp debian/updates/*.vim $(DESTDIR)/usr/share/vim/vim70aa/syntax/
touch $@
# the other variants only include the binary
@@ -267,15 +267,15 @@
binary-indep: DH_OPTIONS=-i
binary-indep: build install
- rm -f $(PWD)/debian/vim/usr/share/vim/vim63/macros/maze/*.c
- rm -f $(PWD)/debian/vim/usr/share/vim/vim63/macros/maze/Makefile
+ rm -f $(PWD)/debian/vim/usr/share/vim/vim70aa/macros/maze/*.c
+ rm -f $(PWD)/debian/vim/usr/share/vim/vim70aa/macros/maze/Makefile
mkdir -p $(PWD)/debian/vim/usr/share/consolefonts/
- cp -a $(PWD)/vim63/farsi/fonts/UNIXs/far-a01.pcf.gz $(PWD)/debian/vim/usr/share/consolefonts/
+# cp -a $(PWD)/vim70aa/farsi/fonts/UNIXs/far-a01.pcf.gz $(PWD)/debian/vim/usr/share/consolefonts/
# gzip -9 $(PWD)/debian/vim/usr/share/doc/vim/README
# dh_movefiles --sourcedir=debian/vim
# fix for CAN-2005-0069
- rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim63/tools/vimspell.*
- rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim63/tools/tcltags
+ rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim70aa/tools/vimspell.*
+ rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim70aa/tools/tcltags
dh_testdir
dh_testroot
dh_compress
More information about the pkg-vim-maintainers
mailing list