summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-11-16 15:42:26 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-11-16 15:42:55 +0000
commit4779f2f7e2ad68d8e49b2e680ec60b7b2e2ce017 (patch)
tree8b1b7f50a7c720f535c2b4ca56ae0e3a9db52183
parentMerging upstream version 2:8.0.1257. (diff)
downloadvim-4779f2f7e2ad68d8e49b2e680ec60b7b2e2ce017.zip
vim-4779f2f7e2ad68d8e49b2e680ec60b7b2e2ce017.tar.xz
Merging debian version 2:8.0.1257-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog14
-rw-r--r--debian/changelog.upstream31
-rw-r--r--debian/control2
-rw-r--r--debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch2
-rw-r--r--debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch8
-rwxr-xr-xdebian/rules20
6 files changed, 61 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index 6a5024a..0d67e7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+vim (2:8.0.1257-1) unstable; urgency=medium
+
+ [ upstream ]
+ * 8.0.1246: Fix flaky popup test, which should fix the various FTBFS from
+ the last upload.
+
+ [ James McCoy ]
+ * syntax/debsources.vim:
+ + Fix syntax error in definition of unsupported releases. Thanks to Josh
+ Triplett. (Closes: #879986)
+ * Declare compliance with Policy 4.1.1, no changes needed.
+
+ -- James McCoy <jamessan@debian.org> Thu, 02 Nov 2017 21:27:13 -0400
+
vim (2:8.0.1226-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 51f8e29..9950bc3 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -1250,3 +1250,34 @@ Individual patches for Vim 8.0:
10925 8.0.1224 still interference between test functions
2413 8.0.1225 no check for spell region being zero
3003 8.0.1226 edit and popup tests failing
+ 2112 8.0.1227 undefined left shift in readfile()
+ 1941 8.0.1228 invalid memory access in GUI test
+ 1740 8.0.1229 condition in vim_str2nr() is always true
+ 2557 8.0.1230 CTRL-A in Visual mode uses character after selection
+ 2864 8.0.1231 expanding file name drops dash
+ 10847 8.0.1232 MS-Windows users are confused about default mappings
+ 1407 8.0.1233 typo in dos installer
+ 7047 8.0.1234 MS-Windows: composing chars are not shown properly
+ 4732 8.0.1235 cannot disable the terminal feature in a huge build
+ 98987 8.0.1236 Mac features are confusing
+ 4259 8.0.1237 ":set scroll&" often gives an error
+ 17328 8.0.1238 incremental search only shows one match
+ 14313 8.0.1239 cannot use a lambda for the skip argument to searchpair()
+ 8450 8.0.1240 MS-Windows: term_start() does not support environment
+ 1812 8.0.1241 popup test is flaky
+ 2983 8.0.1242 function argument with only dash is seen as number zero
+ 2386 8.0.1243 no test for what 8.0.1227 fixes
+ 2901 8.0.1244 search test does not work correctly on MS-Windows
+ 8703 8.0.1245 when WaitFor() has a wrong expression it just waits a second
+ 2066 8.0.1246 popup test has an arbitrary delay
+ 1868 8.0.1247 not easy to find Debian build info
+ 3096 8.0.1248 stray + in README file
+ 2701 8.0.1249 no error when WaitFor() gets an invalid wrong expression
+ 7444 8.0.1250 'hlsearch' highlighting not removed after incsearch
+ 1938 8.0.1251 invalid expressin passed to WaitFor()
+ 5796 8.0.1252 incomplete translations makefile for MinGW/Cygwin
+ 28392 8.0.1253 still too many old style tests
+ 5746 8.0.1254 undefined left shift in gethexchrs()
+ 2329 8.0.1255 duplicate badge README file
+ 4110 8.0.1256 typo in configure variable vim_cv_tgent
+ 1476 8.0.1257 no test for fix of undefined behavior
diff --git a/debian/control b/debian/control
index 523917f..0197817 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ XSBC-Original-Maintainer: Debian Vim Maintainers <pkg-vim-maintainers@lists.alio
XSBC-Original-Uploaders:
James McCoy <jamessan@debian.org>,
Bugs: mailto:maintainers@lists.progress-linux.org
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
Build-Depends:
autoconf,
debhelper (>= 10),
diff --git a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
index 33949df..5cebdcf 100644
--- a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
@@ -58,7 +58,7 @@ index f465096..0eae4c0 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index 6ab4e75..923e830 100644
+index 71569b3..a0fb0f3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -44,11 +44,17 @@ make_version(void)
diff --git a/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch b/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
index 6a99f12..d9c5804 100644
--- a/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
+++ b/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
@@ -1,5 +1,5 @@
From: James McCoy <jamessan@debian.org>
-Date: Thu, 26 Oct 2017 23:00:48 -0400
+Date: Sat, 28 Oct 2017 23:07:40 -0400
Subject: syntax/deb{source,changelog}.vim: Update release names
Add new bionic release for Ubuntu.
@@ -34,7 +34,7 @@ index 6e6ed19..0d3f872 100644
syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
-index 4fa80de..3ce2287 100644
+index 4fa80de..6791ece 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
@@ -42,7 +42,7 @@ index 4fa80de..3ce2287 100644
" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
" Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2017 Apr 22
-+" Last Change: 2017 Oct 26
++" Last Change: 2017 Oct 28
" URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
" Standard syntax initialization
@@ -59,7 +59,7 @@ index 4fa80de..3ce2287 100644
let s:unsupported = [
\ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
- \ 'woody', 'sarge', 'etch', 'lenny',
-+ \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze'
++ \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze',
\
\ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
\ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
diff --git a/debian/rules b/debian/rules
index da854c0..833aa90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -166,7 +166,7 @@ DOT_IN_DEPS += debian/runtime/debian.vim
DOT_IN_DEPS_TINY := debian/tiny/vimrc.tiny
# nothing to do per default
-all:
+all:
update-changelog:
dh_testdir
@@ -300,7 +300,7 @@ install-stamp-indep: build-stamp-vim-basic build-stamp-indep $(DOT_IN_DEPS)
dh_testdir
dh_testroot
dh_installdirs
-
+
mkdir -p "$(DESTDIR)/usr/bin"
# installruntime requires a "vim" in /usr/bin
cp src/vim-basic/vim "$(DESTDIR)/usr/bin"
@@ -311,16 +311,16 @@ install-stamp-indep: build-stamp-vim-basic build-stamp-indep $(DOT_IN_DEPS)
install-languages \
install-icons
rm -f "$(DESTDIR)/usr/bin/vim"
-
+
$(munge-man-directories)
-
+
# rm stuff handled by alternatives or our own symlinks
find "$(DESTDIR)/usr/share/man" \( -name view.1 -o -name ex.1 -o -name rvim.1 -o -name rview.1 \) -delete
-
+
# helpztags manpage
pod2man -c "User Commands" -s 1 -q none -r "vim $(VERSION)" \
-d "August 2010" debian/helpztags debian/helpztags.1
-
+
# Generate language-specific sections of
# vim-{runtime,common,gui-common}.install files
for L in $(LANGS); do \
@@ -333,7 +333,7 @@ install-stamp-indep: build-stamp-vim-basic build-stamp-indep $(DOT_IN_DEPS)
echo debian/tmp/usr/share/man/$$L/man1/evim.1 \
usr/share/man/$$L/man1/ >>debian/vim-gui-common.install; \
done
-
+
# Icons
for sz in 16 32 48; do \
cp runtime/vim$${sz}x$${sz}.xpm debian/vim-common/usr/share/pixmaps/vim-$${sz}.xpm; \
@@ -345,7 +345,7 @@ install-stamp-indep: build-stamp-vim-basic build-stamp-indep $(DOT_IN_DEPS)
pdf2svg debian/tmplogo.pdf debian/vim-common/usr/share/pixmaps/gvim.svg
cp debian/vim-common/usr/share/pixmaps/gvim.svg \
debian/vim-common/usr/share/icons/hicolor/scalable/apps/gvim.svg
-
+
dh_install
# adjust things for vim-gui-common
cp debian/vim-common/usr/share/man/man1/vim.1 \
@@ -404,7 +404,7 @@ install-stamp-%: build-stamp-%
dh_testroot
@echo "*** DEBIAN *** INSTALLING VARIANT $*"
dh_installdirs
-
+
cp src/$*/vim src/$*/$(subst -,.,$*)
# variant-related installations
for x in $(PER_VARIANT_FILES) ; do \
@@ -436,7 +436,7 @@ install-stamp-%: build-stamp-%
dh_install
dh_link
dh_bugfiles -A
-
+
touch $@
%: %.in