diff --git a/debian/changelog b/debian/changelog index 396e078d..c8f5d728 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ llvm-toolchain-3.4 (1:3.4.2-6) unstable; urgency=medium * hurd-EIEIO-undef.diff: try to undef an errno.h to fix the ftbfs * clang-X suggests clang-X-doc (Closes: #755922) * Manage all files using .in mecanism. It will simplify the upgrade of - version + version + file names -- Sylvestre Ledru Wed, 23 Jul 2014 13:02:56 +0200 diff --git a/debian/clang-X.Y-doc.install.in b/debian/clang-X.Y-doc.install.in index 4dfcdbb4..877ca598 100644 --- a/debian/clang-X.Y-doc.install.in +++ b/debian/clang-X.Y-doc.install.in @@ -1,3 +1,3 @@ -usr/lib/llvm-3.4/docs/llvm/html/clang/manpage.css -usr/lib/llvm-3.4/docs/llvm/html/clang/clang.html -usr/lib/llvm-3.4/docs/llvm/ps/clang.ps +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/clang/manpage.css +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/clang/clang.html +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ps/clang.ps diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 8ef5d908..07476e5e 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -1,11 +1,11 @@ -usr/lib/llvm-3.4/bin/clang -usr/lib/llvm-3.4/bin/clang++ -usr/lib/llvm-3.4/bin/clang-check -usr/lib/llvm-3.4/bin/clang-tblgen -usr/lib/llvm-3.4/bin/c-index-test -usr/lib/llvm-3.4/bin/clang-apply-replacements -usr/lib/llvm-3.4/bin/clang-tidy -usr/lib/llvm-3.4/bin/pp-trace +usr/lib/llvm-@LLVM_VERSION@/bin/clang +usr/lib/llvm-@LLVM_VERSION@/bin/clang++ +usr/lib/llvm-@LLVM_VERSION@/bin/clang-check +usr/lib/llvm-@LLVM_VERSION@/bin/clang-tblgen +usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test +usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements +usr/lib/llvm-@LLVM_VERSION@/bin/clang-tidy +usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/bin/c-index-test* tools/clang/tools/scan-build /usr/share/clang/ @@ -13,13 +13,13 @@ tools/clang/tools/scan-view /usr/share/clang/ #usr/share/man/man1/clang.1 usr/share/man/man1/ debian/pollycc /usr/bin/ -usr/bin/clang-3.4 -usr/bin/clang++-3.4 -usr/bin/clang-check-3.4 -usr/bin/clang-tblgen-3.4 -usr/bin/c-index-test-3.4 -usr/bin/clang-apply-replacements-3.4 -usr/bin/clang-tidy-3.4 -usr/bin/pp-trace-3.4 +usr/bin/clang-@LLVM_VERSION@ +usr/bin/clang++-@LLVM_VERSION@ +usr/bin/clang-check-@LLVM_VERSION@ +usr/bin/clang-tblgen-@LLVM_VERSION@ +usr/bin/c-index-test-@LLVM_VERSION@ +usr/bin/clang-apply-replacements-@LLVM_VERSION@ +usr/bin/clang-tidy-@LLVM_VERSION@ +usr/bin/pp-trace-@LLVM_VERSION@ -usr/lib/llvm-3.4/share/man/man1/clang.1 +usr/lib/llvm-@LLVM_VERSION@/share/man/man1/clang.1 diff --git a/debian/clang-X.Y.links.in b/debian/clang-X.Y.links.in index e36d05fc..1451dc25 100644 --- a/debian/clang-X.Y.links.in +++ b/debian/clang-X.Y.links.in @@ -1,14 +1,14 @@ -usr/share/man/man1/clang-3.4.1.gz usr/share/man/man1/llvm-clang.1.gz -usr/share/man/man1/clang-3.4.1.gz usr/share/man/man1/clang++.1.gz +usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/llvm-clang.1.gz +usr/share/man/man1/clang-@LLVM_VERSION@.1.gz usr/share/man/man1/clang++.1.gz /usr/share/clang/scan-build/scan-build /usr/bin/scan-build /usr/share/clang/scan-view/scan-view /usr/bin/scan-view /usr/bin/clang /usr/bin/llvm-clang -usr/bin/clang-3.4 usr/bin/clang -usr/bin/clang++-3.4 usr/bin/clang++ -usr/bin/clang-check-3.4 usr/bin/clang-check -usr/bin/clang-tblgen-3.4 usr/bin/clang-tblgen -usr/bin/c-index-test-3.4 usr/bin/c-index-test -usr/bin/clang-apply-replacements-3.4 usr/bin/clang-apply-replacements -usr/bin/clang-tidy-3.4 usr/bin/clang-tidy -usr/bin/pp-trace-3.4 usr/bin/pp-trace +usr/bin/clang-@LLVM_VERSION@ usr/bin/clang +usr/bin/clang++-@LLVM_VERSION@ usr/bin/clang++ +usr/bin/clang-check-@LLVM_VERSION@ usr/bin/clang-check +usr/bin/clang-tblgen-@LLVM_VERSION@ usr/bin/clang-tblgen +usr/bin/c-index-test-@LLVM_VERSION@ usr/bin/c-index-test +usr/bin/clang-apply-replacements-@LLVM_VERSION@ usr/bin/clang-apply-replacements +usr/bin/clang-tidy-@LLVM_VERSION@ usr/bin/clang-tidy +usr/bin/pp-trace-@LLVM_VERSION@ usr/bin/pp-trace diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in index 890b17a7..52efa24f 100644 --- a/debian/clang-X.Y.lintian-overrides.in +++ b/debian/clang-X.Y.lintian-overrides.in @@ -1,4 +1,4 @@ # I know but well... -clang-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz -clang-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz -clang-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz diff --git a/debian/clang-format-X.Y.install.in b/debian/clang-format-X.Y.install.in index 68b087da..8e968405 100644 --- a/debian/clang-format-X.Y.install.in +++ b/debian/clang-format-X.Y.install.in @@ -1,5 +1,5 @@ -clang/tools/clang-format/clang-format-3.4.py usr/share/vim/addons/syntax/ -clang/tools/clang-format/clang-format-diff-3.4 /usr/bin/ -clang/tools/clang-format/clang-format.el usr/share/emacs/site-lisp/clang-format-3.4/ -usr/bin/clang-format-3.4 -usr/lib/llvm-3.4/bin/clang-format +clang/tools/clang-format/clang-format-@LLVM_VERSION@.py usr/share/vim/addons/syntax/ +clang/tools/clang-format/clang-format-diff-@LLVM_VERSION@ /usr/bin/ +clang/tools/clang-format/clang-format.el usr/share/emacs/site-lisp/clang-format-@LLVM_VERSION@/ +usr/bin/clang-format-@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/bin/clang-format diff --git a/debian/clang-format-X.Y.lintian-overrides.in b/debian/clang-format-X.Y.lintian-overrides.in index cd34b189..aa786799 100644 --- a/debian/clang-format-X.Y.lintian-overrides.in +++ b/debian/clang-format-X.Y.lintian-overrides.in @@ -1,4 +1,4 @@ # I know but well... -clang-format-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-diff-3.4.1.gz -clang-format-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-3.4.1.gz +clang-format-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-diff-@LLVM_VERSION@.1.gz +clang-format-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-@LLVM_VERSION@.1.gz diff --git a/debian/clang-format-X.Y.manpages.in b/debian/clang-format-X.Y.manpages.in index 636bc81e..a073eda3 100644 --- a/debian/clang-format-X.Y.manpages.in +++ b/debian/clang-format-X.Y.manpages.in @@ -1,2 +1,2 @@ -debian/man/clang-format-diff-3.4.1 +debian/man/clang-format-diff-@LLVM_VERSION@.1 diff --git a/debian/clang-modernize-X.Y.install.in b/debian/clang-modernize-X.Y.install.in index a05991a9..3400bb61 100644 --- a/debian/clang-modernize-X.Y.install.in +++ b/debian/clang-modernize-X.Y.install.in @@ -1,2 +1,2 @@ -usr/lib/llvm-3.4/bin/clang-modernize -usr/bin/clang-modernize-3.4 +usr/lib/llvm-@LLVM_VERSION@/bin/clang-modernize +usr/bin/clang-modernize-@LLVM_VERSION@ diff --git a/debian/clang-modernize-X.Y.lintian-overrides.in b/debian/clang-modernize-X.Y.lintian-overrides.in index 40dff786..bbb307e2 100644 --- a/debian/clang-modernize-X.Y.lintian-overrides.in +++ b/debian/clang-modernize-X.Y.lintian-overrides.in @@ -1,2 +1,2 @@ # I know but well... -clang-modernize-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-modernize-3.4.1.gz +clang-modernize-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-modernize-@LLVM_VERSION@.1.gz diff --git a/debian/clang-modernize-X.Y.manpages.in b/debian/clang-modernize-X.Y.manpages.in index 539cd271..bff37127 100644 --- a/debian/clang-modernize-X.Y.manpages.in +++ b/debian/clang-modernize-X.Y.manpages.in @@ -1 +1 @@ -debian/man/clang-modernize-3.4.1 +debian/man/clang-modernize-@LLVM_VERSION@.1 diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index 2ad16bc1..eeb39575 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -1,10 +1,10 @@ -usr/lib/llvm-3.4/include/clang -usr/lib/llvm-3.4/include/clang-c -usr/lib/llvm-3.4/lib/libclang*a +usr/lib/llvm-@LLVM_VERSION@/include/clang +usr/lib/llvm-@LLVM_VERSION@/include/clang-c +usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a -usr/lib/llvm-3.4/lib/libmodernizeCore.a +usr/lib/llvm-@LLVM_VERSION@/lib/libmodernizeCore.a -build-llvm/tools/clang/runtime/compiler-rt/clang_linux/ usr/lib/llvm-3.4/lib/clang/3.4.2/lib/ +build-llvm/tools/clang/runtime/compiler-rt/clang_linux/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib/ #usr/include/clang /usr/include/ #usr/include/clang-c /usr/include/ diff --git a/debian/libclang-X.Y-dev.links.in b/debian/libclang-X.Y-dev.links.in index 611ca4cd..e5025d27 100644 --- a/debian/libclang-X.Y-dev.links.in +++ b/debian/libclang-X.Y-dev.links.in @@ -1,3 +1,3 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang-3.4.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 18dc4578..2d0077c1 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -1,7 +1,7 @@ -usr/lib/llvm-3.4/lib/clang/3.4.2/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include -usr/lib/llvm-3.4/lib/clang/3.4.2/lib +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib -#usr/lib/clang/3.4/lib /usr/lib/clang/3.4/ -#usr/lib/clang/3.4/include/ /usr/include/clang/3.4/ +#usr/lib/clang/@LLVM_VERSION@/lib /usr/lib/clang/@LLVM_VERSION@/ +#usr/lib/clang/@LLVM_VERSION@/include/ /usr/include/clang/@LLVM_VERSION@/ diff --git a/debian/libclang-common-X.Y-dev.links.in b/debian/libclang-common-X.Y-dev.links.in index 734b2393..0b56aa0d 100644 --- a/debian/libclang-common-X.Y-dev.links.in +++ b/debian/libclang-common-X.Y-dev.links.in @@ -1,6 +1,6 @@ -usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/include/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/lib/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4.2/lib usr/lib/clang/3.4/lib -usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/include/clang/3.4.2/include -usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/lib/clang/3.4.2/include -usr/lib/llvm-3.4/lib/clang/3.4.2/lib usr/lib/clang/3.4.2/lib \ No newline at end of file +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/include/clang/@LLVM_VERSION@/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/lib/clang/@LLVM_VERSION@/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib usr/lib/clang/@LLVM_VERSION@/lib +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/include/clang/@LLVM_VERSION_FULL@/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/lib/clang/@LLVM_VERSION_FULL@/include +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib usr/lib/clang/@LLVM_VERSION_FULL@/lib \ No newline at end of file diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Y.install.in index eb534313..d44e84f6 100644 --- a/debian/libclang1-X.Y.install.in +++ b/debian/libclang1-X.Y.install.in @@ -1,2 +1,2 @@ -usr/lib/llvm-3.4/lib/libclang-3.4.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-3.4/lib/libclang.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in index 50ecb228..6784ba82 100644 --- a/debian/libclang1-X.Y.links.in +++ b/debian/libclang1-X.Y.links.in @@ -1,2 +1,2 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang-3.4.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in index c311a192..096da0c0 100644 --- a/debian/libclang1-X.Y.lintian-overrides.in +++ b/debian/libclang1-X.Y.lintian-overrides.in @@ -1,2 +1,2 @@ # I know and I am not planning to change that. -libclang1-3.4: package-name-doesnt-match-sonames libclang1 \ No newline at end of file +libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1 \ No newline at end of file diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in index 875c2ce0..e6fcc4ef 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Y.symbols.in @@ -1,4 +1,4 @@ -libclang.so.1 libclang1-3.4 #MINVER# +libclang.so.1 libclang1-@LLVM_VERSION@ #MINVER# clang_BlockCommandComment_getArgText@Base 3.2 clang_BlockCommandComment_getCommandName@Base 3.2 clang_BlockCommandComment_getNumArgs@Base 3.2 @@ -7,7 +7,7 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_CXCursorSet_insert@Base 3.2 clang_CXIndex_getGlobalOptions@Base 3.2 clang_CXIndex_setGlobalOptions@Base 3.2 - clang_CXXMethod_isPureVirtual@Base 1:3.4 + clang_CXXMethod_isPureVirtual@Base 1:@LLVM_VERSION@ clang_CXXMethod_isStatic@Base 3.2 clang_CXXMethod_isVirtual@Base 3.2 clang_Comment_getChild@Base 3.2 @@ -16,7 +16,7 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_Comment_isWhitespace@Base 3.2 clang_CompilationDatabase_dispose@Base 3.2 clang_CompilationDatabase_fromDirectory@Base 3.2 - clang_CompilationDatabase_getAllCompileCommands@Base 1:3.4 + clang_CompilationDatabase_getAllCompileCommands@Base 1:@LLVM_VERSION@ clang_CompilationDatabase_getCompileCommands@Base 3.2 clang_CompileCommand_getArg@Base 3.2 clang_CompileCommand_getDirectory@Base 3.2 @@ -29,19 +29,19 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_Cursor_getCommentRange@Base 3.2 clang_Cursor_getModule@Base 3.2 clang_Cursor_getNumArguments@Base 3.2 - clang_Cursor_getObjCDeclQualifiers@Base 1:3.4 - clang_Cursor_getObjCPropertyAttributes@Base 1:3.4 + clang_Cursor_getObjCDeclQualifiers@Base 1:@LLVM_VERSION@ + clang_Cursor_getObjCPropertyAttributes@Base 1:@LLVM_VERSION@ clang_Cursor_getObjCSelectorIndex@Base 3.2 clang_Cursor_getParsedComment@Base 3.2 clang_Cursor_getRawCommentText@Base 3.2 clang_Cursor_getReceiverType@Base 3.2 clang_Cursor_getSpellingNameRange@Base 3.2 clang_Cursor_getTranslationUnit@Base 3.2 - clang_Cursor_isBitField@Base 1:3.4 + clang_Cursor_isBitField@Base 1:@LLVM_VERSION@ clang_Cursor_isDynamicCall@Base 3.2 clang_Cursor_isNull@Base 3.2 - clang_Cursor_isObjCOptional@Base 1:3.4 - clang_Cursor_isVariadic@Base 1:3.4 + clang_Cursor_isObjCOptional@Base 1:@LLVM_VERSION@ + clang_Cursor_isVariadic@Base 1:@LLVM_VERSION@ clang_FullComment_getAsHTML@Base 3.2 clang_FullComment_getAsXML@Base 3.2 clang_HTMLStartTagComment_isSelfClosing@Base 3.2 @@ -57,9 +57,9 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_InlineCommandComment_getNumArgs@Base 3.2 clang_InlineCommandComment_getRenderKind@Base 3.2 clang_InlineContentComment_hasTrailingNewline@Base 3.2 - clang_Location_isFromMainFile@Base 1:3.4 - clang_Location_isInSystemHeader@Base 1:3.4 - clang_Module_getASTFile@Base 1:3.4 + clang_Location_isFromMainFile@Base 1:@LLVM_VERSION@ + clang_Location_isInSystemHeader@Base 1:@LLVM_VERSION@ + clang_Module_getASTFile@Base 1:@LLVM_VERSION@ clang_Module_getFullName@Base 3.2 clang_Module_getName@Base 3.2 clang_Module_getNumTopLevelHeaders@Base 3.2 @@ -76,11 +76,11 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_TParamCommandComment_getParamName@Base 3.2 clang_TParamCommandComment_isParamPositionValid@Base 3.2 clang_TextComment_getText@Base 3.2 - clang_Type_getAlignOf@Base 1:3.4 - clang_Type_getCXXRefQualifier@Base 1:3.4 - clang_Type_getClassType@Base 1:3.4 - clang_Type_getOffsetOf@Base 1:3.4 - clang_Type_getSizeOf@Base 1:3.4 + clang_Type_getAlignOf@Base 1:@LLVM_VERSION@ + clang_Type_getCXXRefQualifier@Base 1:@LLVM_VERSION@ + clang_Type_getClassType@Base 1:@LLVM_VERSION@ + clang_Type_getOffsetOf@Base 1:@LLVM_VERSION@ + clang_Type_getSizeOf@Base 1:@LLVM_VERSION@ clang_VerbatimBlockLineComment_getText@Base 3.2 clang_VerbatimLineComment_getText@Base 3.2 clang_annotateTokens@Base 3.2 @@ -123,8 +123,8 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_equalRanges@Base 3.2 clang_equalTypes@Base 3.2 clang_executeOnThread@Base 3.2 - clang_findIncludesInFile@Base 1:3.4 - clang_findIncludesInFileWithBlock@Base 1:3.4 + clang_findIncludesInFile@Base 1:@LLVM_VERSION@ + clang_findIncludesInFileWithBlock@Base 1:@LLVM_VERSION@ clang_findReferencesInFile@Base 3.2 clang_findReferencesInFileWithBlock@Base 3.2 clang_formatDiagnostic@Base 3.2 @@ -188,12 +188,12 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_getEnumConstantDeclValue@Base 3.2 clang_getEnumDeclIntegerType@Base 3.2 clang_getExpansionLocation@Base 3.2 - clang_getFieldDeclBitWidth@Base 1:3.4 + clang_getFieldDeclBitWidth@Base 1:@LLVM_VERSION@ clang_getFile@Base 3.2 - clang_getFileLocation@Base 1:3.4 + clang_getFileLocation@Base 1:@LLVM_VERSION@ clang_getFileName@Base 3.2 clang_getFileTime@Base 3.2 - clang_getFileUniqueID@Base 1:3.4 + clang_getFileUniqueID@Base 1:@LLVM_VERSION@ clang_getFunctionTypeCallingConv@Base 3.2 clang_getIBOutletCollectionType@Base 3.2 clang_getIncludedFile@Base 3.2 @@ -232,7 +232,7 @@ libclang.so.1 libclang1-3.4 #MINVER# clang_getTranslationUnitSpelling@Base 3.2 clang_getTypeDeclaration@Base 3.2 clang_getTypeKindSpelling@Base 3.2 - clang_getTypeSpelling@Base 1:3.4 + clang_getTypeSpelling@Base 1:@LLVM_VERSION@ clang_getTypedefDeclUnderlyingType@Base 3.2 clang_hashCursor@Base 3.2 clang_indexLoc_getCXSourceLocation@Base 3.2 diff --git a/debian/libllvm-X.Y-ocaml-dev.META.in b/debian/libllvm-X.Y-ocaml-dev.META.in index c8fc9ad0..366820d9 100644 --- a/debian/libllvm-X.Y-ocaml-dev.META.in +++ b/debian/libllvm-X.Y-ocaml-dev.META.in @@ -1,7 +1,7 @@ description = "Low Level Virtual Machine bindings" -version = "3.4" +version = "@LLVM_VERSION@" -directory = "+llvm-3.4" +directory = "+llvm-@LLVM_VERSION@" archive(byte) = "llvm.cma" archive(native) = "llvm.cmxa" @@ -9,8 +9,8 @@ linkopts = "-cclib -lstdc++ -cclib -lllvm" package "executionengine" ( - requires = "llvm-3_4" - version = "3.4" + requires = "llvm-@LLVM_VERSION@" + version = "@LLVM_VERSION@" archive(native) = "llvm_executionengine.cmxa" archive(byte) = "llvm_executionengine.cma" linkopts = "-cclib -lllvm_executionengine" @@ -18,8 +18,8 @@ package "executionengine" package "target" ( - requires = "llvm-3_4" - version = "3.4" + requires = "llvm-@LLVM_VERSION@" + version = "@LLVM_VERSION@" archive(native) = "llvm_target.cmxa" archive(byte) = "llvm_target.cma" linkopts = "-cclib -lllvm_target" @@ -27,8 +27,8 @@ package "target" package "scalar_opts" ( - requires = "llvm-3_4 llvm-3_4.target" - version = "3.4" + requires = "llvm-@LLVM_VERSION@ llvm-@LLVM_VERSION@.target" + version = "@LLVM_VERSION@" archive(native) = "llvm_scalar_opts.cmxa" archive(byte) = "llvm_scalar_opts.cma" linkopts = "-cclib -lllvm_scalar_opts" @@ -36,8 +36,8 @@ package "scalar_opts" package "analysis" ( - requires = "llvm-3_4" - version = "3.4" + requires = "llvm-@LLVM_VERSION@" + version = "@LLVM_VERSION@" archive(native) = "llvm_analysis.cmxa" archive(byte) = "llvm_analysis.cma" linkopts = "-cclib -lllvm_analysis" @@ -45,8 +45,8 @@ package "analysis" package "bitwriter" ( - requires = "llvm-3_4" - version = "3.4" + requires = "llvm-@LLVM_VERSION@" + version = "@LLVM_VERSION@" archive(native) = "llvm_bitwriter.cmxa" archive(byte) = "llvm_bitwriter.cma" linkopts = "-cclib -lllvm_bitwriter" @@ -54,8 +54,8 @@ package "bitwriter" package "bitreader" ( - requires = "llvm-3_4 llvm-3_4.bitwriter" - version = "3.4" + requires = "llvm-@LLVM_VERSION@ llvm-@LLVM_VERSION@.bitwriter" + version = "@LLVM_VERSION@" archive(native) = "llvm_bitreader.cmxa" archive(byte) = "llvm_bitreader.cma" linkopts = "-cclib -lllvm_bitreader" diff --git a/debian/libllvm-X.Y-ocaml-dev.doc-base.in b/debian/libllvm-X.Y-ocaml-dev.doc-base.in index 01042fd1..a5dc5fad 100644 --- a/debian/libllvm-X.Y-ocaml-dev.doc-base.in +++ b/debian/libllvm-X.Y-ocaml-dev.doc-base.in @@ -1,8 +1,8 @@ -Document: libllvm-3.4-ocaml-dev-ocamldoc-api-reference +Document: libllvm-@LLVM_VERSION@-ocaml-dev-ocamldoc-api-reference Title: Llvm OCamldoc API Reference Abstract: API reference manual for libllvm-ocaml-dev (generated via OCamldoc) Section: Programming/OCaml Format: HTML -Index: /usr/share/doc/libllvm-3.4-ocaml-dev/html/index.html -Files: /usr/share/doc/libllvm-3.4-ocaml-dev/html/* +Index: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/index.html +Files: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/* diff --git a/debian/libllvm-X.Y-ocaml-dev.install.in b/debian/libllvm-X.Y-ocaml-dev.install.in index 18bf7e4b..e04a63eb 100644 --- a/debian/libllvm-X.Y-ocaml-dev.install.in +++ b/debian/libllvm-X.Y-ocaml-dev.install.in @@ -1,2 +1,2 @@ -@OCAML_STDLIB_DIR@/llvm-3.4 @OCAML_STDLIB_DIR@/ -usr/lib/llvm-3.4/docs/llvm/ocamldoc/html usr/share/doc/libllvm-3.4-ocaml-dev/ +@OCAML_STDLIB_DIR@/llvm-@LLVM_VERSION@ @OCAML_STDLIB_DIR@/ +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc/html usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/ diff --git a/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in b/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in index afa70d5c..5d25d442 100644 --- a/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in +++ b/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in @@ -1,2 +1,2 @@ # It is in the section ocaml which is fine. -libllvm-3.4-ocaml-dev: wrong-section-according-to-package-name libllvm-3.4-ocaml-dev => libdevel +libllvm-@LLVM_VERSION@-ocaml-dev: wrong-section-according-to-package-name libllvm-@LLVM_VERSION@-ocaml-dev => libdevel diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in index 29368d96..f8d968f8 100644 --- a/debian/libllvmX.Y.install.in +++ b/debian/libllvmX.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-3.4/lib/libLLVM-3.4.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libllvmX.Y.lintian-overrides.in b/debian/libllvmX.Y.lintian-overrides.in index 2ae98305..49f7ef24 100644 --- a/debian/libllvmX.Y.lintian-overrides.in +++ b/debian/libllvmX.Y.lintian-overrides.in @@ -1,2 +1,2 @@ # That is normal. Upstream does not match the debian convention -libllvm3.4: package-name-doesnt-match-sonames libLLVM-3.4-1 +libllvm@LLVM_VERSION@: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1 diff --git a/debian/lldb-X.Y-dev.install.in b/debian/lldb-X.Y-dev.install.in index fb86ad4a..96c96b31 100644 --- a/debian/lldb-X.Y-dev.install.in +++ b/debian/lldb-X.Y-dev.install.in @@ -1,4 +1,4 @@ -/usr/lib/llvm-3.4/include/lldb -/usr/lib/llvm-3.4/lib/liblldb*a +/usr/lib/llvm-@LLVM_VERSION@/include/lldb +/usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*a diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in index 42f0dae9..1316fbe5 100644 --- a/debian/lldb-X.Y.install.in +++ b/debian/lldb-X.Y.install.in @@ -1,6 +1,6 @@ -usr/bin/lldb-3.4 -usr/bin/lldb-platform-3.4 -usr/lib/llvm-3.4/bin/lldb -usr/lib/llvm-3.4/bin/lldb-platform -usr/lib/llvm-3.4/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/bin/lldb-@LLVM_VERSION@ +usr/bin/lldb-platform-@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/bin/lldb +usr/lib/llvm-@LLVM_VERSION@/bin/lldb-platform +usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ build-llvm/Release/lib/python2.7/site-packages/lldb/ /usr/lib/python2.7/dist-packages/ diff --git a/debian/lldb-X.Y.links.in b/debian/lldb-X.Y.links.in index 2b2359d5..5783897a 100644 --- a/debian/lldb-X.Y.links.in +++ b/debian/lldb-X.Y.links.in @@ -1,12 +1,12 @@ usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so usr/lib/python2.7/dist-packages/lldb/_lldb.so -usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/llvm-3.4/lib/liblldb.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 -usr/bin/lldb-3.4 usr/bin/lldb -usr/bin/lldb-platform-3.4 usr/bin/lldb-platform -usr/bin/lldb-gdbserver-3.4 usr/bin/lldb-gdbserver +usr/bin/lldb-@LLVM_VERSION@ usr/bin/lldb +usr/bin/lldb-platform-@LLVM_VERSION@ usr/bin/lldb-platform +usr/bin/lldb-gdbserver-@LLVM_VERSION@ usr/bin/lldb-gdbserver -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.2.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-3.4.2.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.2.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-3.4.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1 diff --git a/debian/lldb-X.Y.lintian-overrides.in b/debian/lldb-X.Y.lintian-overrides.in index ee479bdd..b4a7c0bc 100644 --- a/debian/lldb-X.Y.lintian-overrides.in +++ b/debian/lldb-X.Y.lintian-overrides.in @@ -1,5 +1,5 @@ # That is normal. The lib is not (yet?) shipped as a new package -lldb-3.4: package-name-doesnt-match-sonames liblldb -lldb-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-3.4.1.gz +lldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb +lldb-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-@LLVM_VERSION@.1.gz # For now, override this warning. We might create a -dev at some point -lldb-3.4: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so \ No newline at end of file +lldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so \ No newline at end of file diff --git a/debian/lldb-X.Y.manpages.in b/debian/lldb-X.Y.manpages.in index 456a421b..22dbbbcb 100644 --- a/debian/lldb-X.Y.manpages.in +++ b/debian/lldb-X.Y.manpages.in @@ -1,2 +1,2 @@ -debian/man/lldb-3.4.1 +debian/man/lldb-@LLVM_VERSION@.1 diff --git a/debian/llvm-X.Y-dev.dirs.in b/debian/llvm-X.Y-dev.dirs.in index 5dac3aa4..3b3b5862 100644 --- a/debian/llvm-X.Y-dev.dirs.in +++ b/debian/llvm-X.Y-dev.dirs.in @@ -1,5 +1,5 @@ -/usr/lib/llvm-3.4/lib -/usr/lib/llvm-3.4/build -/usr/lib/llvm-3.4/include -usr/share/doc/llvm-3.4-dev -usr/share/emacs/site-lisp/llvm-3.4 +/usr/lib/llvm-@LLVM_VERSION@/lib +/usr/lib/llvm-@LLVM_VERSION@/build +/usr/lib/llvm-@LLVM_VERSION@/include +usr/share/doc/llvm-@LLVM_VERSION@-dev +usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index f2d33cd2..6ae258e1 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -1,22 +1,22 @@ -usr/lib/llvm-3.4/lib/libLLVM*.a -usr/lib/llvm-3.4/lib/libllvm*.a -usr/lib/llvm-3.4/lib/LLVM*.so -usr/lib/llvm-3.4/lib/libLTO.* -usr/lib/llvm-3.4/lib/BugpointPasses.so -usr/lib/llvm-3.4/include/llvm/ usr/include/llvm-3.4/ -usr/lib/llvm-3.4/include/llvm-c/ usr/include/llvm-c-3.4/ -cmake/modules/*.cmake usr/share/llvm-3.4/cmake/ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a +usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a +usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.* +usr/lib/llvm-@LLVM_VERSION@/lib/BugpointPasses.so +usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/ +usr/lib/llvm-@LLVM_VERSION@/include/llvm-c/ usr/include/llvm-c-@LLVM_VERSION@/ +cmake/modules/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/ -build-llvm/Makefile.common /usr/lib/llvm-3.4/build/ -build-llvm/Makefile.config /usr/lib/llvm-3.4/build/ -build-llvm/config.status /usr/lib/llvm-3.4/build/ -Makefile.rules /usr/lib/llvm-3.4/build/ -configure /usr/lib/llvm-3.4/build/ -autoconf/ /usr/lib/llvm-3.4/build/ +build-llvm/Makefile.common /usr/lib/llvm-@LLVM_VERSION@/build/ +build-llvm/Makefile.config /usr/lib/llvm-@LLVM_VERSION@/build/ +build-llvm/config.status /usr/lib/llvm-@LLVM_VERSION@/build/ +Makefile.rules /usr/lib/llvm-@LLVM_VERSION@/build/ +configure /usr/lib/llvm-@LLVM_VERSION@/build/ +autoconf/ /usr/lib/llvm-@LLVM_VERSION@/build/ -utils/vim/llvm-3.4.vim usr/share/vim/addons/syntax/ -utils/vim/tablegen-3.4.vim usr/share/vim/addons/syntax/ +utils/vim/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/syntax/ +utils/vim/tablegen-@LLVM_VERSION@.vim usr/share/vim/addons/syntax/ -utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.4/ -utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.4/ -utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.4/ +utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/ +utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/ +utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/ diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index caf6b87b..f437d55d 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -1,12 +1,12 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.2.so.1 -usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/include/llvm-c -usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/include/llvm -usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/build/include/llvm-c -usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/build/include/llvm -usr/lib/llvm-3.4/include/ usr/lib/llvm-3.4/build/include -usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release -usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Asserts +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 +usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/include/llvm-c +usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/include/llvm +usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/build/include/llvm-c +usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/build/include/llvm +usr/lib/llvm-@LLVM_VERSION@/include/ usr/lib/llvm-@LLVM_VERSION@/build/include +usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Release +usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Debug+Asserts diff --git a/debian/llvm-X.Y-doc.dirs.in b/debian/llvm-X.Y-doc.dirs.in index 5e1c9848..5379e8ec 100644 --- a/debian/llvm-X.Y-doc.dirs.in +++ b/debian/llvm-X.Y-doc.dirs.in @@ -1 +1 @@ -usr/share/doc/llvm-3.4-doc +usr/share/doc/llvm-@LLVM_VERSION@-doc diff --git a/debian/llvm-X.Y-doc.install.in b/debian/llvm-X.Y-doc.install.in index ddcb75fd..11d5d9fd 100644 --- a/debian/llvm-X.Y-doc.install.in +++ b/debian/llvm-X.Y-doc.install.in @@ -1,7 +1,7 @@ -docs/_build/html usr/share/doc/llvm-3.4-doc/ -usr/lib/llvm-3.4/docs/llvm/html.tar.gz -usr/lib/llvm-3.4/docs/llvm/ocamldoc.tar.gz -usr/lib/llvm-3.4/docs/llvm/html/Dummy.html -usr/lib/llvm-3.4/docs/llvm/html/doxygen.css -usr/lib/llvm-3.4/docs/llvm/html/LibASTMatchersReference.html +docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/ +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc.tar.gz +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/doxygen.css +usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html diff --git a/debian/llvm-X.Y-examples.dirs.in b/debian/llvm-X.Y-examples.dirs.in index 3e131339..a8b75c66 100644 --- a/debian/llvm-X.Y-examples.dirs.in +++ b/debian/llvm-X.Y-examples.dirs.in @@ -1 +1 @@ -usr/share/doc/llvm-3.4-examples +usr/share/doc/llvm-@LLVM_VERSION@-examples diff --git a/debian/llvm-X.Y-examples.links.in b/debian/llvm-X.Y-examples.links.in index 1496d2ee..a8d74aa2 100644 --- a/debian/llvm-X.Y-examples.links.in +++ b/debian/llvm-X.Y-examples.links.in @@ -1,3 +1,3 @@ -/usr/lib/llvm-3.4/build/Makefile.common usr/share/doc/llvm-3.4-examples/Makefile.common -/usr/lib/llvm-3.4/build/Makefile.config usr/share/doc/llvm-3.4-examples/Makefile.config -/usr/lib/llvm-3.4/build/Makefile.rules usr/share/doc/llvm-3.4-examples/Makefile.rules +/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.common usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.common +/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.config usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.config +/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.rules usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.rules diff --git a/debian/llvm-X.Y-runtime.install.in b/debian/llvm-X.Y-runtime.install.in index 7f21e53b..8072a312 100644 --- a/debian/llvm-X.Y-runtime.install.in +++ b/debian/llvm-X.Y-runtime.install.in @@ -1,7 +1,7 @@ -usr/lib/llvm-3.4/bin/lli -usr/lib/llvm-3.4/bin/lli-child-target +usr/lib/llvm-@LLVM_VERSION@/bin/lli +usr/lib/llvm-@LLVM_VERSION@/bin/lli-child-target -usr/bin/lli-3.4 -usr/bin/lli-child-target-3.4 +usr/bin/lli-@LLVM_VERSION@ +usr/bin/lli-child-target-@LLVM_VERSION@ -debian/llvm-3.4-runtime.binfmt usr/share/binfmts/ +debian/llvm-@LLVM_VERSION@-runtime.binfmt usr/share/binfmts/ diff --git a/debian/llvm-X.Y-runtime.postinst.in b/debian/llvm-X.Y-runtime.postinst.in index 9fbcd722..68300326 100644 --- a/debian/llvm-X.Y-runtime.postinst.in +++ b/debian/llvm-X.Y-runtime.postinst.in @@ -2,7 +2,7 @@ if test "$1" = "configure"; then if test -x /usr/sbin/update-binfmts; then - update-binfmts --import llvm-3.4-runtime.binfmt || true + update-binfmts --import llvm-@LLVM_VERSION@-runtime.binfmt || true fi fi diff --git a/debian/llvm-X.Y-tools.dirs.in b/debian/llvm-X.Y-tools.dirs.in index b1f7820e..ee339823 100644 --- a/debian/llvm-X.Y-tools.dirs.in +++ b/debian/llvm-X.Y-tools.dirs.in @@ -1,3 +1,3 @@ -/usr/lib/llvm-3.4/build/unittests -/usr/lib/llvm-3.4/build/utils/lit/ +/usr/lib/llvm-@LLVM_VERSION@/build/unittests +/usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in index f7293dc0..3b9b96c6 100644 --- a/debian/llvm-X.Y-tools.install.in +++ b/debian/llvm-X.Y-tools.install.in @@ -1,13 +1,13 @@ -usr/lib/llvm-3.4/bin/count -usr/lib/llvm-3.4/bin/FileCheck -usr/lib/llvm-3.4/bin/not +usr/lib/llvm-@LLVM_VERSION@/bin/count +usr/lib/llvm-@LLVM_VERSION@/bin/FileCheck +usr/lib/llvm-@LLVM_VERSION@/bin/not -unittests/Makefile.unittest /usr/lib/llvm-3.4/build/unittests/ +unittests/Makefile.unittest /usr/lib/llvm-@LLVM_VERSION@/build/unittests/ -utils/lit/* /usr/lib/llvm-3.4/build/utils/lit/ +utils/lit/* /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ -usr/bin/count-3.4 -usr/bin/FileCheck-3.4 -usr/bin/not-3.4 +usr/bin/count-@LLVM_VERSION@ +usr/bin/FileCheck-@LLVM_VERSION@ +usr/bin/not-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y.dirs.in b/debian/llvm-X.Y.dirs.in index f9db0728..56a9655f 100644 --- a/debian/llvm-X.Y.dirs.in +++ b/debian/llvm-X.Y.dirs.in @@ -1,3 +1,3 @@ -/usr/lib/llvm-3.4/bin +/usr/lib/llvm-@LLVM_VERSION@/bin usr/share/man/man1 -usr/share/doc/llvm-3.4 +usr/share/doc/llvm-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index d40669a3..68b5cbe3 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -1,8 +1,8 @@ -usr/lib/llvm-3.4/bin/llvm-* -usr/lib/llvm-3.4/bin/opt* -usr/lib/llvm-3.4/bin/macho-dump* -usr/lib/llvm-3.4/bin/bugpoint* -usr/lib/llvm-3.4/bin/llc* +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-* +usr/lib/llvm-@LLVM_VERSION@/bin/opt* +usr/lib/llvm-@LLVM_VERSION@/bin/macho-dump* +usr/lib/llvm-@LLVM_VERSION@/bin/bugpoint* +usr/lib/llvm-@LLVM_VERSION@/bin/llc* usr/bin/llvm-* usr/bin/opt* usr/bin/macho-dump* diff --git a/debian/llvm-X.Y.lintian-overrides.in b/debian/llvm-X.Y.lintian-overrides.in index b57d03bb..ac3f7567 100644 --- a/debian/llvm-X.Y.lintian-overrides.in +++ b/debian/llvm-X.Y.lintian-overrides.in @@ -1,9 +1,9 @@ # I know but well... -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-dwarfdump-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mc-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mcmarkup-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-objdump-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rtdyld-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-3.4.1.gz -llvm-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/macho-dump-3.4.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-dwarfdump-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mc-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mcmarkup-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-objdump-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rtdyld-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/macho-dump-@LLVM_VERSION@.1.gz diff --git a/debian/llvm-X.Y.manpages.in b/debian/llvm-X.Y.manpages.in index 111d594b..b74242d7 100644 --- a/debian/llvm-X.Y.manpages.in +++ b/debian/llvm-X.Y.manpages.in @@ -1,10 +1,10 @@ docs/_build/man/* -debian/man/llvm-dwarfdump-3.4.1 -debian/man/llvm-mc-3.4.1 -debian/man/llvm-mcmarkup-3.4.1 -debian/man/llvm-objdump-3.4.1 -debian/man/llvm-rtdyld-3.4.1 -debian/man/llvm-size-3.4.1 -debian/man/llvm-tblgen-3.4.1 -debian/man/macho-dump-3.4.1 +debian/man/llvm-dwarfdump-@LLVM_VERSION@.1 +debian/man/llvm-mc-@LLVM_VERSION@.1 +debian/man/llvm-mcmarkup-@LLVM_VERSION@.1 +debian/man/llvm-objdump-@LLVM_VERSION@.1 +debian/man/llvm-rtdyld-@LLVM_VERSION@.1 +debian/man/llvm-size-@LLVM_VERSION@.1 +debian/man/llvm-tblgen-@LLVM_VERSION@.1 +debian/man/macho-dump-@LLVM_VERSION@.1 diff --git a/debian/rules b/debian/rules index e4bfc538..64cfda99 100755 --- a/debian/rules +++ b/debian/rules @@ -137,6 +137,7 @@ preconfigure: echo "$$f => $$f2"; \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ + -e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \ -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \ done