summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 22:12:32 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 22:12:39 +0000
commitc859b45b0b12cf40e1b211d93ac1b7554f09561a (patch)
treea8e148a66cfb545ea173413ba184ad68ca2e33d7
parentMerging upstream version 2:8.1.0320. (diff)
downloadvim-c859b45b0b12cf40e1b211d93ac1b7554f09561a.zip
vim-c859b45b0b12cf40e1b211d93ac1b7554f09561a.tar.xz
Merging debian version 2:8.1.0320-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog16
-rw-r--r--debian/changelog.upstream91
-rw-r--r--debian/control3
-rw-r--r--debian/copyright6
-rw-r--r--debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch4
-rw-r--r--debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch10
-rw-r--r--debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch4
-rwxr-xr-xdebian/rules6
8 files changed, 126 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index 3c9e961..f6b2f83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+vim (2:8.1.0320-1) unstable; urgency=medium
+
+ * Merge upstream tag v8.1.0320
+ - syntax/debcontrol.vim:
+ + Recognize riscv64 as an architecture (Closes: #905435)
+ - syntax/sh.vim:
+ + Fix syntax highlighting of curly braces inside parameter expansion
+ (Closes: #904875)
+ * rules:
+ + Stop using --dbgsym-migration
+ + Stop overriding default dpkg-deb compression
+ * Declare compliance with Policy 4.2.0, no changes needed
+ * control: Add cscope to Build-Depends to test cscope integration
+
+ -- James McCoy <jamessan@debian.org> Wed, 22 Aug 2018 19:46:39 -0400
+
vim (2:8.1.0229-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index a430c62..fee5f56 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -253,3 +253,94 @@ Individual patches for Vim 8.1:
1700 8.1.0227 spaces instead of tabs in makefile
15828 8.1.0228 dropping files is ignored while Vim is busy
3254 8.1.0229 crash when dumping profiling data
+ 4212 8.1.0230 directly checking 'buftype' value
+ 3398 8.1.0231 :help -? goes to help for -+
+ 6091 8.1.0232 Ruby error does not include backtrace
+ 9163 8.1.0233 "safe" argument of call_vim_function() is always FALSE
+ 4813 8.1.0234 incorrect reference counting in Perl interface
+ 6005 8.1.0235 more help tags that jump to the wrong location
+ 3812 8.1.0236 Ruby build fails when ruby_intern is missing
+ 2407 8.1.0237 Ruby on Cygwin doesn't always work
+ 2455 8.1.0238 'buftype' is cleared when using ":term ++hidden cat"
+ 3139 8.1.0239 now Ruby build fails on other systems
+ 1835 8.1.0240 g:actual_curbuf set in wrong scope
+ 1779 8.1.0241 effect of ":tabmove N" is not clear
+ 2127 8.1.0242 Insert mode completion may use an invalid buffer pointer
+ 3046 8.1.0243 using :term ++close ++hidden closes a window
+ 6049 8.1.0244 no redraw when using a STOP signal on Vim and then CONT
+ 3316 8.1.0245 calling setline() in TextChangedI autocmd breaks undo
+ 1756 8.1.0246 build failure without the +eval feature
+ 8011 8.1.0247 Python: error message for failing import is incorrect
+ 4314 8.1.0248 duplicated quickfix code
+ 2789 8.1.0249 GTK: when screen DPI changes Vim does not handle it
+ 3230 8.1.0250 MS-Windows using VTP: windows size change incorrect
+ 12239 8.1.0251 using full path is not supported for 'backupdir'
+ 41015 8.1.0252 quickfix functions are too long
+ 14504 8.1.0253 saving and restoring window title does not always work
+ 2428 8.1.0254 cannot build on MS-Windows; unused macro HAVE_HANDLE_DROP
+ 2310 8.1.0255 backup test fails when using shadow directory
+ 8885 8.1.0256 using setline() in TextChangedI splits undo
+ 2084 8.1.0257 no test for pathshorten()
+ 1854 8.1.0258 not enough testing for the CompleteDone event
+ 4897 8.1.0259 no test for fixed quickfix issue
+ 1783 8.1.0260 no LGTM logo in README file
+ 4958 8.1.0261 Coverity complains about a negative array index
+ 3052 8.1.0262 not enough testing for getftype()
+ 3417 8.1.0263 channel log doesn't show part of channel
+ 3278 8.1.0264 backup tests fail when CWD is in /tmp
+ 23576 8.1.0265 the getcmdline() function is way too big
+ 10962 8.1.0266 parsing Ex address range is not a separate function
+ 3831 8.1.0267 no good check if restoring quickfix list worked
+ 10135 8.1.0268 file type checking has too many #ifdef
+ 3772 8.1.0269 Ruby Kernel.#p method always returns nil
+ 1866 8.1.0270 checking for a Tab in a line could be faster
+ 13097 8.1.0271 'incsearch' doesn't work for :s, :g or :v
+ 1723 8.1.0272 options test fails if temp var ends in slash
+ 1470 8.1.0273 invalid memory access when using 'incsearch'
+ 4628 8.1.0274 'incsearch' triggers on ":source"
+ 4964 8.1.0275 'incsearch' with :s doesn't start at cursor line
+ 2991 8.1.0276 no test for 'incsearch' highlighting with :s
+ 9021 8.1.0277 'incsearch' highlighting wrong in a few cases
+ 2988 8.1.0278 'incsearch' highlighting does not accept reverse range
+ 3306 8.1.0279 'incsearch' highlighting does not skip white space
+ 2293 8.1.0280 'incsearch' highlighting does not work for ":g!/"
+ 19659 8.1.0281 parsing command modifiers is not separated
+ 14174 8.1.0282 'incsearch' does not work with command modifiers
+ 1846 8.1.0283 missing test dump
+ 3774 8.1.0284 'cursorline' highlighting wrong with 'incsearch'
+ 1416 8.1.0285 compiler warning for conversion
+ 3285 8.1.0286 'incsearch' does not apply to :smagic and :snomagic
+ 1772 8.1.0287 MAX is not defined everywhere
+ 12170 8.1.0288 quickfix code uses cmdidx too often
+ 2018 8.1.0289 cursor moves to wrong column after quickfix jump
+ 2722 8.1.0290 "cit" on an empty HTML tag changes the whole tag
+ 4355 8.1.0291 'incsearch' highlighting not used for :sort
+ 2120 8.1.0292 MS-Windows: the text "self-installing" confuses some users
+ 5483 8.1.0293 checks for type of stack is cryptic
+ 2332 8.1.0294 MS-Windows: sometimes uses short directory name
+ 9332 8.1.0295 no 'incsearch' highlighting for :vimgrep and similar
+ 8125 8.1.0296 command parsing for 'incsearch' is a bit ugly
+ 2733 8.1.0297 MS-Windows: tests fail, Vim crashes
+ 1475 8.1.0298 window resize test sometimes fails on Mac
+ 1657 8.1.0299 misplaced comment
+ 2295 8.1.0300 the old window title might be freed twice
+ 8790 8.1.0301 GTK: input method popup displayed on wrong screen.
+ 6061 8.1.0302 crash when using :suspend and "fg"
+ 2912 8.1.0303 line2byte() is wrong for last line with 'noeol'
+ 9124 8.1.0304 no redraw when using a STOP signal on Vim and then CONT
+ 3073 8.1.0305 missing support for Lua 5.4 32 bits on Unix
+ 14029 8.1.0306 plural messages are not translated properly
+ 6949 8.1.0307 there is no good way to get the window layout
+ 1720 8.1.0308 a quick undo shows "1 seconds ago"
+ 18244 8.1.0309 profiling does not show a count for condition lines
+ 3277 8.1.0310 file info msg not always suppressed with 'F' in 'shortmess'
+ 4009 8.1.0311 filtering entries in a quickfix list is not easy
+ 7961 8.1.0312 wrong type for flags used in signal handlers
+ 7881 8.1.0313 information about a swap file is unavailable
+ 5176 8.1.0314 build failure without the +eval feature
+ 6290 8.1.0315 helpgrep with language doesn't work properly
+ 2195 8.1.0316 swapinfo() test fails on Travis
+ 2110 8.1.0317 Cscope test fails when using shadow directory
+ 3126 8.1.0318 the getftype() test may fail for char devices
+ 1642 8.1.0319 bzero() function prototype doesn't work for Android
+ 4447 8.1.0320 too much 'incsearch' highlight for pat matching everything
diff --git a/debian/control b/debian/control
index c6cace6..21e4524 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,11 @@ XSBC-Original-Maintainer: Debian Vim Maintainers <team+vim@tracker.debian.org>
XSBC-Original-Uploaders:
James McCoy <jamessan@debian.org>,
Bugs: mailto:maintainers@lists.progress-linux.org
-Standards-Version: 4.1.4
+Standards-Version: 4.2.0
Rules-Requires-Root: no
Build-Depends:
autoconf,
+ cscope <!nocheck>,
debhelper (>= 11~),
# SOURCE_DATE_EPOCH provided by pkg-info.mk
dpkg-dev (>= 1.18.8),
diff --git a/debian/copyright b/debian/copyright
index 3ba453b..40c412c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,10 +41,14 @@ Copyright: Andy Cedilnik <andy.cedilnik@kitware.com>
Gerfried Fuchs <alfie@ist.org>
License: BSD-3-clause
-Files: runtime/syntax/json.vim
+Files: runtime/ftplugin/wast.vim
+ runtime/indent/wast.vim
+ runtime/syntax/json.vim
runtime/syntax/proto.vim
+ runtime/syntax/wast.vim
Copyright: 2013, Jeroen Ruigrok van der Werven, Eli Parra
2008 Google Inc.
+ 2016 rhysd
License: Expat
Files: runtime/syntax/tmux.vim
diff --git a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
index 36111e2..c0dfd85 100644
--- a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
+++ b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
@@ -15,10 +15,10 @@ Signed-off-by: James McCoy <jamessan@debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index 8645c47..ea3fcbe 100644
+index 2343d63..a74ce44 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
-@@ -5308,7 +5308,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5319,7 +5319,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'modeline'* *'ml'* *'nomodeline'* *'noml'*
'modeline' 'ml' boolean (Vim default: on (off for root),
diff --git a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
index b970501..9973988 100644
--- a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
+++ b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
@@ -17,10 +17,10 @@ Signed-off-by: James Vega <jamessan@debian.org>
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/main.c b/src/main.c
-index f677066..69b343b 100644
+index d3a509b..dd24dbd 100644
--- a/src/main.c
+++ b/src/main.c
-@@ -1775,6 +1775,10 @@ parse_command_name(mparm_T *parmp)
+@@ -1779,6 +1779,10 @@ parse_command_name(mparm_T *parmp)
}
else if (STRNICMP(initstr, "vim", 3) == 0)
initstr += 3;
@@ -31,7 +31,7 @@ index f677066..69b343b 100644
/* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
if (STRICMP(initstr, "diff") == 0)
-@@ -3018,7 +3022,12 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3022,7 +3026,12 @@ source_startup_scripts(mparm_T *parmp)
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
@@ -45,7 +45,7 @@ index f677066..69b343b 100644
#endif
#ifdef MACOS_X
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
-@@ -3053,6 +3062,9 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3057,6 +3066,9 @@ source_startup_scripts(mparm_T *parmp)
&& do_source((char_u *)USR_EXRC_FILE, FALSE, DOSO_NONE) == FAIL
#ifdef USR_EXRC_FILE2
&& do_source((char_u *)USR_EXRC_FILE2, FALSE, DOSO_NONE) == FAIL
@@ -56,7 +56,7 @@ index f677066..69b343b 100644
&& !has_dash_c_arg)
{
diff --git a/src/os_unix.h b/src/os_unix.h
-index 4146529..465153a 100644
+index ca2ce70..42c55ca 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -213,6 +213,9 @@ typedef struct dsc$descriptor DESC;
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 1b1e038..cef7a38 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
@@ -37,7 +37,7 @@ index 00117cf..76d1c08 100644
#undef HAVE_ATTRIBUTE_UNUSED
diff --git a/src/configure.ac b/src/configure.ac
-index 0d8ea32..924261b 100644
+index 8994f3c..6bf12cd 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -62,6 +62,16 @@ if test x"$ac_cv_prog_cc_c99" != xno; then
@@ -58,7 +58,7 @@ index 0d8ea32..924261b 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index 5f7d908..b1fc138 100644
+index 6b79b6e..1ed15f3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -44,9 +44,13 @@ init_longVersion(void)
diff --git a/debian/rules b/debian/rules
index ecf11d2..dff5977 100755
--- a/debian/rules
+++ b/debian/rules
@@ -415,7 +415,7 @@ binary-indep: install-stamp-indep
dh_installdeb
dh_gencontrol
dh_md5sums
- dh_builddeb -- -Zxz
+ dh_builddeb
binary-arch: binary-arch-xxd $(foreach v,$(VARIANTS),binary-arch-$(v))
@@ -424,7 +424,7 @@ binary-arch-%: export DH_OPTIONS=-p$(PKG) $(foreach v,$(VARIANTS_SKIP),-N$(v))
binary-arch-%: install-stamp-%
dh_testdir
dh_testroot
- dh_strip --dbgsym-migration='vim-dbg (<< 2:7.4.1689-1~)'
+ dh_strip
dh_compress
dh_fixperms
dh_lintian
@@ -432,7 +432,7 @@ binary-arch-%: install-stamp-%
dh_shlibdeps
dh_gencontrol -- $(RUBY_SUBSTVARS)
dh_md5sums
- dh_builddeb -- -Zxz
+ dh_builddeb
binary-arch-xxd: export DH_OPTIONS=-pxxd
binary-arch-xxd: install-stamp-xxd