From a58699957fa8928c8fd2d33d1877a48b71d6d76f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 15 Jan 2014 14:09:00 +0000 Subject: [PATCH] Update clang-format declaration from 3.4 => 3.5 Closes upstream bug #18451 --- debian/changelog | 6 ++++++ debian/patches/clang-format-version.diff | 6 +++--- debian/patches/python-clangpath.diff | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 06362b00..3d936f80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:3.5~svn197556-2) unstable; urgency=low + + * Update clang-format declaration from 3.4 => 3.5 Closes upstream bug #18451 + + -- Sylvestre Ledru Wed, 15 Jan 2014 15:08:03 +0100 + llvm-toolchain-snapshot (1:3.5~svn197556-1) unstable; urgency=low * New snapshot release diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 73ec3444..89b7864f 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-form # Change this to the full path if clang-format is not on the path. -binary = 'clang-format' -+binary = 'clang-format-3.4' ++binary = 'clang-format-3.5' # 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 @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-form # Change this to the full path if clang-format is not on the path. -binary = 'clang-format' -+binary = 'clang-format-3.4' ++binary = 'clang-format-3.5' def main(): @@ -33,7 +33,7 @@ Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-form ;; *Location of the clang-format binary. If it is on your PATH, a full path name ;; need not be specified. -(defvar clang-format-binary "clang-format") -+(defvar clang-format-binary "clang-format-3.4") ++(defvar clang-format-binary "clang-format-3.5") (defun clang-format-region () "Use clang-format to format the currently active region." diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 8fb48ff7..459baadc 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/bindings/python/clang/cindex. file = 'libclang.dll' else: - file = 'libclang.so' -+ file = 'libclang-3.3.so' ++ file = 'libclang-3.5.so' if Config.library_path: file = Config.library_path + '/' + file