summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 22:10:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 22:10:10 +0000
commit0232521fd51b8064682052cf43111679391981db (patch)
treef7125b030965319420546e4c82ceb435da1330a6
parentMerging upstream version 2:8.1.0229. (diff)
downloadvim-0232521fd51b8064682052cf43111679391981db.zip
vim-0232521fd51b8064682052cf43111679391981db.tar.xz
Merging debian version 2:8.1.0229-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog21
-rw-r--r--debian/changelog.upstream140
-rw-r--r--debian/control8
-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.patch12
-rw-r--r--debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch28
-rwxr-xr-xdebian/rules59
-rw-r--r--debian/vim-common.dirs7
-rw-r--r--debian/vim-common.install.in23
-rw-r--r--debian/vim-common.links18
-rw-r--r--debian/vim-common.links.in4
-rw-r--r--debian/vim-gui-common.dirs9
-rw-r--r--debian/vim-gui-common.install9
-rw-r--r--debian/vim-gui-common.install.in4
-rw-r--r--debian/vim-gui-common.links31
-rw-r--r--debian/vim-gui-common.links.in5
-rw-r--r--debian/vim-runtime.dirs7
-rw-r--r--debian/vim-runtime.install10
-rw-r--r--debian/vim-runtime.install.in4
19 files changed, 316 insertions, 87 deletions
diff --git a/debian/changelog b/debian/changelog
index cb14cf2..c1b3461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+vim (2:8.1.0229-1) unstable; urgency=medium
+
+ [ upstream ]
+ * Unicode 11 support
+ * New options ('vartabstop'/'varsofttabstop') to define variable width tab
+ stops.
+ * Danish translation
+
+ [ James McCoy ]
+ * Change "Compiled by" string to team+vim@tracker.d.o
+ * rules:
+ + Only run scratch target, not distclean, in autoconf-stamp to avoid FTBFS
+ with parallel builds.
+ + Allow defining VARIANT from the environment. Thanks to Guillem Jover
+ for the suggestion (Closes: #903927)
+ * Change vim-python Provides to vim-python3. While Vim only supports py2 or
+ py3, Neovim supports both so the change in provides allows
+ python(3)-neovim to differentiate the supported Python version.
+
+ -- James McCoy <jamessan@debian.org> Thu, 02 Aug 2018 21:44:43 -0400
+
vim (2:8.1.0089-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index d47d775..a430c62 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -113,3 +113,143 @@ Individual patches for Vim 8.1:
6792 8.1.0087 v:shell_error is always zero when using terminal for "!cmd"
2126 8.1.0088 terminal test for stdout and stderr is a bit flaky
5766 8.1.0089 error when ending the terminal debugger
+ 4270 8.1.0090 "..." used inconsistently in a message
+ 10822 8.1.0091 MS-Windows: Cannot interrupt gdb when program is running
+ 1512 8.1.0092 (after 8.1.0091) prompt buffer test fails
+ 2187 8.1.0093 non-MS-Windows: Cannot interrupt gdb when program is running
+ 1399 8.1.0094 help text "usage:" is not capatalized
+ 2373 8.1.0095 dialog for ":browse tabnew" says "new window"
+ 4382 8.1.0096 inconsistent use of the word autocommands
+ 1805 8.1.0097 superfluous space before exclamation mark
+ 9705 8.1.0098 segfault when pattern with \z() is very slow
+ 1924 8.1.0099 exclamation mark in error message not needed
+ 1595 8.1.0100 terminal debugger: error when setting a watch point
+ 1769 8.1.0101 no test for getcmdwintype()
+ 1557 8.1.0102 cannot build without syntax highlighting
+ 5682 8.1.0103 long version string cannot be translated
+ 1709 8.1.0104 can't build without the +eval feature
+ 91953 8.1.0105 all tab stops are the same
+ 1471 8.1.0106 build fails when HAVE_DATE_TIME is undefined
+ 2523 8.1.0107 Python: getting buffer option clears message
+206793 8.1.0108 no Danish translations
+ 1365 8.1.0109 new po makefile missing from distribution
+ 2466 8.1.0110 file name not displayed with ":file"
+ 4914 8.1.0111 .po files do not use recommended names
+ 4681 8.1.0112 no error when using bad arguments with searchpair()
+ 1508 8.1.0113 compiler warning for unused variable
+ 6304 8.1.0114 confusing variable name
+ 1961 8.1.0115 the matchparen plugin may throw an error
+ 2800 8.1.0116 display problem with 'vartabstop' and 'linebreak'
+ 1760 8.1.0117 URL in install program still points to SourceForge
+ 4245 8.1.0118 duplicate error message for put command
+ 1948 8.1.0119 failing test goes unnoticed because messages is not written
+ 5855 8.1.0120 buffer 'modified' set even when :sort has no changes
+ 4713 8.1.0121 crash when using ballooneval related to 'vartabstop'
+ 1658 8.1.0122 translators don't always understand the maintainer message
+ 1718 8.1.0123 MS-Windows: colors are wrong after setting 'notgc'
+ 1597 8.1.0124 has('vcon') returns true even for non-win32 terminal
+ 4884 8.1.0125 virtual edit replace with multi-byte fails at end of line
+ 6119 8.1.0126 various problems with 'vartabstop'
+ 1817 8.1.0127 build failure when disabling the session feature
+ 13345 8.1.0128 building with MinGW does not work out-of-the-box
+ 1716 8.1.0129 still some xterm-like terminals get a stray "p"
+ 5062 8.1.0130 ":profdel func" does not work if func was called already
+ 7164 8.1.0131 :profdel is not tested
+ 21355 8.1.0132 lua tests are old style
+ 3994 8.1.0133 tagfiles() can have duplicate entries
+ 18460 8.1.0134 Lua interface does not support funcref
+ 2589 8.1.0135 undo message delays screen update for CTRL-O u
+ 9996 8.1.0136 Lua tests don't cover new features
+ 8177 8.1.0137 CI does not run with TCL
+ 4761 8.1.0138 negative value of 'softtabstop' not used correctly
+ 3091 8.1.0139 Lua tests fail on some platforms
+ 2895 8.1.0140 recording into a register has focus events
+ 15890 8.1.0141 :cexpr no longer jumps to the first error
+ 4578 8.1.0142 xterm and vt320 builtin termcap missing keypad keys
+ 6351 8.1.0143 matchit and matchparen don't handle E363
+ 2728 8.1.0144 the :cd command does not have good test coverage
+ 2327 8.1.0145 test with grep is failing on MS-Windows
+ 1367 8.1.0146 when $LANG is set the compiler test may fail
+ 3044 8.1.0147 compiler warning when building with Python 3.7
+ 1512 8.1.0148 memory leak when using :tcl expr command
+ 6889 8.1.0149 session is wrong with multiple tabs when :lcd was used
+ 22149 8.1.0150 insufficient test coverage for Tcl
+ 1593 8.1.0151 mksession test fails on MS-Windows
+ 11431 8.1.0152 cannot easily run individual tests on MS-Windows
+ 1970 8.1.0153 (after 8.1.0152) build with SHADOWDIR fails
+ 3833 8.1.0154 crash with "set smarttab shiftwidth=0 softtabstop=-1"
+ 1273 8.1.0155 evim.man missing from the distribution
+ 1574 8.1.0156 MS-Windows compiler warning
+ 2144 8.1.0157 old iTerm2 is not recognized, resulting in stray output
+ 1647 8.1.0158 GUI: input() fails if CTRL-C was pressed before
+ 2569 8.1.0159 completion for user names does not work for a prefix.
+ 1361 8.1.0160 no Danish manual translations
+ 3923 8.1.0161 buffer not updated with 'autoread' set if file was deleted
+ 6881 8.1.0162 Danish and German man pages are not installed
+ 6408 8.1.0163 insufficient testing for Tcl
+ 2724 8.1.0164 luaeval('vim.buffer().name') returns an error
+ 3898 8.1.0165 :clist output can be very long
+ 38155 8.1.0166 using dict_add_nr_str() is clumsy
+ 5740 8.1.0167 lock flag in new dictitem is reset in many places
+ 4177 8.1.0168 output of :marks is too short with multi-byte chars
+ 4184 8.1.0169 calling message_filtered() a bit too often
+ 9933 8.1.0170 invalid memory use with complicated pattern
+ 3250 8.1.0171 typing CTRL-W n in a terminal window causes ml_get error
+ 1771 8.1.0172 'viminfofile' option does not behave like a file name
+ 1429 8.1.0173 compiler warning on MS-Windows
+ 3944 8.1.0174 after paging up and down fold line is wrong
+ 1934 8.1.0175 marks test fails in very wide window
+ 1599 8.1.0176 overlapping string argument for strcpy()
+ 4584 8.1.0177 defining function in sandbox is inconsistent
+ 1431 8.1.0178 warning for passing pointer to non-pointer argument
+ 1857 8.1.0179 redundant condition for boundary check
+ 4435 8.1.0180 static analysis errors in Lua interface
+ 1921 8.1.0181 memory leak with trailing characters in skip expression
+ 9703 8.1.0182 Unicode standard was updated
+ 3966 8.1.0183 Lua API changed, breaking the build
+ 4488 8.1.0184 not easy to figure out the window layout
+ 4643 8.1.0185 running tests writes lua.vim even though it is not used
+ 2592 8.1.0186 test for getwininfo() fails in GUI
+ 9073 8.1.0187 getwininfo() and win_screenpos() return different numbers
+ 1963 8.1.0188 no test for ":cscope add"
+ 1688 8.1.0189 function defined in sandbox not tested
+ 6411 8.1.0190 Perl refcounts are wrong
+ 1565 8.1.0191 Perl test fails in 24 line terminal
+112175 8.1.0192 executing regexp recursively fails with a crash
+ 1805 8.1.0193 terminal debugger buttons don't always work
+ 2862 8.1.0194 possibly use of NULL pointer
+ 1809 8.1.0195 terminal debugger commands don't always work
+ 2085 8.1.0196 terminal debugger error with .gdbinit file
+ 2341 8.1.0197 Windows GUI: title for search/replace is wrong
+ 2382 8.1.0198 there is no hint that syntax is disabled for 'redrawtime'
+ 1487 8.1.0199 spellbadword() does not check for caps error
+ 3017 8.1.0200 spellbadword() not tested
+ 11749 8.1.0201 newer Python uses "importlib" instead of "imp"
+ 2036 8.1.0202 :version always shows +packages
+ 3913 8.1.0203 building with Perl 5.28 fails on Windows
+ 2093 8.1.0204 inputlist() is not tested
+ 6691 8.1.0205 invalid memory access with invalid modeline
+ 2828 8.1.0206 duplicate test function name
+ 2260 8.1.0207 need many menu translation files to cover regions
+ 1379 8.1.0208 file left behind after running individual test
+ 3024 8.1.0209 stderr output from Ruby messes up display
+ 2831 8.1.0210 still a few K&R function declarations
+ 7061 8.1.0211 expanding a file name "~" results in $HOME
+ 7545 8.1.0212 preferred cursor column not set in interfaces
+ 5556 8.1.0213 CTRL-W CR does not work properly in a quickfix window
+ 1925 8.1.0214 +autochdir feature not reported by has() or :version
+ 2582 8.1.0215 no error if configure --with-x cannot configure X
+ 2392 8.1.0216 part of file not indented properly
+ 2403 8.1.0217 compiler warning for variable set but not used
+ 6928 8.1.0218 cannot add matches to another window
+ 1963 8.1.0219 expanding ## fails to escape backtick
+ 2311 8.1.0220 Ruby converts v:true and v:false to a number
+ 14127 8.1.0221 not enough testing for the Ruby interface
+ 5102 8.1.0222 errors are reported for "make install"
+ 4387 8.1.0223 completing shell command finds sub-directories in $PATH
+ 3118 8.1.0224 hang in bracketed paste mode when t_PE not encountered
+ 5657 8.1.0225 mode() does not indicate using CTRL-O from Insert mode
+ 28724 8.1.0226 too many #ifdefs
+ 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
diff --git a/debian/control b/debian/control
index ccb714c..c6cace6 100644
--- a/debian/control
+++ b/debian/control
@@ -170,7 +170,7 @@ Provides:
vim,
vim-lua,
vim-perl,
- vim-python,
+ vim-python3,
vim-ruby,
vim-tcl,
Description: Vi IMproved - enhanced vi editor - with GTK2 GUI
@@ -202,7 +202,7 @@ Provides:
vim,
vim-lua,
vim-perl,
- vim-python,
+ vim-python3,
${vim:Ruby-Provides},
vim-tcl,
Description: Vi IMproved - enhanced vi editor - with GTK3 GUI
@@ -230,7 +230,7 @@ Provides:
vim,
vim-lua,
vim-perl,
- vim-python,
+ vim-python3,
vim-ruby,
vim-tcl,
Description: Vi IMproved - enhanced vi editor - with scripting languages support
@@ -260,7 +260,7 @@ Provides:
vim,
vim-lua,
vim-perl,
- vim-python,
+ vim-python3,
vim-ruby,
vim-tcl,
Description: Vi IMproved - enhanced vi editor - with Athena GUI
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 126ecfb..36111e2 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 d37fa64..e1133d5 100644
+index 8645c47..ea3fcbe 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
-@@ -5303,7 +5303,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5308,7 +5308,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 3d17030..b970501 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 c741fc4..a903e0d 100644
+index f677066..69b343b 100644
--- a/src/main.c
+++ b/src/main.c
-@@ -1773,6 +1773,10 @@ parse_command_name(mparm_T *parmp)
+@@ -1775,6 +1775,10 @@ parse_command_name(mparm_T *parmp)
}
else if (STRNICMP(initstr, "vim", 3) == 0)
initstr += 3;
@@ -31,7 +31,7 @@ index c741fc4..a903e0d 100644
/* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
if (STRICMP(initstr, "diff") == 0)
-@@ -3016,7 +3020,12 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3018,7 +3022,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 c741fc4..a903e0d 100644
#endif
#ifdef MACOS_X
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
-@@ -3051,6 +3060,9 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3053,6 +3062,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 4146529..465153a 100644
# define SYS_VIMRC_FILE "$VIM/vimrc"
#endif
diff --git a/src/structs.h b/src/structs.h
-index 56fcf67..2129784 100644
+index ec109eb..23832ab 100644
--- a/src/structs.h
+++ b/src/structs.h
-@@ -3373,6 +3373,9 @@ typedef struct
+@@ -3381,6 +3381,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 696f1ef..1b1e038 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
@@ -19,8 +19,8 @@ preprocessor's __DATE__/__TIME__ symbols will be used.
---
src/config.h.in | 3 +++
src/configure.ac | 10 ++++++++++
- src/version.c | 6 ++++++
- 3 files changed, 19 insertions(+)
+ src/version.c | 8 ++++++++
+ 3 files changed, 21 insertions(+)
diff --git a/src/config.h.in b/src/config.h.in
index 00117cf..76d1c08 100644
@@ -37,7 +37,7 @@ index 00117cf..76d1c08 100644
#undef HAVE_ATTRIBUTE_UNUSED
diff --git a/src/configure.ac b/src/configure.ac
-index 107c170..ea6c877 100644
+index 0d8ea32..924261b 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -62,6 +62,16 @@ if test x"$ac_cv_prog_cc_c99" != xno; then
@@ -58,10 +58,10 @@ index 107c170..ea6c877 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index d49516e..312ac17 100644
+index 5f7d908..b1fc138 100644
--- a/src/version.c
+++ b/src/version.c
-@@ -44,11 +44,17 @@ make_version(void)
+@@ -44,9 +44,13 @@ init_longVersion(void)
* VAX C can't catenate strings in the preprocessor.
*/
strcpy(longVersion, VIM_VERSION_LONG_DATE);
@@ -74,8 +74,16 @@ index d49516e..312ac17 100644
+#endif
strcat(longVersion, ")");
}
-+# elif defined(BUILD_DATE)
-+char *longVersion = VIM_VERSION_LONG_DATE BUILD_DATE ")";
- # else
- char *longVersion = VIM_VERSION_LONG_DATE __DATE__ " " __TIME__ ")";
- # endif
+
+@@ -54,7 +58,11 @@ init_longVersion(void)
+ void
+ init_longVersion(void)
+ {
++#ifdef BUILD_DATE
++ char *date_time = BUILD_DATE;
++#else
+ char *date_time = __DATE__ " " __TIME__;
++#endif
+ char *msg = _("%s (%s, compiled %s)");
+ size_t len = strlen(msg)
+ + strlen(VIM_VERSION_LONG_ONLY)
diff --git a/debian/rules b/debian/rules
index 8a612c4..ecf11d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEB_BUILD_MAINT_OPTIONS=hardening=+all,-fortify
include /usr/share/dpkg/default.mk
DEB_VENDOR := Debian
-BUILDER := pkg-vim-maintainers@lists.alioth.debian.org
+BUILDER := team+vim@tracker.debian.org
MAKETEST := no
ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
@@ -118,7 +118,7 @@ VARIANTS+=vim-athena
VARIANTS+=vim-nox
VARIANTS+=vim-basic
-ifeq ($(origin VARIANT), command line)
+ifneq ($(origin VARIANT), undefined)
VARIANTS = $(VARIANT) vim-basic
endif
@@ -145,13 +145,9 @@ NAME:=vim
VERSION:=$(basename $(DEB_VERSION_UPSTREAM))
VIMCUR:=$(NAME)$(subst .,,$(VERSION))
PER_VARIANT_FILES := install postinst prerm lintian-overrides maintscript
-LANGS := fr it pl ru ja
+LANGS := da de fr it ja pl ru
DOT_IN_DEPS := debian/vim-common.install
-DOT_IN_DEPS += debian/vim-common.links
-DOT_IN_DEPS += debian/vim-gui-common.install
-DOT_IN_DEPS += debian/vim-gui-common.links
-DOT_IN_DEPS += debian/vim-runtime.install
DOT_IN_DEPS += debian/vim-runtime.links
DOT_IN_DEPS += debian/vim-runtime.postrm
DOT_IN_DEPS += debian/vim-runtime.preinst
@@ -241,7 +237,7 @@ autoconf-stamp:
# in the same directory at the same time instead of in their own shadow
# directories.
$(MAKE) -C src autoconf
- $(MAKE) distclean
+ $(MAKE) -C src scratch
touch $@
configure-stamp-%: SHADOWDIR=$*
@@ -251,7 +247,6 @@ configure-stamp-%: autoconf-stamp
dh_testdir
@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
$(MAKE) -C src shadow SHADOWDIR=$(SHADOWDIR)
- if test -f src/auto/config.cache; then make distclean; fi
cd src/$(SHADOWDIR) && LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
touch $@
@@ -308,19 +303,6 @@ install-stamp-indep: build-stamp-vim-basic build-stamp-indep $(DOT_IN_DEPS)
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 \
- echo debian/tmp/usr/share/man/$$L/man1/vimtutor.1 \
- usr/share/man/$$L/man1/ >>debian/vim-runtime.install; \
- for f in vim vimdiff; do \
- echo debian/tmp/usr/share/man/$$L/man1/$$f.1 \
- usr/share/man/$$L/man1/ >>debian/vim-common.install; \
- done; \
- 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; \
@@ -342,26 +324,16 @@ install-stamp-indep: build-stamp-vim-basic build-stamp-indep $(DOT_IN_DEPS)
cp debian/vim-runtime/usr/share/man/man1/vimtutor.1 \
debian/vim-gui-common/usr/share/man/man1/gvimtutor.1
for L in $(LANGS); do \
- cp debian/vim-common/usr/share/man/$$L/man1/vim.1 \
- debian/vim-gui-common/usr/share/man/$$L/man1/gvim.1; \
- cp debian/vim-common/usr/share/man/$$L/man1/vimdiff.1 \
- debian/vim-gui-common/usr/share/man/$$L/man1/gvimdiff.1; \
- cp debian/vim-runtime/usr/share/man/$$L/man1/vimtutor.1 \
- debian/vim-gui-common/usr/share/man/$$L/man1/gvimtutor.1; \
- done
- # Generate language-specific sections of
- # vim-{runtime,common,gui-common}.links files
- for L in $(LANGS); do \
- for p in rvim rview; do \
- echo usr/share/man/$$L/man1/vim.1 \
- usr/share/man/$$L/man1/$$p.1 >>debian/vim-common.links; \
- done; \
- for p in gview rgvim rgview; do \
- echo usr/share/man/$$L/man1/gvim.1 \
- usr/share/man/$$L/man1/$$p.1 >>debian/vim-gui-common.links; \
- done; \
- echo usr/share/man/$$L/man1/evim.1 \
- usr/share/man/$$L/man1/eview.1 >>debian/vim-gui-common.links; \
+ DIR=usr/share/man/$$L; \
+ [ ! -e "debian/vim-common/$$DIR/man1/vim.1" ] || \
+ cp debian/vim-common/$$DIR/man1/vim.1 \
+ debian/vim-gui-common/$$DIR/man1/gvim.1; \
+ [ ! -e "debian/vim-common/$$DIR/man1/vimdiff.1" ] || \
+ cp debian/vim-common/$$DIR/man1/vimdiff.1 \
+ debian/vim-gui-common/$$DIR/man1/gvimdiff.1; \
+ [ ! -e "debian/vim-runtime/$$DIR/man1/vimtutor.1" ] || \
+ cp debian/vim-runtime/$$DIR/man1/vimtutor.1 \
+ debian/vim-gui-common/$$DIR/man1/gvimtutor.1; \
done
dh_link
dh_installman
@@ -378,6 +350,9 @@ install-stamp-xxd: build-stamp-xxd
$(MAKE) -C src/vim-basic STRIP=: DESTDIR=$(DESTDIR) installtools install-tool-languages
rm -r $(DESTDIR)/usr/share/vim
$(munge-man-directories)
+ # No xxd.1 translations for Danish or German yet
+ rmdir $(DESTDIR)/usr/share/man/da/man1 $(DESTDIR)/usr/share/man/da \
+ $(DESTDIR)/usr/share/man/de/man1 $(DESTDIR)/usr/share/man/de
dh_installchangelogs
dh_installdocs
touch $@
diff --git a/debian/vim-common.dirs b/debian/vim-common.dirs
index 44893ee..8d30e0d 100644
--- a/debian/vim-common.dirs
+++ b/debian/vim-common.dirs
@@ -5,5 +5,12 @@
/usr/share/icons/hicolor/scalable/apps/
/usr/share/icons/locolor/16x16/apps/
/usr/share/icons/locolor/32x32/apps/
+/usr/share/man/da/man1/
+/usr/share/man/fr/man1/
+/usr/share/man/it/man1/
+/usr/share/man/ja/man1/
+/usr/share/man/man1/
+/usr/share/man/pl/man1/
+/usr/share/man/ru/man1/
/usr/share/pixmaps/
/var/lib/vim/addons/
diff --git a/debian/vim-common.install.in b/debian/vim-common.install.in
index 32f2079..79abeaa 100644
--- a/debian/vim-common.install.in
+++ b/debian/vim-common.install.in
@@ -1,7 +1,20 @@
debian/helpztags usr/bin/
-debian/runtime/vimrc etc/vim/
debian/runtime/debian.vim usr/share/vim/@VIMCUR@/
-debian/tmp/usr/share/applications/vim.desktop usr/share/applications
-debian/tmp/usr/share/icons/
-debian/tmp/usr/share/man/man1/vimdiff.1 usr/share/man/man1/
-debian/tmp/usr/share/man/man1/vim.1 usr/share/man/man1/
+debian/runtime/vimrc etc/vim/
+usr/share/applications/vim.desktop
+usr/share/icons/
+usr/share/man/da/man1/vim.1
+usr/share/man/da/man1/vimdiff.1
+usr/share/man/de/man1/vim.1
+usr/share/man/fr/man1/vim.1
+usr/share/man/fr/man1/vimdiff.1
+usr/share/man/it/man1/vim.1
+usr/share/man/it/man1/vimdiff.1
+usr/share/man/ja/man1/vim.1
+usr/share/man/ja/man1/vimdiff.1
+usr/share/man/man1/vim.1
+usr/share/man/man1/vimdiff.1
+usr/share/man/pl/man1/vim.1
+usr/share/man/pl/man1/vimdiff.1
+usr/share/man/ru/man1/vim.1
+usr/share/man/ru/man1/vimdiff.1
diff --git a/debian/vim-common.links b/debian/vim-common.links
new file mode 100644
index 0000000..d7cd599
--- /dev/null
+++ b/debian/vim-common.links
@@ -0,0 +1,18 @@
+etc/vim usr/share/vim/vimfiles
+etc/vim/vimrc usr/share/vim/vimrc
+usr/share/man/da/man1/vim.1 usr/share/man/da/man1/rview.1
+usr/share/man/da/man1/vim.1 usr/share/man/da/man1/rvim.1
+usr/share/man/de/man1/vim.1 usr/share/man/de/man1/rview.1
+usr/share/man/de/man1/vim.1 usr/share/man/de/man1/rvim.1
+usr/share/man/fr/man1/vim.1 usr/share/man/fr/man1/rview.1
+usr/share/man/fr/man1/vim.1 usr/share/man/fr/man1/rvim.1
+usr/share/man/it/man1/vim.1 usr/share/man/it/man1/rview.1
+usr/share/man/it/man1/vim.1 usr/share/man/it/man1/rvim.1
+usr/share/man/ja/man1/vim.1 usr/share/man/ja/man1/rview.1
+usr/share/man/ja/man1/vim.1 usr/share/man/ja/man1/rvim.1
+usr/share/man/man1/vim.1 usr/share/man/man1/rview.1
+usr/share/man/man1/vim.1 usr/share/man/man1/rvim.1
+usr/share/man/pl/man1/vim.1 usr/share/man/pl/man1/rview.1
+usr/share/man/pl/man1/vim.1 usr/share/man/pl/man1/rvim.1
+usr/share/man/ru/man1/vim.1 usr/share/man/ru/man1/rview.1
+usr/share/man/ru/man1/vim.1 usr/share/man/ru/man1/rvim.1
diff --git a/debian/vim-common.links.in b/debian/vim-common.links.in
deleted file mode 100644
index de4d95c..0000000
--- a/debian/vim-common.links.in
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/vim usr/share/vim/vimfiles
-etc/vim/vimrc usr/share/vim/vimrc
-usr/share/man/man1/vim.1 usr/share/man/man1/rvim.1
-usr/share/man/man1/vim.1 usr/share/man/man1/rview.1
diff --git a/debian/vim-gui-common.dirs b/debian/vim-gui-common.dirs
index 9bde2d0..9ed0431 100644
--- a/debian/vim-gui-common.dirs
+++ b/debian/vim-gui-common.dirs
@@ -1,4 +1,11 @@
/etc/
/usr/bin/
/usr/share/applications/
-/usr/share/man/man1
+/usr/share/man/da/man1/
+/usr/share/man/de/man1/
+/usr/share/man/fr/man1/
+/usr/share/man/it/man1/
+/usr/share/man/ja/man1/
+/usr/share/man/man1/
+/usr/share/man/pl/man1/
+/usr/share/man/ru/man1/
diff --git a/debian/vim-gui-common.install b/debian/vim-gui-common.install
new file mode 100644
index 0000000..3d4b727
--- /dev/null
+++ b/debian/vim-gui-common.install
@@ -0,0 +1,9 @@
+debian/runtime/gvimrc etc/vim/
+usr/bin/gvimtutor
+usr/share/applications/gvim.desktop
+usr/share/man/fr/man1/evim.1
+usr/share/man/it/man1/evim.1
+usr/share/man/ja/man1/evim.1
+usr/share/man/man1/evim.1
+usr/share/man/pl/man1/evim.1
+usr/share/man/ru/man1/evim.1
diff --git a/debian/vim-gui-common.install.in b/debian/vim-gui-common.install.in
deleted file mode 100644
index 70d50cc..0000000
--- a/debian/vim-gui-common.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/bin/gvimtutor usr/bin/
-debian/runtime/gvimrc etc/vim/
-debian/tmp/usr/share/applications/gvim.desktop usr/share/applications/
-debian/tmp/usr/share/man/man1/evim.1 usr/share/man/man1/
diff --git a/debian/vim-gui-common.links b/debian/vim-gui-common.links
new file mode 100644
index 0000000..3f41f78
--- /dev/null
+++ b/debian/vim-gui-common.links
@@ -0,0 +1,31 @@
+etc/vim/gvimrc usr/share/vim/gvimrc
+usr/share/man/da/man1/gvim.1 usr/share/man/da/man1/gview.1
+usr/share/man/da/man1/gvim.1 usr/share/man/da/man1/rgview.1
+usr/share/man/da/man1/gvim.1 usr/share/man/da/man1/rgvim.1
+usr/share/man/de/man1/gvim.1 usr/share/man/de/man1/gview.1
+usr/share/man/de/man1/gvim.1 usr/share/man/de/man1/rgview.1
+usr/share/man/de/man1/gvim.1 usr/share/man/de/man1/rgvim.1
+usr/share/man/fr/man1/evim.1 usr/share/man/fr/man1/eview.1
+usr/share/man/fr/man1/gvim.1 usr/share/man/fr/man1/gview.1
+usr/share/man/fr/man1/gvim.1 usr/share/man/fr/man1/rgview.1
+usr/share/man/fr/man1/gvim.1 usr/share/man/fr/man1/rgvim.1
+usr/share/man/it/man1/evim.1 usr/share/man/it/man1/eview.1
+usr/share/man/it/man1/gvim.1 usr/share/man/it/man1/gview.1
+usr/share/man/it/man1/gvim.1 usr/share/man/it/man1/rgview.1
+usr/share/man/it/man1/gvim.1 usr/share/man/it/man1/rgvim.1
+usr/share/man/ja/man1/evim.1 usr/share/man/ja/man1/eview.1
+usr/share/man/ja/man1/gvim.1 usr/share/man/ja/man1/gview.1
+usr/share/man/ja/man1/gvim.1 usr/share/man/ja/man1/rgview.1
+usr/share/man/ja/man1/gvim.1 usr/share/man/ja/man1/rgvim.1
+usr/share/man/man1/evim.1 usr/share/man/man1/eview.1
+usr/share/man/man1/gvim.1 usr/share/man/man1/gview.1
+usr/share/man/man1/gvim.1 usr/share/man/man1/rgview.1
+usr/share/man/man1/gvim.1 usr/share/man/man1/rgvim.1
+usr/share/man/pl/man1/evim.1 usr/share/man/pl/man1/eview.1
+usr/share/man/pl/man1/gvim.1 usr/share/man/pl/man1/gview.1
+usr/share/man/pl/man1/gvim.1 usr/share/man/pl/man1/rgview.1
+usr/share/man/pl/man1/gvim.1 usr/share/man/pl/man1/rgvim.1
+usr/share/man/ru/man1/evim.1 usr/share/man/ru/man1/eview.1
+usr/share/man/ru/man1/gvim.1 usr/share/man/ru/man1/gview.1
+usr/share/man/ru/man1/gvim.1 usr/share/man/ru/man1/rgview.1
+usr/share/man/ru/man1/gvim.1 usr/share/man/ru/man1/rgvim.1
diff --git a/debian/vim-gui-common.links.in b/debian/vim-gui-common.links.in
deleted file mode 100644
index dc9a8cd..0000000
--- a/debian/vim-gui-common.links.in
+++ /dev/null
@@ -1,5 +0,0 @@
-etc/vim/gvimrc usr/share/vim/gvimrc
-usr/share/man/man1/gvim.1 usr/share/man/man1/gview.1
-usr/share/man/man1/gvim.1 usr/share/man/man1/rgvim.1
-usr/share/man/man1/gvim.1 usr/share/man/man1/rgview.1
-usr/share/man/man1/evim.1 usr/share/man/man1/eview.1
diff --git a/debian/vim-runtime.dirs b/debian/vim-runtime.dirs
index 2e04343..b4f9ea8 100644
--- a/debian/vim-runtime.dirs
+++ b/debian/vim-runtime.dirs
@@ -1,3 +1,10 @@
/usr/bin/
+/usr/share/man/da/man1/
+/usr/share/man/fr/man1/
+/usr/share/man/it/man1/
+/usr/share/man/ja/man1/
+/usr/share/man/man1/
+/usr/share/man/pl/man1/
+/usr/share/man/ru/man1/
/usr/share/vim/addons/
/usr/share/vim/registry/
diff --git a/debian/vim-runtime.install b/debian/vim-runtime.install
new file mode 100644
index 0000000..bf2b124
--- /dev/null
+++ b/debian/vim-runtime.install
@@ -0,0 +1,10 @@
+debian/vim-registry/*.yaml usr/share/vim/registry/
+usr/bin/vimtutor
+usr/share/man/da/man1/vimtutor.1
+usr/share/man/fr/man1/vimtutor.1
+usr/share/man/it/man1/vimtutor.1
+usr/share/man/ja/man1/vimtutor.1
+usr/share/man/man1/vimtutor.1
+usr/share/man/pl/man1/vimtutor.1
+usr/share/man/ru/man1/vimtutor.1
+usr/share/vim/
diff --git a/debian/vim-runtime.install.in b/debian/vim-runtime.install.in
deleted file mode 100644
index 962f667..0000000
--- a/debian/vim-runtime.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/bin/vimtutor usr/bin/
-debian/tmp/usr/share/vim/ usr/share/
-debian/tmp/usr/share/man/man1/vimtutor.1 usr/share/man/man1/
-debian/vim-registry/*.yaml usr/share/vim/registry/