From 3c0778f311715b72bfd9ea430a324e4abaa8d784 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 4 Nov 2014 12:18:45 +0000 Subject: [PATCH] refresh of the patch --- debian/patches/clang-format-version.diff | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 89b7864f..f5454bec 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -1,21 +1,21 @@ -Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/tools/clang-format/clang-format.py 2013-10-29 12:26:23.002137599 +0100 -+++ llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.py 2013-10-29 12:26:23.002137599 +0100 -@@ -24,7 +24,7 @@ - import vim +--- llvm-toolchain-snapshot_3.6~svn221256.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format.py +@@ -25,7 +25,7 @@ import vim + # set g:clang_format_path to the path to clang-format if it is not on the path # Change this to the full path if clang-format is not on the path. -binary = 'clang-format' -+binary = 'clang-format-3.5' ++binary = 'clang-format-3.6' + if vim.eval('exists("g:clang_format_path")') == "1": + binary = vim.eval('g:clang_format_path') - # Change this to format according to other formatting styles. See the output of - # 'clang-format --help' for a list of supported styles. The default looks for -Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/tools/clang-format/clang-format-diff.py 2013-10-29 12:26:23.002137599 +0100 -+++ llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format-diff.py 2013-10-29 12:26:23.002137599 +0100 -@@ -31,7 +31,7 @@ +--- llvm-toolchain-snapshot_3.6~svn221256.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format-diff.py +@@ -32,7 +32,7 @@ import sys # Change this to the full path if clang-format is not on the path. @@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-form def main(): -Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/tools/clang-format/clang-format.el 2013-10-29 12:26:23.002137599 +0100 -+++ llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.el 2013-10-29 12:26:23.002137599 +0100 +--- llvm-toolchain-snapshot_3.6~svn221256.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_3.6~svn221256/clang/tools/clang-format/clang-format.el @@ -13,7 +13,7 @@ ;; *Location of the clang-format binary. If it is on your PATH, a full path name