[vim] 02/02: Start changelog for 7.4.2347-1

[James McCoy]

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

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

commit b4bc7d0da10fd70e2c8a0f3e2221c0d9c33cdd01
Author: James McCoy <jamessan at debian.org>
Date:   Thu Sep 8 20:35:51 2016 -0400

    Start changelog for 7.4.2347-1
    
    Also refresh patches.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog                                         |  7 +++++++
 debian/changelog.upstream                                | 16 ++++++++++++++++
 ...ebian-s-decision-to-disable-modelines-by-defaul.patch |  4 ++--
 ...sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch |  4 ++--
 ...-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch |  2 +-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e5ad3f..ad3fdaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vim (2:7.4.2347-1) UNRELEASED; urgency=medium
+
+  [ upstream ]
+  * Fix test failure due to relying on modelines.  (Closes: #837130)
+
+ -- James McCoy <jamessan at debian.org>  Thu, 08 Sep 2016 20:34:26 -0400
+
 vim (2:7.4.2330-1) unstable; urgency=medium
 
   [ upstream ]
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 9dbb405..63e499b 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -2347,3 +2347,19 @@ Individual patches for Vim 7.4:
   2835  7.4.2328  crash when BufWinLeave autocmd goes to another tab page
   2066  7.4.2329  error for min() and max() contains %s
   2321  7.4.2330  coverity complains about not checking curwin to be NULL
+  7305  7.4.2331  C-X C-V in Insert mode fails after entering expression
+ 14165  7.4.2332  crash when stop_timer() usd in callback of a callback
+  3956  7.4.2333  outdated comments in normal mode test
+  1456  7.4.2334  on MS-Windows test_getcwd leaves Xtopdir behind
+  1770  7.4.2335  taglist() is slow
+  1545  7.4.2336  running normal mode tests leave a couple of files behind
+  1623  7.4.2337  taglist() is still slow
+  2185  7.4.2338  (after 7.4.2335) can't build with small features
+  1569  7.4.2339  tab page test fails when run as fake root
+ 11451  7.4.2340  MS-Windows: Building with Ruby uses old version
+  2949  7.4.2341  tiny things; test doesn't clean up properly
+  2306  7.4.2342  typo in MS-Windows build script
+ 17372  7.4.2343  too many old style tests  
+ 33498  7.4.2344  the "Reading from channel output..." message can be unwanted
+ 12381  7.4.2345  (after 7.4.2340) using old versions in MS-Windows makefiles
+  1732  7.4.2346  autocommand test fails when run directly
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 476f1ca..410730e 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 93e2a88..7907118 100644
+index 30ea88d..c84d3ee 100644
 --- a/runtime/doc/options.txt
 +++ b/runtime/doc/options.txt
-@@ -5120,7 +5120,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5121,7 +5121,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 4fd3b0a..07bbd25 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
@@ -60,10 +60,10 @@ index 1070746..0020c58 100644
  # define SYS_VIMRC_FILE "$VIM/vimrc"
  #endif
 diff --git a/src/structs.h b/src/structs.h
-index a44bcec..7598649 100644
+index 2a4284a..d037627 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -3243,6 +3243,9 @@ typedef struct
+@@ -3250,6 +3250,9 @@ typedef struct
  #ifdef FEAT_DIFF
      int		diff_mode;		/* start with 'diff' set */
  #endif
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 4a8985b..fc2c57e 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 c0a60b2..53650eb 100644
  
  AC_MSG_CHECKING(--enable-fail-if-missing argument)
 diff --git a/src/version.c b/src/version.c
-index 42eeaa8..8c1642c 100644
+index 8740a98..ce95ab6 100644
 --- a/src/version.c
 +++ b/src/version.c
 @@ -43,11 +43,17 @@ make_version(void)

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