[vim] 02/03: Update changelog/copyright for 8.0.1277

James McCoy jamessan at debian.org
Tue Sep 19 03:22:35 UTC 2017 

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 255c0aa8d27acaeaaef1ed9b051e267438c71679
Author: James McCoy <jamessan at debian.org>
Date:   Mon Sep 18 21:54:36 2017 -0400

    Update changelog/copyright for 8.0.1277
    
    Remove patches merged upstream
    - debcontrol.vim-Add-support-for-Build-Depends-Conflicts-Ar.patch
    - debcontrol.vim-Add-support-for-Testsuite-field.patch
    - debcontrol.vim-Fix-highlighting-of-javascript-in-debcontr.patch
    - debcontrol.vim-Treat-tabs-as-valid-whitespace.patch
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog                                   |   8 +-
 debian/changelog.upstream                          | 181 +++++++++++++++++++++
 debian/copyright                                   |   3 +-
 ...t-filetype-using-the-contents-of-the-file.patch |   2 +-
 ...s-decision-to-disable-modelines-by-defaul.patch |   4 +-
 ...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch |  12 +-
 debian/patches/series                              |   4 -
 ...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch |   4 +-
 ...dd-support-for-Build-Depends-Conflicts-Ar.patch |  40 -----
 ...ntrol.vim-Add-support-for-Testsuite-field.patch |  31 ----
 ...ix-highlighting-of-javascript-in-debcontr.patch |  26 ---
 ...ontrol.vim-Treat-tabs-as-valid-whitespace.patch |  44 -----
 12 files changed, 200 insertions(+), 159 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 06b9f52..72d2d5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-vim (2:8.0.0946-2) UNRELEASED; urgency=medium
+vim (2:8.0.1127-1) UNRELEASED; urgency=medium
 
+  [ upstream ]
+  * Fix detection/enabling of cursor blink state.  (Closes: #872302)
+
+  [ James McCoy ]
   * debcontrol.vim:
     + Recognize Testsuite field  (Closes: #872360)
     + Treat tabs as valid whitespace  (Closes: #872557)
 
- -- James McCoy <jamessan at debian.org>  Fri, 18 Aug 2017 21:43:18 -0400
+ -- James McCoy <jamessan at debian.org>  Mon, 18 Sep 2017 20:16:12 -0400
 
 vim (2:8.0.0946-1) unstable; urgency=medium
 
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 31cd92e..1f3afe3 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -970,3 +970,184 @@ Individual patches for Vim 8.0:
   2494  8.0.0944  test_profile is a little bit flaky
   1770  8.0.0945  64-bit compiler warnings
   2225  8.0.0946  using PATH_MAX does not work well on some systems
+  1777  8.0.0947  entering terminal using C-O C-W C-W goes to Insert mode
+  5586  8.0.0948  crash if timer closes window while dragging status line
+  4714  8.0.0949  winpty.dll name is fixed
+  2355  8.0.0950  MS-Windows: wrong #ifdef, compiler warnings
+  1664  8.0.0951  another wrong #ifdef
+  5666  8.0.0952  has('terminal') does not check existence of dll file 
+  6227  8.0.0953  get "no write since last change" error in terminal window
+  3102  8.0.0954  /proc/self/exe might be a relative path
+  2971  8.0.0955  Test_existent_file() fails on some file systems
+ 27279  8.0.0956  scrolling in a terminal window has flicker
+ 12490  8.0.0957  a terminal job can deadlock when sending many keys
+  1589  8.0.0958  terminal test fails on Windows when winpty dll is missing
+  2242  8.0.0959  build failure on MS-Windows
+  6434  8.0.0960  job in terminal does not get CTRL-C
+  1995  8.0.0961  the script to build the installer does not include winpty
+  4168  8.0.0962  crash with virtualedit and joining lines
+  2377  8.0.0963  terminal test fails on MacOS
+  2175  8.0.0964  channel write buffer does not work with poll()
+ 18019  8.0.0965  not restoring cursor shape after it was set in a terminal
+  1275  8.0.0966  build failure without terminal feature
+  2513  8.0.0967  using a terminal may cause the cursor to blink
+  1971  8.0.0968  crash when switching terminal modes
+  1638  8.0.0969  Coverity warning for unused return value
+  1995  8.0.0970  passing invalid highlight id
+  2412  8.0.0971  'winptydll' missing from :options
+  2000  8.0.0972  compiler warnings for unused variables
+ 11781  8.0.0973  initial info about blinking cursor is wrong
+  6797  8.0.0974  resetting a string option does not trigger OptionSet
+  1608  8.0.0975  using freed memory when setting 'backspace'
+ 12695  8.0.0976  cannot send lines to a terminal job
+  4971  8.0.0977  cannot send lines to a terminal job on MS-Windows
+  1987  8.0.0978  writing to terminal job is not tested
+  2435  8.0.0979  terminal noblock test fails on MS-Windows
+  1916  8.0.0980  Coverity warning for failing to open /dev/null
+  2609  8.0.0981  cursor in terminal window blinks by default
+  6545  8.0.0982  cannot use a terminal when 'encoding' is non-utf8 multi-byte
+  1901  8.0.0983  unnecessary check for NULL pointer
+  4110  8.0.0984  terminal blinking cursor not correct in the GUI
+  8534  8.0.0985  libvterm has its own idea of character width
+  3731  8.0.0986  terminal feature always requires multi-byte feature
+  2117  8.0.0987  terminal: second byte of double-byte char wrong
+  2353  8.0.0988  warning from Covscan about using NULL pointer
+  4920  8.0.0989  ActiveTcl dll name has changed in 8.6.6
+  3128  8.0.0990  with DBCS 'encoding' wrong pasting register into terminal
+  2206  8.0.0991  using wrong character conversion for DBCS
+  1895  8.0.0992  terminal title is wrong when 'encoding' is DBCS
+  1585  8.0.0993  sometimes an xterm sends an extra CTRL-X
+  2085  8.0.0994  MS-Windows: cursor in terminal blinks undesirably
+  1642  8.0.0995  terminal tests fail on Mac
+  4110  8.0.0996  Mac: t_RS is echoed on the screne in Terminal.app
+  2262  8.0.0997  libvterm and Terminal.app not regognized from termresponse
+  2270  8.0.0998  strange error when using K while only spaces are selected
+  8750  8.0.0999  indenting raw C++ strings is wrong
+ 18622  8.0.1000  cannot open a terminal without running a job in it
+  1877  8.0.1001  setting 'encoding' makes 'printheader' invalid
+  7770  8.0.1002  unnecessarily updating screen after timer callback
+  1572  8.0.1003  64 bit compiler warning
+  8206  8.0.1004  matchstrpos() without a match returns too many items
+ 14038  8.0.1005  terminal without job updates slowly in GUI
+  8141  8.0.1006  quickfix list changes when parsing text with 'erroformat'
+  3394  8.0.1007  no test for filetype detection for scripts
+  5595  8.0.1008  slow updating of terminal window in Motif
+ 13356  8.0.1009  Xterm cursor blinking status may be inverted
+  1560  8.0.1010  build failure without termresponse feature
+  1046  8.0.1011  terminal test fails with Athena and Motif
+  9299  8.0.1012  MS-Windows: problem with $HOME when it was set internally
+  8510  8.0.1013  terminal window behaves different from a buffer with changes
+  3748  8.0.1014  old compiler doesn't know uint32_t
+  2928  8.0.1015  missing update to terminal test
+  9700  8.0.1016  gnome terminal echoes t_RC
+  6040  8.0.1017  test for MS-Windows $HOME always passes
+  2411  8.0.1018  warnings from 64-bit compiler
+  3028  8.0.1019  pasting in virtual edit happens in the wrong place
+  5240  8.0.1020  when a timer calls getchar(1) input is overwritten
+  1884  8.0.1021  older Gnome terminal still echoes t_RC
+ 20550  8.0.1022  test 80 is old style
+ 15164  8.0.1023  it is not easy to identify a quickfix list
+  6477  8.0.1024  folds lost when session file has a buffer in two windows
+  1267  8.0.1025  stray copy command in test
+ 24683  8.0.1026  GTK on-the-spot input has problems
+  2224  8.0.1027  more terminals can't handle requesting cursor mode
+  2078  8.0.1028  MS-Windows: viminfo uses $VIM/_viminfo if $HOME not set
+  2908  8.0.1029  return value of getqflist() is inconsistent
+  5036  8.0.1030  MS-Windows: wrong size computation in is_cygpty()
+ 13631  8.0.1031  "text" argument for getqflist() is confusing
+  2642  8.0.1032  "make tags" doesn't work well on MS-Windows
+  5942  8.0.1033  detecting background color does not work in screen
+  7443  8.0.1034  sending buffer lines to terminal doesn't work on MS-Windows
+  7265  8.0.1035  sending buffer lines to terminal doesn't work on MS-Windows
+  8131  8.0.1036  ++eof argument for terminal only available on MS-Windows
+  4603  8.0.1037  "icase" of 'diffopt' is not used for highlighting
+ 24538  8.0.1038  strike-through text not supported
+ 11428  8.0.1039  cannot change a line in not current buffer
+ 11340  8.0.1040  cannot use another error format in getqflist()
+ 13529  8.0.1041  bogus characters when indenting during visual-block append
+  1756  8.0.1042  without the syntax feature highlighting doesn't work
+  2434  8.0.1043  warning for uninitialized variable
+  1471  8.0.1044  warning for uninitialized variable
+  1450  8.0.1045  running tests may pollute shell history
+  3781  8.0.1046  code duplication in diff mode
+  1630  8.0.1047  buffer overflow in Ruby
+  5953  8.0.1048  no test for what 8.0.1020 fixes
+  2151  8.0.1049  shell on Mac can't handle long text
+  4960  8.0.1050  terminal window feature not included by default
+  3022  8.0.1051  cannot run terminal with spaces in argument
+  7960  8.0.1052  term_start() does not allow in_io, out_io and err_io options
+  4532  8.0.1053  setline() does not work on startup
+  2709  8.0.1054  terminal test fails on MS-Windows
+  2277  8.0.1055  bufline test hangs on MS-Windows
+  1766  8.0.1056  cannot build with +diff but without +multi_byte
+  1909  8.0.1057  terminal scrape test waits too long
+  1530  8.0.1058  terminal redirection test is flaky
+  2023  8.0.1059  older Gnome terminal returns smaller version number
+  2274  8.0.1060  when imstyle is one, mapping <Left> breaks preediting
+  2779  8.0.1061  Coverity: no check for NULL command
+  2373  8.0.1062  Coverity warnings in libvterm
+  3166  8.0.1063  Coverity warns for NULL check and array use
+  1451  8.0.1064  Coverity warns for leaking resource
+  1651  8.0.1065  not all macro examples are included
+  1703  8.0.1066  some terminals can't handle requesting cursor mode
+  5928  8.0.1067  try/catch in timer does not prevent it from being stopped
+  1672  8.0.1068  vandyke SecureCRT terminal can't handle cursor mode request
+  2223  8.0.1069  still get CTRL-X sometimes
+  1400  8.0.1070  terminal test is flaky on Mac
+  3113  8.0.1071  putty-color and cygwin-color are not recognized
+ 20670  8.0.1072  :highlight command causes a redraw even when nothing changed
+  3275  8.0.1073  may get an endless loop if 'statusline' changes a highlight
+ 21263  8.0.1074  ":term NONE" does not work on MS-Windows
+  3130  8.0.1075  MS-Windows: mouse does not work in terminal
+  9837  8.0.1076  term_start() does not take callbacks
+  5666  8.0.1077  no debugger making use of the terminal window
+  2896  8.0.1078  using freed memory with ":hi Normal"
+  2033  8.0.1079  memory leak when remote_foreground() fails
+  1817  8.0.1080  memory leak for eof_chars terminal option and buffer name
+  3637  8.0.1081  memory leak for the channel write queue
+  3109  8.0.1082  tests fail when run under valgrind
+  4505  8.0.1083  leaking memory in input part of channel
+  6808  8.0.1084  GTK build has compiler warnings
+ 16300  8.0.1085  terminal debugger can't set breakpoints
+  2347  8.0.1086  can't build with GTK 3
+  4871  8.0.1087  Test_terminal_cwd is flaky
+ 21197  8.0.1088  occasional memory use after free
+  3762  8.0.1089  cannot get range count in user command
+  5785  8.0.1090  cannot get the text under the cursor like v:beval_text
+  4753  8.0.1091  test for <cexpr> fails without +balloon_eval feature
+  9741  8.0.1092  terminal debugger can't evaluate expressions
+ 10893  8.0.1093  various small quickfix issues
+  2126  8.0.1094  using ssh from Terminal.app runs into xterm incompatibility
+  1722  8.0.1095  terminal multibyte escrape test is flaky
+  5675  8.0.1096  terminal window in Normal mode has wrong background
+  8490  8.0.1097  background color wrong if job changes background color
+  1857  8.0.1098  build failure if libvterm installed
+  4677  8.0.1099  warnings for GDK calls
+  5251  8.0.1100  stuck in redraw loop when 'lazyredraw' is set
+  2636  8.0.1101  channel write fails if writing to log fails
+  8452  8.0.1102  terminal window does not use Normal colors
+  1493  8.0.1103  converting cterm color fails for grey ramp
+ 13111  8.0.1104  the qf_jump() function is too long
+  4871  8.0.1105  match() and matchend() are not tested
+  2305  8.0.1106  terminal colors wrong on an MS-Windows console
+  6406  8.0.1107  terminal debugger jumps to non-existing file
+ 24281  8.0.1108  cannot specify mappings for the terminal window
+  3375  8.0.1109  timer causes error on exit from Ex mode
+  3571  8.0.1110  FORTIFY_SOURCE from Perl causes problems
+  3305  8.0.1111  syntax error in configure when using Perl
+  5263  8.0.1112  can't get size or current index from quickfix list
+  2094  8.0.1113  can go to Insert mode from Terminal-Normal mode
+  3565  8.0.1114  default for 'iminsert' is annoying
+  2774  8.0.1115  crash when using foldtextresult() recursively
+  2253  8.0.1116  terminal test fails on MS-Windows
+  2203  8.0.1117  Test_terminal_no_cmd hangs on MS-Windows with GUI
+260726  8.0.1118  FEAT_WINDOWS adds a lot of #ifdefs
+  3860  8.0.1119  quitting a split terminal window kills the job
+  4969  8.0.1120  :tm means :tmap instead of :tmenu
+  1718  8.0.1121  can uncheck executables in MS-Windows installer
+  1732  8.0.1122  vimtutor.bat doesn't work well with vim.bat
+ 51585  8.0.1123  cannot define a toolbar for a window
+  2406  8.0.1124  use of MZSCHEME_VER is unclear
+  3802  8.0.1125  wrong window height when splitting window with window toolbar
+  2983  8.0.1126  endless resize when terminal showing in two buffers
+  4670  8.0.1127  Test_peek_and_get_char fails on 32 bit system
diff --git a/debian/copyright b/debian/copyright
index bdae4e1..850a776 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,6 +22,7 @@ Copyright: 2001-2017 Bram Moolenaar <Bram at vim.org>
            1997 Heiko Erhardt
            2002 E. I. DuPont de Nemours and Company, Inc
            Pablo Ariel Kohan
+           2017 Eugene Ciurana
 License: Vim
 
 Files: runtime/doc/*
@@ -102,7 +103,7 @@ Copyright: 1993 Juergen Weigert (jnweiger at immd4.informatik.uni-erlangen.de)
 License: GPL-2+
 
 Files: src/iscygpty.*
-Copyright: 2015-2016 K.Takata
+Copyright: 2015-2017 K.Takata
 License: Expat or Vim
 
 Files: src/xpm/*
diff --git a/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
index 92b091e..5fcb5f9 100644
--- a/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
+++ b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
@@ -8,7 +8,7 @@ Closes: #382541
  1 file changed, 8 insertions(+)
 
 diff --git a/runtime/scripts.vim b/runtime/scripts.vim
-index 358d328..092889f 100644
+index 9107d6a..628ac01 100644
 --- a/runtime/scripts.vim
 +++ b/runtime/scripts.vim
 @@ -348,6 +348,14 @@ else
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 1d5dde4..57178f2 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 at debian.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index 73955f4..4ab969c 100644
+index 3072793..78e8679 100644
 --- a/runtime/doc/options.txt
 +++ b/runtime/doc/options.txt
-@@ -5221,7 +5221,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5244,7 +5244,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 636d527..40b2e05 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 at debian.org>
  3 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/src/main.c b/src/main.c
-index c6b103e..b14dccd 100644
+index 5233db5..4140d43 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -1790,6 +1790,10 @@ parse_command_name(mparm_T *parmp)
+@@ -1777,6 +1777,10 @@ parse_command_name(mparm_T *parmp)
      }
      else if (STRNICMP(initstr, "vim", 3) == 0)
  	initstr += 3;
@@ -31,7 +31,7 @@ index c6b103e..b14dccd 100644
  
      /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
      if (STRICMP(initstr, "diff") == 0)
-@@ -3041,7 +3045,12 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3012,7 +3016,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 c6b103e..b14dccd 100644
  #endif
  #ifdef MACOS_X
  	(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
-@@ -3076,6 +3085,9 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3047,6 +3056,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
@@ -70,10 +70,10 @@ index 695affa..b6e7e59 100644
  # define SYS_VIMRC_FILE "$VIM/vimrc"
  #endif
 diff --git a/src/structs.h b/src/structs.h
-index 40dfd95..30017c2 100644
+index 94d7391..0d0267b 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -3350,6 +3350,9 @@ typedef struct
+@@ -3361,6 +3361,9 @@ typedef struct
  #ifdef FEAT_DIFF
      int		diff_mode;		/* start with 'diff' set */
  #endif
diff --git a/debian/patches/series b/debian/patches/series
index 45e6b27..600d04b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,3 @@ debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
 debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
 debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
 debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
-upstream/debcontrol.vim-Add-support-for-Build-Depends-Conflicts-Ar.patch
-upstream/debcontrol.vim-Fix-highlighting-of-javascript-in-debcontr.patch
-upstream/debcontrol.vim-Treat-tabs-as-valid-whitespace.patch
-upstream/debcontrol.vim-Add-support-for-Testsuite-field.patch
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 2a8c816..3bffdee 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 fe68d49..7e6e504 100644
  #undef HAVE_ATTRIBUTE_UNUSED
  
 diff --git a/src/configure.ac b/src/configure.ac
-index ea4df8f..da97804 100644
+index 1183ab4..a55753a 100644
 --- a/src/configure.ac
 +++ b/src/configure.ac
 @@ -29,6 +29,16 @@ dnl in autoconf needs it, where it uses STDC_HEADERS.
@@ -58,7 +58,7 @@ index ea4df8f..da97804 100644
  
  AC_MSG_CHECKING(--enable-fail-if-missing argument)
 diff --git a/src/version.c b/src/version.c
-index f3e5a3a..977942e 100644
+index 8abd96e..f8ac32c 100644
 --- a/src/version.c
 +++ b/src/version.c
 @@ -44,11 +44,17 @@ make_version(void)
diff --git a/debian/patches/upstream/debcontrol.vim-Add-support-for-Build-Depends-Conflicts-Ar.patch b/debian/patches/upstream/debcontrol.vim-Add-support-for-Build-Depends-Conflicts-Ar.patch
deleted file mode 100644
index 547712b..0000000
--- a/debian/patches/upstream/debcontrol.vim-Add-support-for-Build-Depends-Conflicts-Ar.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: James McCoy <jamessan at debian.org>
-Date: Wed, 5 Jul 2017 21:30:44 -0400
-Subject: debcontrol.vim: Add support for Build-(Depends|Conflicts)-Arch
-
-Signed-off-by: James McCoy <jamessan at debian.org>
----
- runtime/syntax/debcontrol.vim | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
-index b1bc9f8..67f2b57 100644
---- a/runtime/syntax/debcontrol.vim
-+++ b/runtime/syntax/debcontrol.vim
-@@ -3,7 +3,7 @@
- " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
- " Former Maintainers: Gerfried Fuchs <alfie at ist.org>
- "                     Wichert Akkerman <wakkerma at debian.org>
--" Last Change: 2016 Aug 30
-+" Last Change: 2017 Jul 05
- " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
- 
- " Standard syntax initialization
-@@ -60,7 +60,7 @@ syn match debcontrolComment "^#.*$" contains=@Spell
- syn case ignore
- 
- " List of all legal keys
--syn match debcontrolKey contained "^\%(Source\|Package\|Section\|Priority\|\%(XSBC-Original-\)\=Maintainer\|Uploaders\|Build-\%(Conflicts\|Depends\)\%(-Indep\)\=\|Standards-Version\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Essential\|Architecture\|Multi-Arch\|Description\|Bugs\|Origin\|X[SB]-Python-Version\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|\%(XC-\)\=Package-Type\): *"
-+syn match debcontrolKey contained "^\%(Source\|Package\|Section\|Priority\|\%(XSBC-Original-\)\=Maintainer\|Uploaders\|Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|Standards-Version\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Essential\|Architecture\|Multi-Arch\|Description\|Bugs\|Origin\|X[SB]-Python-Version\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|\%(XC-\)\=Package-Type\): *"
- 
- syn match debcontrolDeprecatedKey contained "^\%(\%(XS-\)\=DM-Upload-Allowed\): *"
- 
-@@ -80,7 +80,7 @@ syn region debcontrolStrictField start="^\%(XS-\)\=DM-Upload-Allowed" end="$" co
- 
- " Catch-all for the other legal fields
- syn region debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
--syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
-+syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
- syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment, at Spell
- 
- " Associate our matches and regions with pretty colours
diff --git a/debian/patches/upstream/debcontrol.vim-Add-support-for-Testsuite-field.patch b/debian/patches/upstream/debcontrol.vim-Add-support-for-Testsuite-field.patch
deleted file mode 100644
index 68d14c9..0000000
--- a/debian/patches/upstream/debcontrol.vim-Add-support-for-Testsuite-field.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: James McCoy <jamessan at debian.org>
-Date: Fri, 18 Aug 2017 20:59:12 -0400
-Subject: debcontrol.vim: Add support for Testsuite field
-
-Signed-off-by: James McCoy <jamessan at debian.org>
----
- runtime/syntax/debcontrol.vim | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
-index afb68c9..1131c9e 100644
---- a/runtime/syntax/debcontrol.vim
-+++ b/runtime/syntax/debcontrol.vim
-@@ -60,7 +60,7 @@ syn match debcontrolComment "^#.*$" contains=@Spell
- syn case ignore
- 
- " List of all legal keys
--syn match debcontrolKey contained "^\%(Source\|Package\|Section\|Priority\|\%(XSBC-Original-\)\=Maintainer\|Uploaders\|Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|Standards-Version\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Essential\|Architecture\|Multi-Arch\|Description\|Bugs\|Origin\|X[SB]-Python-Version\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|\%(XC-\)\=Package-Type\): *"
-+syn match debcontrolKey contained "^\%(Source\|Package\|Section\|Priority\|\%(XSBC-Original-\)\=Maintainer\|Uploaders\|Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|Standards-Version\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Essential\|Architecture\|Multi-Arch\|Description\|Bugs\|Origin\|X[SB]-Python-Version\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|\%(XC-\)\=Package-Type\|\%(XS-\)\=Testsuite\): *"
- 
- syn match debcontrolDeprecatedKey contained "^\%(\%(XS-\)\=DM-Upload-Allowed\): *"
- 
-@@ -79,7 +79,7 @@ syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Git" end="$" contains=deb
- syn region debcontrolStrictField start="^\%(XS-\)\=DM-Upload-Allowed" end="$" contains=debcontrolDeprecatedKey,debcontrolDmUpload oneline
- 
- " Catch-all for the other legal fields
--syn region debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
-+syn region debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\|\%(XS-\)\=Testsuite\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
- syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
- syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment, at Spell
- 
diff --git a/debian/patches/upstream/debcontrol.vim-Fix-highlighting-of-javascript-in-debcontr.patch b/debian/patches/upstream/debcontrol.vim-Fix-highlighting-of-javascript-in-debcontr.patch
deleted file mode 100644
index 67a4c2a..0000000
--- a/debian/patches/upstream/debcontrol.vim-Fix-highlighting-of-javascript-in-debcontr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: James McCoy <jamessan at debian.org>
-Date: Wed, 5 Jul 2017 21:32:20 -0400
-Subject: debcontrol.vim: Fix highlighting of javascript in debcontrolSection
-
-Matches can't overlap, so the earlier "java" match blocks "javascript".
-Making "script" an optional suffix, instead of an alternation, fixes the
-matching.
-
-Signed-off-by: James McCoy <jamessan at debian.org>
----
- runtime/syntax/debcontrol.vim | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
-index 67f2b57..b50bfff 100644
---- a/runtime/syntax/debcontrol.vim
-+++ b/runtime/syntax/debcontrol.vim
-@@ -38,7 +38,7 @@ unlet s:kernels s:archs s:pairs
- syn match debcontrolMultiArch contained "\%(no\|foreign\|allowed\|same\)"
- syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
- syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
--syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java|javascript|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|rust|science|shells| [...]
-+syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java%(script)=|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|rust|science|shells|s [...]
- syn match debcontrolPackageType contained "u\?deb"
- syn match debcontrolVariable contained "\${.\{-}}"
- syn match debcontrolDmUpload contained "\cyes"
diff --git a/debian/patches/upstream/debcontrol.vim-Treat-tabs-as-valid-whitespace.patch b/debian/patches/upstream/debcontrol.vim-Treat-tabs-as-valid-whitespace.patch
deleted file mode 100644
index 31b72e1..0000000
--- a/debian/patches/upstream/debcontrol.vim-Treat-tabs-as-valid-whitespace.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: James McCoy <jamessan at debian.org>
-Date: Fri, 18 Aug 2017 20:45:23 -0400
-Subject: debcontrol.vim: Treat tabs as valid whitespace
-
-Signed-off-by: James McCoy <jamessan at debian.org>
----
- runtime/syntax/debcontrol.vim | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
-index b50bfff..afb68c9 100644
---- a/runtime/syntax/debcontrol.vim
-+++ b/runtime/syntax/debcontrol.vim
-@@ -3,7 +3,7 @@
- " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
- " Former Maintainers: Gerfried Fuchs <alfie at ist.org>
- "                     Wichert Akkerman <wakkerma at debian.org>
--" Last Change: 2017 Jul 05
-+" Last Change: 2017 Aug 18
- " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
- 
- " Standard syntax initialization
-@@ -21,8 +21,8 @@ syn case match
- syn match debcontrolElse "^.*$"
- 
- " Common seperators
--syn match debControlComma ", *"
--syn match debControlSpace " "
-+syn match debControlComma ",[ \t]*"
-+syn match debControlSpace "[ \t]"
- 
- let s:kernels = '\%(linux\|hurd\|kfreebsd\|knetbsd\|kopensolaris\|netbsd\)'
- let s:archs = '\%(alpha\|amd64\|armeb\|armel\|armhf\|arm64\|avr32\|hppa\|i386'
-@@ -80,8 +80,8 @@ syn region debcontrolStrictField start="^\%(XS-\)\=DM-Upload-Allowed" end="$" co
- 
- " Catch-all for the other legal fields
- syn region debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
--syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
--syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment, at Spell
-+syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
-+syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment, at Spell
- 
- " Associate our matches and regions with pretty colours
- hi def link debcontrolKey           Keyword

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git

More information about the pkg-vim-maintainers mailing list