[vim] 89/139: patch 7.4.1772 Problem: Installation fails when $GTK_UPDATE_ICON_CACHE is empty. Solution: Add quotes. (Kazunobu Kuriyama)
James McCoy
jamessan at debian.org
Fri May 6 04:00:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch debian/sid
in repository vim.
commit 54a38415caa31de8b4ac46a9234ae339b1fd6255
Author: Bram Moolenaar <Bram at vim.org>
Date: Fri Apr 22 10:14:07 2016 +0200
patch 7.4.1772
Problem: Installation fails when $GTK_UPDATE_ICON_CACHE is empty.
Solution: Add quotes. (Kazunobu Kuriyama)
---
src/Makefile | 4 ++--
src/version.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 69e3a4b..716dae7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2363,7 +2363,7 @@ install-icons:
if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
-a ! -f $(ICON48PATH)/gvim.png; then \
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \
- if test -z "$(DESTDIR)" -a -x $(GTK_UPDATE_ICON_CACHE) \
+ if test -z "$(DESTDIR)" -a -x "$(GTK_UPDATE_ICON_CACHE)" \
-a -w $(ICONTHEMEPATH) \
-a -f $(ICONTHEMEPATH)/index.theme; then \
$(GTK_UPDATE_ICON_CACHE) -q $(ICONTHEMEPATH); \
@@ -2381,7 +2381,7 @@ install-icons:
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
$(SCRIPTSOURCE)/gvim.desktop \
$(DESKTOPPATH); \
- if test -z "$(DESTDIR)" -a -x $(UPDATE_DESKTOP_DATABASE); then \
+ if test -z "$(DESTDIR)" -a -x "$(UPDATE_DESKTOP_DATABASE)"; then \
$(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \
fi \
fi
diff --git a/src/version.c b/src/version.c
index 725d774..77d0117 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1772,
+/**/
1771,
/**/
1770,
--
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