Update clang-format declaration from 3.4 => 3.5 Closes upstream bug #18451

This commit is contained in:
Sylvestre Ledru 2014-01-15 14:09:00 +00:00
parent 547bcf3fb7
commit a58699957f
3 changed files with 10 additions and 4 deletions

6
debian/changelog vendored
View File

@ -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 <sylvestre@debian.org> Wed, 15 Jan 2014 15:08:03 +0100
llvm-toolchain-snapshot (1:3.5~svn197556-1) unstable; urgency=low
* New snapshot release

View File

@ -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."

View File

@ -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