From 68a408ea5bd2210ae79b9b83ff28678b507f3c16 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 20 Oct 2019 11:24:40 +0200 Subject: [PATCH] Adjust the paths with the move to git project --- debian/clang-X.Y-doc.docs.in | 2 +- debian/clang-tools-X.Y.install.in | 6 +++--- debian/llvm-X.Y-dev.install.in | 22 +++++++++++----------- debian/llvm-X.Y-doc.install.in | 2 +- debian/llvm-X.Y-tools.install.in | 2 +- debian/python-clang-X.Y.install.in | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/debian/clang-X.Y-doc.docs.in b/debian/clang-X.Y-doc.docs.in index b3cc6a07..8c9084cf 100644 --- a/debian/clang-X.Y-doc.docs.in +++ b/debian/clang-X.Y-doc.docs.in @@ -1,2 +1,2 @@ -tools/clang/docs/_build/html/ +clang/docs/_build/html/ diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 8ca96ea2..8b935407 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -28,9 +28,9 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-extdef-mapping usr/lib/llvm-@LLVM_VERSION@/bin/clang-doc usr/lib/llvm-@LLVM_VERSION@/bin/clang-scan-deps -tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ -tools/clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ -tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ +clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ +clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ +clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ usr/lib/llvm-@LLVM_VERSION@/share/clang/run-find-all-symbols.py usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-include-fixer.py diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index d9758e0e..e5e3fc65 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -12,21 +12,21 @@ usr/lib/llvm-@LLVM_VERSION@/include/llvm-c/ usr/include/llvm-c-@LLVM_VERSION@/ # Explicit debian/tmp since there are multiple declarations debian/tmp/usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm/*.cmake -utils/vim/indent/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/indent/ +llvm/utils/vim/indent/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/indent/ -utils/vim/syntax/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/syntax/ -utils/vim/syntax/tablegen-@LLVM_VERSION@.vim usr/share/vim/addons/syntax/ +llvm/utils/vim/syntax/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/syntax/ +llvm/utils/vim/syntax/tablegen-@LLVM_VERSION@.vim usr/share/vim/addons/syntax/ -utils/vim/ftdetect/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/ftdetect/ -utils/vim/ftdetect/tablegen-@LLVM_VERSION@.vim usr/share/vim/addons/ftdetect/ +llvm/utils/vim/ftdetect/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/ftdetect/ +llvm/utils/vim/ftdetect/tablegen-@LLVM_VERSION@.vim usr/share/vim/addons/ftdetect/ -utils/vim/ftplugin/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/ftplugin/ -utils/vim/ftplugin/tablegen-@LLVM_VERSION@.vim usr/share/vim/addons/ftplugin/ +llvm/utils/vim/ftplugin/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/ftplugin/ +llvm/utils/vim/ftplugin/tablegen-@LLVM_VERSION@.vim usr/share/vim/addons/ftplugin/ -utils/vim/llvm-@LLVM_VERSION@-vimrc usr/share/vim/addons +llvm/utils/vim/llvm-@LLVM_VERSION@-vimrc usr/share/vim/addons -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@/ +llvm/utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/ +llvm/utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/ +llvm/utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/ diff --git a/debian/llvm-X.Y-doc.install.in b/debian/llvm-X.Y-doc.install.in index 6ac115a5..a84b0423 100644 --- a/debian/llvm-X.Y-doc.install.in +++ b/debian/llvm-X.Y-doc.install.in @@ -1,4 +1,4 @@ -docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/ +llvm/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 diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in index 282dd225..fed288a2 100644 --- a/debian/llvm-X.Y-tools.install.in +++ b/debian/llvm-X.Y-tools.install.in @@ -9,7 +9,7 @@ usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/opt-diff.py usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/optpmap.py usr/lib/llvm-@LLVM_VERSION@/share/opt-viewer/opt-stats.py -utils/lit/* /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ +llvm/utils/lit/* /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ usr/bin/count-@LLVM_VERSION@ usr/bin/FileCheck-@LLVM_VERSION@ diff --git a/debian/python-clang-X.Y.install.in b/debian/python-clang-X.Y.install.in index b5494214..62bbb36f 100644 --- a/debian/python-clang-X.Y.install.in +++ b/debian/python-clang-X.Y.install.in @@ -1 +1 @@ -tools/clang/bindings/python/clang/ /usr/lib/python2.7/dist-packages/ +clang/bindings/python/clang/ /usr/lib/python2.7/dist-packages/