From 8c0727ae09ed088c36b3fa084ed42cf2032af920 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 28 Jul 2014 11:34:35 +0000 Subject: [PATCH] Manage all files using .in mecanism. It will simplify the upgrade of version --- debian/changelog | 2 + debian/clang-3.5-doc.install | 3 - debian/clang-3.5.install | 27 ------ debian/clang-3.5.links | 15 ---- debian/clang-3.5.lintian-overrides | 4 - ...ang-3.5-doc.docs => clang-X.Y-doc.docs.in} | 0 debian/clang-X.Y-doc.install.in | 3 + ...xamples => clang-X.Y-examples.examples.in} | 0 debian/clang-X.Y.install.in | 27 ++++++ debian/clang-X.Y.links.in | 15 ++++ debian/clang-X.Y.lintian-overrides.in | 4 + ...ang-3.5.manpages => clang-X.Y.manpages.in} | 0 ...ang-3.5.postinst => clang-X.Y.postinst.in} | 0 .../{clang-3.5.prerm => clang-X.Y.prerm.in} | 0 debian/clang-format-3.5.install | 5 -- debian/clang-format-3.5.lintian-overrides | 4 - debian/clang-format-3.5.manpages | 2 - debian/clang-format-X.Y.install.in | 5 ++ debian/clang-format-X.Y.lintian-overrides.in | 4 + debian/clang-format-X.Y.manpages.in | 2 + debian/clang-modernize-3.5.install | 2 - debian/clang-modernize-3.5.lintian-overrides | 2 - debian/clang-modernize-3.5.manpages | 1 - debian/clang-modernize-X.Y.install.in | 2 + .../clang-modernize-X.Y.lintian-overrides.in | 2 + debian/clang-modernize-X.Y.manpages.in | 1 + debian/libclang-3.5-dev.links.in | 3 - ...ev.install => libclang-X.Y-dev.install.in} | 10 +-- debian/libclang-X.Y-dev.links.in | 3 + debian/libclang-common-3.5-dev.install | 6 -- debian/libclang-common-3.5-dev.links | 7 -- debian/libclang-common-X.Y-dev.install.in | 6 ++ debian/libclang-common-X.Y-dev.links.in | 7 ++ debian/libclang1-3.5.install.in | 3 - debian/libclang1-3.5.links.in | 2 - debian/libclang1-3.5.lintian-overrides | 2 - debian/libclang1-X.Y.install.in | 3 + debian/libclang1-X.Y.links.in | 2 + debian/libclang1-X.Y.lintian-overrides.in | 2 + ...1-3.5.symbols => libclang1-X.Y.symbols.in} | 84 +++++++++---------- debian/libllvm-3.5-ocaml-dev.doc-base | 8 -- debian/libllvm-3.5-ocaml-dev.install.in | 2 - .../libllvm-3.5-ocaml-dev.lintian-overrides | 2 - ...dev.META => libllvm-X.Y-ocaml-dev.META.in} | 28 +++---- ....dirs.in => libllvm-X.Y-ocaml-dev.dirs.in} | 0 debian/libllvm-X.Y-ocaml-dev.doc-base.in | 8 ++ debian/libllvm-X.Y-ocaml-dev.install.in | 2 + ...libllvm-X.Y-ocaml-dev.lintian-overrides.in | 2 + debian/libllvm3.5.install.in | 1 - debian/libllvm3.5.links.in | 3 - debian/libllvm3.5.lintian-overrides | 2 - debian/libllvmX.Y.install.in | 1 + debian/libllvmX.Y.links.in | 3 + debian/libllvmX.Y.lintian-overrides.in | 2 + debian/lldb-3.5-dev.install | 2 - debian/lldb-3.5.install.in | 12 --- debian/lldb-3.5.links.in | 13 --- debian/lldb-3.5.lintian-overrides | 5 -- debian/lldb-3.5.manpages | 2 - debian/lldb-X.Y-dev.install.in | 2 + debian/lldb-X.Y.install.in | 12 +++ debian/lldb-X.Y.links.in | 13 +++ debian/lldb-X.Y.lintian-overrides.in | 5 ++ debian/lldb-X.Y.manpages.in | 2 + ...lldb-3.5.postinst => lldb-X.Y.postinst.in} | 0 debian/llvm-3.5-dev.dirs | 5 -- debian/llvm-3.5-dev.install | 24 ------ debian/llvm-3.5-dev.links.in | 11 --- debian/llvm-3.5-doc.dirs | 1 - debian/llvm-3.5-doc.install | 6 -- debian/llvm-3.5-examples.dirs | 1 - debian/llvm-3.5-examples.links | 3 - debian/llvm-3.5-runtime.install | 8 -- debian/llvm-3.5-tools.dirs | 3 - debian/llvm-3.5-tools.install | 13 --- debian/llvm-3.5.dirs | 3 - debian/llvm-3.5.install | 10 --- debian/llvm-3.5.lintian-overrides | 9 -- debian/llvm-3.5.manpages | 10 --- debian/llvm-X.Y-dev.dirs.in | 5 ++ debian/llvm-X.Y-dev.install.in | 24 ++++++ debian/llvm-X.Y-dev.links.in | 11 +++ debian/llvm-X.Y-doc.dirs.in | 1 + debian/llvm-X.Y-doc.install.in | 6 ++ debian/llvm-X.Y-examples.dirs.in | 1 + ...examples => llvm-X.Y-examples.examples.in} | 0 debian/llvm-X.Y-examples.links.in | 3 + ...e.binfmt.in => llvm-X.Y-runtime.binfmt.in} | 0 debian/llvm-X.Y-runtime.install.in | 8 ++ ...untime.links => llvm-X.Y-runtime.links.in} | 0 ....manpages => llvm-X.Y-runtime.manpages.in} | 0 ....postinst => llvm-X.Y-runtime.postinst.in} | 2 +- ...ime.prerm.in => llvm-X.Y-runtime.prerm.in} | 0 debian/llvm-X.Y-tools.dirs.in | 3 + debian/llvm-X.Y-tools.install.in | 13 +++ debian/llvm-X.Y.dirs.in | 3 + debian/llvm-X.Y.install.in | 10 +++ debian/{llvm-3.5.links => llvm-X.Y.links.in} | 0 debian/llvm-X.Y.lintian-overrides.in | 9 ++ debian/llvm-X.Y.manpages.in | 10 +++ ....5.install => python-clang-X.Y.install.in} | 0 debian/rules | 14 +++- 102 files changed, 322 insertions(+), 312 deletions(-) delete mode 100644 debian/clang-3.5-doc.install delete mode 100644 debian/clang-3.5.install delete mode 100644 debian/clang-3.5.links delete mode 100644 debian/clang-3.5.lintian-overrides rename debian/{clang-3.5-doc.docs => clang-X.Y-doc.docs.in} (100%) create mode 100644 debian/clang-X.Y-doc.install.in rename debian/{clang-3.5-examples.examples => clang-X.Y-examples.examples.in} (100%) create mode 100644 debian/clang-X.Y.install.in create mode 100644 debian/clang-X.Y.links.in create mode 100644 debian/clang-X.Y.lintian-overrides.in rename debian/{clang-3.5.manpages => clang-X.Y.manpages.in} (100%) rename debian/{clang-3.5.postinst => clang-X.Y.postinst.in} (100%) rename debian/{clang-3.5.prerm => clang-X.Y.prerm.in} (100%) delete mode 100644 debian/clang-format-3.5.install delete mode 100644 debian/clang-format-3.5.lintian-overrides delete mode 100644 debian/clang-format-3.5.manpages create mode 100644 debian/clang-format-X.Y.install.in create mode 100644 debian/clang-format-X.Y.lintian-overrides.in create mode 100644 debian/clang-format-X.Y.manpages.in delete mode 100644 debian/clang-modernize-3.5.install delete mode 100644 debian/clang-modernize-3.5.lintian-overrides delete mode 100644 debian/clang-modernize-3.5.manpages create mode 100644 debian/clang-modernize-X.Y.install.in create mode 100644 debian/clang-modernize-X.Y.lintian-overrides.in create mode 100644 debian/clang-modernize-X.Y.manpages.in delete mode 100644 debian/libclang-3.5-dev.links.in rename debian/{libclang-3.5-dev.install => libclang-X.Y-dev.install.in} (52%) create mode 100644 debian/libclang-X.Y-dev.links.in delete mode 100644 debian/libclang-common-3.5-dev.install delete mode 100644 debian/libclang-common-3.5-dev.links create mode 100644 debian/libclang-common-X.Y-dev.install.in create mode 100644 debian/libclang-common-X.Y-dev.links.in delete mode 100644 debian/libclang1-3.5.install.in delete mode 100644 debian/libclang1-3.5.links.in delete mode 100644 debian/libclang1-3.5.lintian-overrides create mode 100644 debian/libclang1-X.Y.install.in create mode 100644 debian/libclang1-X.Y.links.in create mode 100644 debian/libclang1-X.Y.lintian-overrides.in rename debian/{libclang1-3.5.symbols => libclang1-X.Y.symbols.in} (82%) delete mode 100644 debian/libllvm-3.5-ocaml-dev.doc-base delete mode 100644 debian/libllvm-3.5-ocaml-dev.install.in delete mode 100644 debian/libllvm-3.5-ocaml-dev.lintian-overrides rename debian/{libllvm-3.5-ocaml-dev.META => libllvm-X.Y-ocaml-dev.META.in} (67%) rename debian/{libllvm-3.5-ocaml-dev.dirs.in => libllvm-X.Y-ocaml-dev.dirs.in} (100%) create mode 100644 debian/libllvm-X.Y-ocaml-dev.doc-base.in create mode 100644 debian/libllvm-X.Y-ocaml-dev.install.in create mode 100644 debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in delete mode 100644 debian/libllvm3.5.install.in delete mode 100644 debian/libllvm3.5.links.in delete mode 100644 debian/libllvm3.5.lintian-overrides create mode 100644 debian/libllvmX.Y.install.in create mode 100644 debian/libllvmX.Y.links.in create mode 100644 debian/libllvmX.Y.lintian-overrides.in delete mode 100644 debian/lldb-3.5-dev.install delete mode 100644 debian/lldb-3.5.install.in delete mode 100644 debian/lldb-3.5.links.in delete mode 100644 debian/lldb-3.5.lintian-overrides delete mode 100644 debian/lldb-3.5.manpages create mode 100644 debian/lldb-X.Y-dev.install.in create mode 100644 debian/lldb-X.Y.install.in create mode 100644 debian/lldb-X.Y.links.in create mode 100644 debian/lldb-X.Y.lintian-overrides.in create mode 100644 debian/lldb-X.Y.manpages.in rename debian/{lldb-3.5.postinst => lldb-X.Y.postinst.in} (100%) delete mode 100644 debian/llvm-3.5-dev.dirs delete mode 100644 debian/llvm-3.5-dev.install delete mode 100644 debian/llvm-3.5-dev.links.in delete mode 100644 debian/llvm-3.5-doc.dirs delete mode 100644 debian/llvm-3.5-doc.install delete mode 100644 debian/llvm-3.5-examples.dirs delete mode 100644 debian/llvm-3.5-examples.links delete mode 100644 debian/llvm-3.5-runtime.install delete mode 100644 debian/llvm-3.5-tools.dirs delete mode 100644 debian/llvm-3.5-tools.install delete mode 100644 debian/llvm-3.5.dirs delete mode 100644 debian/llvm-3.5.install delete mode 100644 debian/llvm-3.5.lintian-overrides delete mode 100644 debian/llvm-3.5.manpages create mode 100644 debian/llvm-X.Y-dev.dirs.in create mode 100644 debian/llvm-X.Y-dev.install.in create mode 100644 debian/llvm-X.Y-dev.links.in create mode 100644 debian/llvm-X.Y-doc.dirs.in create mode 100644 debian/llvm-X.Y-doc.install.in create mode 100644 debian/llvm-X.Y-examples.dirs.in rename debian/{llvm-3.5-examples.examples => llvm-X.Y-examples.examples.in} (100%) create mode 100644 debian/llvm-X.Y-examples.links.in rename debian/{llvm-3.5-runtime.binfmt.in => llvm-X.Y-runtime.binfmt.in} (100%) create mode 100644 debian/llvm-X.Y-runtime.install.in rename debian/{llvm-3.5-runtime.links => llvm-X.Y-runtime.links.in} (100%) rename debian/{llvm-3.5-runtime.manpages => llvm-X.Y-runtime.manpages.in} (100%) rename debian/{llvm-3.5-runtime.postinst => llvm-X.Y-runtime.postinst.in} (60%) rename debian/{llvm-3.5-runtime.prerm.in => llvm-X.Y-runtime.prerm.in} (100%) create mode 100644 debian/llvm-X.Y-tools.dirs.in create mode 100644 debian/llvm-X.Y-tools.install.in create mode 100644 debian/llvm-X.Y.dirs.in create mode 100644 debian/llvm-X.Y.install.in rename debian/{llvm-3.5.links => llvm-X.Y.links.in} (100%) create mode 100644 debian/llvm-X.Y.lintian-overrides.in create mode 100644 debian/llvm-X.Y.manpages.in rename debian/{python-clang-3.5.install => python-clang-X.Y.install.in} (100%) diff --git a/debian/changelog b/debian/changelog index b20794ee..dab901de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ llvm-toolchain-3.5 (1:3.5~+rc1-2) unstable; urgency=medium polly * 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 -- Sylvestre Ledru Thu, 24 Jul 2014 11:42:56 +0200 diff --git a/debian/clang-3.5-doc.install b/debian/clang-3.5-doc.install deleted file mode 100644 index b67ebdbc..00000000 --- a/debian/clang-3.5-doc.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/llvm-3.5/docs/llvm/html/clang/manpage.css -usr/lib/llvm-3.5/docs/llvm/html/clang/clang.html -usr/lib/llvm-3.5/docs/llvm/ps/clang.ps diff --git a/debian/clang-3.5.install b/debian/clang-3.5.install deleted file mode 100644 index 1d232bca..00000000 --- a/debian/clang-3.5.install +++ /dev/null @@ -1,27 +0,0 @@ -usr/lib/llvm-3.5/bin/clang -usr/lib/llvm-3.5/bin/clang++ -usr/lib/llvm-3.5/bin/clang-check -usr/lib/llvm-3.5/bin/clang-tblgen -usr/lib/llvm-3.5/bin/c-index-test -usr/lib/llvm-3.5/bin/clang-apply-replacements -usr/lib/llvm-3.5/bin/clang-tidy -usr/lib/llvm-3.5/bin/pp-trace -usr/lib/llvm-3.5/bin/clang-query - -usr/bin/c-index-test* -tools/clang/tools/scan-build /usr/share/clang/ -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.5 -usr/bin/clang++-3.5 -usr/bin/clang-check-3.5 -usr/bin/clang-tblgen-3.5 -usr/bin/c-index-test-3.5 -usr/bin/clang-apply-replacements-3.5 -usr/bin/clang-tidy-3.5 -usr/bin/pp-trace-3.5 -usr/bin/clang-query-3.5 - -usr/lib/llvm-3.5/share/man/man1/clang.1 diff --git a/debian/clang-3.5.links b/debian/clang-3.5.links deleted file mode 100644 index cd547134..00000000 --- a/debian/clang-3.5.links +++ /dev/null @@ -1,15 +0,0 @@ -usr/share/man/man1/clang-3.5.1.gz usr/share/man/man1/llvm-clang.1.gz -usr/share/man/man1/clang-3.5.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.5 usr/bin/clang -usr/bin/clang++-3.5 usr/bin/clang++ -usr/bin/clang-check-3.5 usr/bin/clang-check -usr/bin/clang-tblgen-3.5 usr/bin/clang-tblgen -usr/bin/c-index-test-3.5 usr/bin/c-index-test -usr/bin/clang-apply-replacements-3.5 usr/bin/clang-apply-replacements -usr/bin/clang-tidy-3.5 usr/bin/clang-tidy -usr/bin/pp-trace-3.5 usr/bin/pp-trace -usr/bin/clang-query-3.5 usr/bin/clang-query diff --git a/debian/clang-3.5.lintian-overrides b/debian/clang-3.5.lintian-overrides deleted file mode 100644 index 58aa8315..00000000 --- a/debian/clang-3.5.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# I know but well... -clang-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz -clang-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz -clang-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz diff --git a/debian/clang-3.5-doc.docs b/debian/clang-X.Y-doc.docs.in similarity index 100% rename from debian/clang-3.5-doc.docs rename to debian/clang-X.Y-doc.docs.in diff --git a/debian/clang-X.Y-doc.install.in b/debian/clang-X.Y-doc.install.in new file mode 100644 index 00000000..877ca598 --- /dev/null +++ b/debian/clang-X.Y-doc.install.in @@ -0,0 +1,3 @@ +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-3.5-examples.examples b/debian/clang-X.Y-examples.examples.in similarity index 100% rename from debian/clang-3.5-examples.examples rename to debian/clang-X.Y-examples.examples.in diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in new file mode 100644 index 00000000..3c9bce7e --- /dev/null +++ b/debian/clang-X.Y.install.in @@ -0,0 +1,27 @@ +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/lib/llvm-@LLVM_VERSION@/bin/clang-query + +usr/bin/c-index-test* +tools/clang/tools/scan-build /usr/share/clang/ +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-@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/bin/clang-query-@LLVM_VERSION@ + +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 new file mode 100644 index 00000000..2599ba37 --- /dev/null +++ b/debian/clang-X.Y.links.in @@ -0,0 +1,15 @@ +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-@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 +usr/bin/clang-query-@LLVM_VERSION@ usr/bin/clang-query diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in new file mode 100644 index 00000000..52efa24f --- /dev/null +++ b/debian/clang-X.Y.lintian-overrides.in @@ -0,0 +1,4 @@ +# I know but well... +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-3.5.manpages b/debian/clang-X.Y.manpages.in similarity index 100% rename from debian/clang-3.5.manpages rename to debian/clang-X.Y.manpages.in diff --git a/debian/clang-3.5.postinst b/debian/clang-X.Y.postinst.in similarity index 100% rename from debian/clang-3.5.postinst rename to debian/clang-X.Y.postinst.in diff --git a/debian/clang-3.5.prerm b/debian/clang-X.Y.prerm.in similarity index 100% rename from debian/clang-3.5.prerm rename to debian/clang-X.Y.prerm.in diff --git a/debian/clang-format-3.5.install b/debian/clang-format-3.5.install deleted file mode 100644 index d07987ef..00000000 --- a/debian/clang-format-3.5.install +++ /dev/null @@ -1,5 +0,0 @@ -clang/tools/clang-format/clang-format-3.5.py usr/share/vim/addons/syntax/ -clang/tools/clang-format/clang-format-diff-3.5 /usr/bin/ -clang/tools/clang-format/clang-format.el usr/share/emacs/site-lisp/clang-format-3.5/ -usr/bin/clang-format-3.5 -usr/lib/llvm-3.5/bin/clang-format diff --git a/debian/clang-format-3.5.lintian-overrides b/debian/clang-format-3.5.lintian-overrides deleted file mode 100644 index 38547e42..00000000 --- a/debian/clang-format-3.5.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# I know but well... -clang-format-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-diff-3.5.1.gz -clang-format-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/clang-format-3.5.1.gz - diff --git a/debian/clang-format-3.5.manpages b/debian/clang-format-3.5.manpages deleted file mode 100644 index db3082ad..00000000 --- a/debian/clang-format-3.5.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/clang-format-diff-3.5.1 - diff --git a/debian/clang-format-X.Y.install.in b/debian/clang-format-X.Y.install.in new file mode 100644 index 00000000..8e968405 --- /dev/null +++ b/debian/clang-format-X.Y.install.in @@ -0,0 +1,5 @@ +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 new file mode 100644 index 00000000..aa786799 --- /dev/null +++ b/debian/clang-format-X.Y.lintian-overrides.in @@ -0,0 +1,4 @@ +# I know but well... +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 new file mode 100644 index 00000000..a073eda3 --- /dev/null +++ b/debian/clang-format-X.Y.manpages.in @@ -0,0 +1,2 @@ +debian/man/clang-format-diff-@LLVM_VERSION@.1 + diff --git a/debian/clang-modernize-3.5.install b/debian/clang-modernize-3.5.install deleted file mode 100644 index e8d45dad..00000000 --- a/debian/clang-modernize-3.5.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/llvm-3.5/bin/clang-modernize -usr/bin/clang-modernize-3.5 diff --git a/debian/clang-modernize-3.5.lintian-overrides b/debian/clang-modernize-3.5.lintian-overrides deleted file mode 100644 index 4a8f1296..00000000 --- a/debian/clang-modernize-3.5.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# I know but well... -clang-modernize-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/clang-modernize-3.5.1.gz diff --git a/debian/clang-modernize-3.5.manpages b/debian/clang-modernize-3.5.manpages deleted file mode 100644 index 7692f9f5..00000000 --- a/debian/clang-modernize-3.5.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/clang-modernize-3.5.1 diff --git a/debian/clang-modernize-X.Y.install.in b/debian/clang-modernize-X.Y.install.in new file mode 100644 index 00000000..3400bb61 --- /dev/null +++ b/debian/clang-modernize-X.Y.install.in @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..bbb307e2 --- /dev/null +++ b/debian/clang-modernize-X.Y.lintian-overrides.in @@ -0,0 +1,2 @@ +# I know but well... +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 new file mode 100644 index 00000000..bff37127 --- /dev/null +++ b/debian/clang-modernize-X.Y.manpages.in @@ -0,0 +1 @@ +debian/man/clang-modernize-@LLVM_VERSION@.1 diff --git a/debian/libclang-3.5-dev.links.in b/debian/libclang-3.5-dev.links.in deleted file mode 100644 index eae5c0e3..00000000 --- a/debian/libclang-3.5-dev.links.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.5.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.5.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.5.so.1 usr/lib/llvm-3.5/lib/libclang-3.5.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.5.so.1 usr/lib/llvm-3.5/lib/libclang.so diff --git a/debian/libclang-3.5-dev.install b/debian/libclang-X.Y-dev.install.in similarity index 52% rename from debian/libclang-3.5-dev.install rename to debian/libclang-X.Y-dev.install.in index 03b94bd0..71a871fe 100644 --- a/debian/libclang-3.5-dev.install +++ b/debian/libclang-X.Y-dev.install.in @@ -1,10 +1,10 @@ -usr/lib/llvm-3.5/include/clang -usr/lib/llvm-3.5/include/clang-c -usr/lib/llvm-3.5/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.5/lib/libmodernizeCore.a +usr/lib/llvm-@LLVM_VERSION@/lib/libmodernizeCore.a -build-llvm/tools/clang/runtime/compiler-rt/clang_linux/ usr/lib/llvm-3.5/lib/clang/3.5/lib/ +build-llvm/tools/clang/runtime/compiler-rt/clang_linux/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/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 new file mode 100644 index 00000000..e5025d27 --- /dev/null +++ b/debian/libclang-X.Y-dev.links.in @@ -0,0 +1,3 @@ +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-3.5-dev.install b/debian/libclang-common-3.5-dev.install deleted file mode 100644 index 1310b106..00000000 --- a/debian/libclang-common-3.5-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/llvm-3.5/lib/clang/3.5.0/include - -usr/lib/llvm-3.5/lib/clang/3.5.0/lib - -#usr/lib/clang/3.5.0/lib /usr/lib/clang/3.5/ -#usr/lib/clang/3.5.0/include/ /usr/include/clang/3.5/ diff --git a/debian/libclang-common-3.5-dev.links b/debian/libclang-common-3.5-dev.links deleted file mode 100644 index a7b6d427..00000000 --- a/debian/libclang-common-3.5-dev.links +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/llvm-3.5/lib/clang/3.5.0/include usr/include/clang/3.5/include -usr/lib/llvm-3.5/lib/clang/3.5.0/include usr/lib/clang/3.5/include -usr/lib/llvm-3.5/lib/clang/3.5.0/lib usr/lib/clang/3.5/lib -usr/lib/llvm-3.5/lib/clang/3.5.0/include usr/include/clang/3.5.0/include -usr/lib/llvm-3.5/lib/clang/3.5.0/include usr/lib/clang/3.5.0/include -usr/lib/llvm-3.5/lib/clang/3.5.0/lib usr/lib/clang/3.5.0/lib - diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in new file mode 100644 index 00000000..5e8d0787 --- /dev/null +++ b/debian/libclang-common-X.Y-dev.install.in @@ -0,0 +1,6 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include + +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib + +#usr/lib/clang/@LLVM_VERSION_FULL@/lib /usr/lib/clang/@LLVM_VERSION@/ +#usr/lib/clang/@LLVM_VERSION_FULL@/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 new file mode 100644 index 00000000..717c6b2c --- /dev/null +++ b/debian/libclang-common-X.Y-dev.links.in @@ -0,0 +1,7 @@ +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 + diff --git a/debian/libclang1-3.5.install.in b/debian/libclang1-3.5.install.in deleted file mode 100644 index bc14aba6..00000000 --- a/debian/libclang1-3.5.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/llvm-3.5/lib/libclang-3.5.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-3.5/lib/libclang.so.1 - diff --git a/debian/libclang1-3.5.links.in b/debian/libclang1-3.5.links.in deleted file mode 100644 index f9afb23f..00000000 --- a/debian/libclang1-3.5.links.in +++ /dev/null @@ -1,2 +0,0 @@ -# as upstream -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.5.so.1 usr/lib/llvm-3.5/lib/libclang-3.5.so.1 diff --git a/debian/libclang1-3.5.lintian-overrides b/debian/libclang1-3.5.lintian-overrides deleted file mode 100644 index ae282255..00000000 --- a/debian/libclang1-3.5.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# I know and I am not planning to change that. -libclang1-3.5: package-name-doesnt-match-sonames libclang1 diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Y.install.in new file mode 100644 index 00000000..27c6af7b --- /dev/null +++ b/debian/libclang1-X.Y.install.in @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..1eee7d44 --- /dev/null +++ b/debian/libclang1-X.Y.links.in @@ -0,0 +1,2 @@ +# as upstream +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 new file mode 100644 index 00000000..77bcd4eb --- /dev/null +++ b/debian/libclang1-X.Y.lintian-overrides.in @@ -0,0 +1,2 @@ +# I know and I am not planning to change that. +libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1 diff --git a/debian/libclang1-3.5.symbols b/debian/libclang1-X.Y.symbols.in similarity index 82% rename from debian/libclang1-3.5.symbols rename to debian/libclang1-X.Y.symbols.in index f57b7b14..d3fff798 100644 --- a/debian/libclang1-3.5.symbols +++ b/debian/libclang1-X.Y.symbols.in @@ -1,4 +1,4 @@ -libclang.so.1 libclang1-3.5 #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,8 +7,8 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_CXCursorSet_insert@Base 3.2 clang_CXIndex_getGlobalOptions@Base 3.2 clang_CXIndex_setGlobalOptions@Base 3.2 - clang_CXXMethod_isConst@Base 3.5 - clang_CXXMethod_isPureVirtual@Base 3.5 + clang_CXXMethod_isConst@Base @LLVM_VERSION@ + clang_CXXMethod_isPureVirtual@Base @LLVM_VERSION@ clang_CXXMethod_isStatic@Base 3.2 clang_CXXMethod_isVirtual@Base 3.2 clang_Comment_getChild@Base 3.2 @@ -17,7 +17,7 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_Comment_isWhitespace@Base 3.2 clang_CompilationDatabase_dispose@Base 3.2 clang_CompilationDatabase_fromDirectory@Base 3.2 - clang_CompilationDatabase_getAllCompileCommands@Base 3.5 + clang_CompilationDatabase_getAllCompileCommands@Base @LLVM_VERSION@ clang_CompilationDatabase_getCompileCommands@Base 3.2 clang_CompileCommand_getArg@Base 3.2 clang_CompileCommand_getDirectory@Base 3.2 @@ -30,19 +30,19 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_Cursor_getCommentRange@Base 3.2 clang_Cursor_getModule@Base 3.2 clang_Cursor_getNumArguments@Base 3.2 - clang_Cursor_getObjCDeclQualifiers@Base 3.5 - clang_Cursor_getObjCPropertyAttributes@Base 3.5 + clang_Cursor_getObjCDeclQualifiers@Base @LLVM_VERSION@ + clang_Cursor_getObjCPropertyAttributes@Base @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 3.5 + clang_Cursor_isBitField@Base @LLVM_VERSION@ clang_Cursor_isDynamicCall@Base 3.2 clang_Cursor_isNull@Base 3.2 - clang_Cursor_isObjCOptional@Base 3.5 - clang_Cursor_isVariadic@Base 3.5 + clang_Cursor_isObjCOptional@Base @LLVM_VERSION@ + clang_Cursor_isVariadic@Base @LLVM_VERSION@ clang_FullComment_getAsHTML@Base 3.2 clang_FullComment_getAsXML@Base 3.2 clang_HTMLStartTagComment_isSelfClosing@Base 3.2 @@ -58,20 +58,20 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_InlineCommandComment_getNumArgs@Base 3.2 clang_InlineCommandComment_getRenderKind@Base 3.2 clang_InlineContentComment_hasTrailingNewline@Base 3.2 - clang_Location_isFromMainFile@Base 3.5 - clang_Location_isInSystemHeader@Base 3.5 - clang_ModuleMapDescriptor_create@Base 3.5 - clang_ModuleMapDescriptor_dispose@Base 3.5 - clang_ModuleMapDescriptor_setFrameworkModuleName@Base 3.5 - clang_ModuleMapDescriptor_setUmbrellaHeader@Base 3.5 - clang_ModuleMapDescriptor_writeToBuffer@Base 3.5 - clang_Module_getASTFile@Base 3.5 + clang_Location_isFromMainFile@Base @LLVM_VERSION@ + clang_Location_isInSystemHeader@Base @LLVM_VERSION@ + clang_ModuleMapDescriptor_create@Base @LLVM_VERSION@ + clang_ModuleMapDescriptor_dispose@Base @LLVM_VERSION@ + clang_ModuleMapDescriptor_setFrameworkModuleName@Base @LLVM_VERSION@ + clang_ModuleMapDescriptor_setUmbrellaHeader@Base @LLVM_VERSION@ + clang_ModuleMapDescriptor_writeToBuffer@Base @LLVM_VERSION@ + clang_Module_getASTFile@Base @LLVM_VERSION@ clang_Module_getFullName@Base 3.2 clang_Module_getName@Base 3.2 clang_Module_getNumTopLevelHeaders@Base 3.2 clang_Module_getParent@Base 3.2 clang_Module_getTopLevelHeader@Base 3.2 - clang_Module_isSystem@Base 3.5 + clang_Module_isSystem@Base @LLVM_VERSION@ clang_ParamCommandComment_getDirection@Base 3.2 clang_ParamCommandComment_getParamIndex@Base 3.2 clang_ParamCommandComment_getParamName@Base 3.2 @@ -83,20 +83,20 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_TParamCommandComment_getParamName@Base 3.2 clang_TParamCommandComment_isParamPositionValid@Base 3.2 clang_TextComment_getText@Base 3.2 - clang_Type_getAlignOf@Base 3.5 - clang_Type_getCXXRefQualifier@Base 3.5 - clang_Type_getClassType@Base 3.5 - clang_Type_getNumTemplateArguments@Base 3.5 - clang_Type_getOffsetOf@Base 3.5 - clang_Type_getSizeOf@Base 3.5 - clang_Type_getTemplateArgumentAsType@Base 3.5 + clang_Type_getAlignOf@Base @LLVM_VERSION@ + clang_Type_getCXXRefQualifier@Base @LLVM_VERSION@ + clang_Type_getClassType@Base @LLVM_VERSION@ + clang_Type_getNumTemplateArguments@Base @LLVM_VERSION@ + clang_Type_getOffsetOf@Base @LLVM_VERSION@ + clang_Type_getSizeOf@Base @LLVM_VERSION@ + clang_Type_getTemplateArgumentAsType@Base @LLVM_VERSION@ clang_VerbatimBlockLineComment_getText@Base 3.2 clang_VerbatimLineComment_getText@Base 3.2 - clang_VirtualFileOverlay_addFileMapping@Base 3.5 - clang_VirtualFileOverlay_create@Base 3.5 - clang_VirtualFileOverlay_dispose@Base 3.5 - clang_VirtualFileOverlay_setCaseSensitivity@Base 3.5 - clang_VirtualFileOverlay_writeToBuffer@Base 3.5 + clang_VirtualFileOverlay_addFileMapping@Base @LLVM_VERSION@ + clang_VirtualFileOverlay_create@Base @LLVM_VERSION@ + clang_VirtualFileOverlay_dispose@Base @LLVM_VERSION@ + clang_VirtualFileOverlay_setCaseSensitivity@Base @LLVM_VERSION@ + clang_VirtualFileOverlay_writeToBuffer@Base @LLVM_VERSION@ clang_annotateTokens@Base 3.2 clang_codeCompleteAt@Base 3.2 clang_codeCompleteGetContainerKind@Base 3.2 @@ -113,7 +113,7 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_constructUSR_ObjCProtocol@Base 3.2 clang_createCXCursorSet@Base 3.2 clang_createIndex@Base 3.2 - clang_createTranslationUnit2@Base 3.5 + clang_createTranslationUnit2@Base @LLVM_VERSION@ clang_createTranslationUnit@Base 3.2 clang_createTranslationUnitFromSourceFile@Base 3.2 clang_defaultCodeCompleteOptions@Base 3.2 @@ -129,7 +129,7 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_disposeDiagnosticSet@Base 3.2 clang_disposeIndex@Base 3.2 clang_disposeOverriddenCursors@Base 3.2 - clang_disposeSourceRangeList@Base 3.5 + clang_disposeSourceRangeList@Base @LLVM_VERSION@ clang_disposeString@Base 3.2 clang_disposeTokens@Base 3.2 clang_disposeTranslationUnit@Base 3.2 @@ -139,15 +139,15 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_equalRanges@Base 3.2 clang_equalTypes@Base 3.2 clang_executeOnThread@Base 3.2 - clang_findIncludesInFile@Base 3.5 - clang_findIncludesInFileWithBlock@Base 3.5 + clang_findIncludesInFile@Base @LLVM_VERSION@ + clang_findIncludesInFileWithBlock@Base @LLVM_VERSION@ clang_findReferencesInFile@Base 3.2 clang_findReferencesInFileWithBlock@Base 3.2 clang_formatDiagnostic@Base 3.2 clang_getArgType@Base 3.2 clang_getArrayElementType@Base 3.2 clang_getArraySize@Base 3.2 - clang_getBuildSessionTimestamp@Base 3.5 + clang_getBuildSessionTimestamp@Base @LLVM_VERSION@ clang_getCString@Base 3.2 clang_getCXTUResourceUsage@Base 3.2 clang_getCXXAccessSpecifier@Base 3.2 @@ -205,12 +205,12 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_getEnumConstantDeclValue@Base 3.2 clang_getEnumDeclIntegerType@Base 3.2 clang_getExpansionLocation@Base 3.2 - clang_getFieldDeclBitWidth@Base 3.5 + clang_getFieldDeclBitWidth@Base @LLVM_VERSION@ clang_getFile@Base 3.2 - clang_getFileLocation@Base 3.5 + clang_getFileLocation@Base @LLVM_VERSION@ clang_getFileName@Base 3.2 clang_getFileTime@Base 3.2 - clang_getFileUniqueID@Base 3.5 + clang_getFileUniqueID@Base @LLVM_VERSION@ clang_getFunctionTypeCallingConv@Base 3.2 clang_getIBOutletCollectionType@Base 3.2 clang_getIncludedFile@Base 3.2 @@ -218,7 +218,7 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_getInstantiationLocation@Base 3.2 clang_getLocation@Base 3.2 clang_getLocationForOffset@Base 3.2 - clang_getModuleForFile@Base 3.5 + clang_getModuleForFile@Base @LLVM_VERSION@ clang_getNullCursor@Base 3.2 clang_getNullLocation@Base 3.2 clang_getNullRange@Base 3.2 @@ -238,7 +238,7 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_getRemappings@Base 3.2 clang_getRemappingsFromFileList@Base 3.2 clang_getResultType@Base 3.2 - clang_getSkippedRanges@Base 3.5 + clang_getSkippedRanges@Base @LLVM_VERSION@ clang_getSpecializedCursorTemplate@Base 3.2 clang_getSpellingLocation@Base 3.2 clang_getTUResourceUsageName@Base 3.2 @@ -251,7 +251,7 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_getTranslationUnitSpelling@Base 3.2 clang_getTypeDeclaration@Base 3.2 clang_getTypeKindSpelling@Base 3.2 - clang_getTypeSpelling@Base 3.5 + clang_getTypeSpelling@Base @LLVM_VERSION@ clang_getTypedefDeclUnderlyingType@Base 3.2 clang_hashCursor@Base 3.2 clang_indexLoc_getCXSourceLocation@Base 3.2 @@ -288,7 +288,7 @@ libclang.so.1 libclang1-3.5 #MINVER# clang_isVirtualBase@Base 3.2 clang_isVolatileQualifiedType@Base 3.2 clang_loadDiagnostics@Base 3.2 - clang_parseTranslationUnit2@Base 3.5 + clang_parseTranslationUnit2@Base @LLVM_VERSION@ clang_parseTranslationUnit@Base 3.2 clang_remap_dispose@Base 3.2 clang_remap_getFilenames@Base 3.2 diff --git a/debian/libllvm-3.5-ocaml-dev.doc-base b/debian/libllvm-3.5-ocaml-dev.doc-base deleted file mode 100644 index 3f7834e3..00000000 --- a/debian/libllvm-3.5-ocaml-dev.doc-base +++ /dev/null @@ -1,8 +0,0 @@ -Document: libllvm-3.5-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.5-ocaml-dev/html/index.html -Files: /usr/share/doc/libllvm-3.5-ocaml-dev/html/* diff --git a/debian/libllvm-3.5-ocaml-dev.install.in b/debian/libllvm-3.5-ocaml-dev.install.in deleted file mode 100644 index 05868c22..00000000 --- a/debian/libllvm-3.5-ocaml-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -@OCAML_STDLIB_DIR@/llvm-3.5 @OCAML_STDLIB_DIR@/ -usr/lib/llvm-3.5/docs/llvm/ocamldoc/html usr/share/doc/libllvm-3.5-ocaml-dev/ diff --git a/debian/libllvm-3.5-ocaml-dev.lintian-overrides b/debian/libllvm-3.5-ocaml-dev.lintian-overrides deleted file mode 100644 index c331ef17..00000000 --- a/debian/libllvm-3.5-ocaml-dev.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# It is in the section ocaml which is fine. -libllvm-3.5-ocaml-dev: wrong-section-according-to-package-name libllvm-3.5-ocaml-dev => libdevel diff --git a/debian/libllvm-3.5-ocaml-dev.META b/debian/libllvm-X.Y-ocaml-dev.META.in similarity index 67% rename from debian/libllvm-3.5-ocaml-dev.META rename to debian/libllvm-X.Y-ocaml-dev.META.in index a197e44a..366820d9 100644 --- a/debian/libllvm-3.5-ocaml-dev.META +++ b/debian/libllvm-X.Y-ocaml-dev.META.in @@ -1,7 +1,7 @@ description = "Low Level Virtual Machine bindings" -version = "3.5" +version = "@LLVM_VERSION@" -directory = "+llvm-3.5" +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_5" - version = "3.5" + 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_5" - version = "3.5" + 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_5 llvm-3_5.target" - version = "3.5" + 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_5" - version = "3.5" + 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_5" - version = "3.5" + 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_5 llvm-3_5.bitwriter" - version = "3.5" + 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-3.5-ocaml-dev.dirs.in b/debian/libllvm-X.Y-ocaml-dev.dirs.in similarity index 100% rename from debian/libllvm-3.5-ocaml-dev.dirs.in rename to debian/libllvm-X.Y-ocaml-dev.dirs.in diff --git a/debian/libllvm-X.Y-ocaml-dev.doc-base.in b/debian/libllvm-X.Y-ocaml-dev.doc-base.in new file mode 100644 index 00000000..a5dc5fad --- /dev/null +++ b/debian/libllvm-X.Y-ocaml-dev.doc-base.in @@ -0,0 +1,8 @@ +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-@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 new file mode 100644 index 00000000..e04a63eb --- /dev/null +++ b/debian/libllvm-X.Y-ocaml-dev.install.in @@ -0,0 +1,2 @@ +@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 new file mode 100644 index 00000000..5d25d442 --- /dev/null +++ b/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in @@ -0,0 +1,2 @@ +# It is in the section ocaml which is fine. +libllvm-@LLVM_VERSION@-ocaml-dev: wrong-section-according-to-package-name libllvm-@LLVM_VERSION@-ocaml-dev => libdevel diff --git a/debian/libllvm3.5.install.in b/debian/libllvm3.5.install.in deleted file mode 100644 index 9c3500c4..00000000 --- a/debian/libllvm3.5.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-3.5/lib/libLLVM-3.5.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libllvm3.5.links.in b/debian/libllvm3.5.links.in deleted file mode 100644 index c0c89137..00000000 --- a/debian/libllvm3.5.links.in +++ /dev/null @@ -1,3 +0,0 @@ -# Should be uncommented for 3.5.1 and other -# usr/lib/llvm-3.5/lib/libLLVM-3.5.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 - diff --git a/debian/libllvm3.5.lintian-overrides b/debian/libllvm3.5.lintian-overrides deleted file mode 100644 index c9c5b411..00000000 --- a/debian/libllvm3.5.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# That is normal. Upstream does not match the debian convention -libllvm3.5: package-name-doesnt-match-sonames libLLVM-3.5-1 diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Y.install.in new file mode 100644 index 00000000..f8d968f8 --- /dev/null +++ b/debian/libllvmX.Y.install.in @@ -0,0 +1 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in new file mode 100644 index 00000000..4faec3f9 --- /dev/null +++ b/debian/libllvmX.Y.links.in @@ -0,0 +1,3 @@ +# Should be uncommented for @LLVM_VERSION@.1 and other +# usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 + diff --git a/debian/libllvmX.Y.lintian-overrides.in b/debian/libllvmX.Y.lintian-overrides.in new file mode 100644 index 00000000..49f7ef24 --- /dev/null +++ b/debian/libllvmX.Y.lintian-overrides.in @@ -0,0 +1,2 @@ +# That is normal. Upstream does not match the debian convention +libllvm@LLVM_VERSION@: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1 diff --git a/debian/lldb-3.5-dev.install b/debian/lldb-3.5-dev.install deleted file mode 100644 index b2151c07..00000000 --- a/debian/lldb-3.5-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/llvm-3.5/include/lldb -usr/lib/llvm-3.5/lib/liblldb*a diff --git a/debian/lldb-3.5.install.in b/debian/lldb-3.5.install.in deleted file mode 100644 index 0452ea3f..00000000 --- a/debian/lldb-3.5.install.in +++ /dev/null @@ -1,12 +0,0 @@ -usr/bin/lldb-3.5 -usr/lib/llvm-3.5/bin/lldb -usr/lib/llvm-3.5/bin/lldb-platform -usr/lib/llvm-3.5/bin/lldb-gdbserver -usr/lib/llvm-3.5/bin/lldb-mi -usr/lib/llvm-3.5/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-3.5/lib/python2.7/site-packages/lldb/ -usr/lib/llvm-3.5/lib/python2.7/site-packages/readline.so - -usr/bin/lldb-platform-3.5 -usr/bin/lldb-gdbserver-3.5 -usr/bin/lldb-mi-3.5 diff --git a/debian/lldb-3.5.links.in b/debian/lldb-3.5.links.in deleted file mode 100644 index f7ac36a6..00000000 --- a/debian/lldb-3.5.links.in +++ /dev/null @@ -1,13 +0,0 @@ -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.5/lib/liblldb.so.1 - -usr/bin/lldb-3.5 usr/bin/lldb -usr/bin/lldb-platform-3.5 usr/bin/lldb-platform -usr/bin/lldb-gdbserver-3.5 usr/bin/lldb-gdbserver -usr/bin/lldb-mi-3.5 usr/bin/lldb-mi - -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-3.5.0.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-3.5.so.1 - diff --git a/debian/lldb-3.5.lintian-overrides b/debian/lldb-3.5.lintian-overrides deleted file mode 100644 index 6476d0da..00000000 --- a/debian/lldb-3.5.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -# That is normal. The lib is not shipped as a new package -lldb-3.5: package-name-doesnt-match-sonames liblldb -lldb-3.5: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so -# Does not really matter -lldb-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-3.5.1.gz diff --git a/debian/lldb-3.5.manpages b/debian/lldb-3.5.manpages deleted file mode 100644 index dbfb05f0..00000000 --- a/debian/lldb-3.5.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/lldb-3.5.1 - diff --git a/debian/lldb-X.Y-dev.install.in b/debian/lldb-X.Y-dev.install.in new file mode 100644 index 00000000..393c07bb --- /dev/null +++ b/debian/lldb-X.Y-dev.install.in @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..4c3b062f --- /dev/null +++ b/debian/lldb-X.Y.install.in @@ -0,0 +1,12 @@ +usr/bin/lldb-@LLVM_VERSION@ +usr/lib/llvm-@LLVM_VERSION@/bin/lldb +usr/lib/llvm-@LLVM_VERSION@/bin/lldb-platform +usr/lib/llvm-@LLVM_VERSION@/bin/lldb-gdbserver +usr/lib/llvm-@LLVM_VERSION@/bin/lldb-mi +usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/ +usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/readline.so + +usr/bin/lldb-platform-@LLVM_VERSION@ +usr/bin/lldb-gdbserver-@LLVM_VERSION@ +usr/bin/lldb-mi-@LLVM_VERSION@ diff --git a/debian/lldb-X.Y.links.in b/debian/lldb-X.Y.links.in new file mode 100644 index 00000000..f1da9c3e --- /dev/null +++ b/debian/lldb-X.Y.links.in @@ -0,0 +1,13 @@ +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-@LLVM_VERSION@/lib/liblldb.so.1 + +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/bin/lldb-mi-@LLVM_VERSION@ usr/bin/lldb-mi + +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.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 new file mode 100644 index 00000000..362e2b60 --- /dev/null +++ b/debian/lldb-X.Y.lintian-overrides.in @@ -0,0 +1,5 @@ +# That is normal. The lib is not shipped as a new package +lldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb +lldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so +# Does not really matter +lldb-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/lldb-@LLVM_VERSION@.1.gz diff --git a/debian/lldb-X.Y.manpages.in b/debian/lldb-X.Y.manpages.in new file mode 100644 index 00000000..22dbbbcb --- /dev/null +++ b/debian/lldb-X.Y.manpages.in @@ -0,0 +1,2 @@ +debian/man/lldb-@LLVM_VERSION@.1 + diff --git a/debian/lldb-3.5.postinst b/debian/lldb-X.Y.postinst.in similarity index 100% rename from debian/lldb-3.5.postinst rename to debian/lldb-X.Y.postinst.in diff --git a/debian/llvm-3.5-dev.dirs b/debian/llvm-3.5-dev.dirs deleted file mode 100644 index 983d712c..00000000 --- a/debian/llvm-3.5-dev.dirs +++ /dev/null @@ -1,5 +0,0 @@ -/usr/lib/llvm-3.5/lib -/usr/lib/llvm-3.5/build -/usr/lib/llvm-3.5/include -usr/share/doc/llvm-3.5-dev -usr/share/emacs/site-lisp/llvm-3.5 diff --git a/debian/llvm-3.5-dev.install b/debian/llvm-3.5-dev.install deleted file mode 100644 index f6039c9d..00000000 --- a/debian/llvm-3.5-dev.install +++ /dev/null @@ -1,24 +0,0 @@ -usr/lib/llvm-3.5/lib/libLLVM*.a -usr/lib/llvm-3.5/lib/libllvm*.a -usr/lib/llvm-3.5/lib/LLVM*.so -usr/lib/llvm-3.5/lib/libLTO.* -usr/lib/llvm-3.5/lib/BugpointPasses.so -usr/lib/llvm-3.5/include/llvm/ usr/include/llvm-3.5/ -usr/lib/llvm-3.5/include/llvm-c/ usr/include/llvm-c-3.5/ -# Explicit debian/tmp since there are multiple declarations -debian/tmp/usr/lib/llvm-3.5/share/llvm/cmake/*.cmake usr/share/llvm-3.5/cmake/ - -build-llvm/Makefile.common /usr/lib/llvm-3.5/build/ -build-llvm/Makefile.config /usr/lib/llvm-3.5/build/ -build-llvm/config.status /usr/lib/llvm-3.5/build/ -Makefile.rules /usr/lib/llvm-3.5/build/ -configure /usr/lib/llvm-3.5/build/ -autoconf/ /usr/lib/llvm-3.5/build/ - -utils/vim/llvm-3.5.vim usr/share/vim/addons/syntax/ -utils/vim/tablegen-3.5.vim usr/share/vim/addons/syntax/ - -utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.5/ -utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.5/ -utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.5/ - diff --git a/debian/llvm-3.5-dev.links.in b/debian/llvm-3.5-dev.links.in deleted file mode 100644 index 624a91ae..00000000 --- a/debian/llvm-3.5-dev.links.in +++ /dev/null @@ -1,11 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/llvm-3.5/lib/libLLVM-3.5.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/llvm-3.5/lib/libLLVM-3.5.0.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/llvm-3.5/lib/libLLVM-3.5.0.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.0.so.1 -usr/include/llvm-c-3.5/llvm-c usr/lib/llvm-3.5/include/llvm-c -usr/include/llvm-3.5/llvm usr/lib/llvm-3.5/include/llvm -usr/include/llvm-c-3.5/llvm-c usr/lib/llvm-3.5/build/include/llvm-c -usr/include/llvm-3.5/llvm usr/lib/llvm-3.5/build/include/llvm -usr/lib/llvm-3.5/include/ usr/lib/llvm-3.5/build/include -usr/lib/llvm-3.5/ usr/lib/llvm-3.5/build/Release -usr/lib/llvm-3.5/ usr/lib/llvm-3.5/build/Debug+Asserts diff --git a/debian/llvm-3.5-doc.dirs b/debian/llvm-3.5-doc.dirs deleted file mode 100644 index 74e070fb..00000000 --- a/debian/llvm-3.5-doc.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/llvm-3.5-doc diff --git a/debian/llvm-3.5-doc.install b/debian/llvm-3.5-doc.install deleted file mode 100644 index 16288f23..00000000 --- a/debian/llvm-3.5-doc.install +++ /dev/null @@ -1,6 +0,0 @@ -docs/_build/html usr/share/doc/llvm-3.5-doc/ -usr/lib/llvm-3.5/docs/llvm/html.tar.gz -usr/lib/llvm-3.5/docs/llvm/ocamldoc.tar.gz -usr/lib/llvm-3.5/docs/llvm/html/Dummy.html -usr/lib/llvm-3.5/docs/llvm/html/doxygen.css -usr/lib/llvm-3.5/docs/llvm/html/LibASTMatchersReference.html diff --git a/debian/llvm-3.5-examples.dirs b/debian/llvm-3.5-examples.dirs deleted file mode 100644 index 79afcd8d..00000000 --- a/debian/llvm-3.5-examples.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/llvm-3.5-examples diff --git a/debian/llvm-3.5-examples.links b/debian/llvm-3.5-examples.links deleted file mode 100644 index 28c3d37e..00000000 --- a/debian/llvm-3.5-examples.links +++ /dev/null @@ -1,3 +0,0 @@ -/usr/lib/llvm-3.5/build/Makefile.common usr/share/doc/llvm-3.5-examples/Makefile.common -/usr/lib/llvm-3.5/build/Makefile.config usr/share/doc/llvm-3.5-examples/Makefile.config -/usr/lib/llvm-3.5/build/Makefile.rules usr/share/doc/llvm-3.5-examples/Makefile.rules diff --git a/debian/llvm-3.5-runtime.install b/debian/llvm-3.5-runtime.install deleted file mode 100644 index 212ecdf1..00000000 --- a/debian/llvm-3.5-runtime.install +++ /dev/null @@ -1,8 +0,0 @@ -usr/lib/llvm-3.5/bin/lli -usr/lib/llvm-3.5/bin/lli-child-target - -usr/bin/lli-3.5 -usr/bin/lli-child-target-3.5 - -debian/llvm-3.5-runtime.binfmt usr/share/binfmts/ - diff --git a/debian/llvm-3.5-tools.dirs b/debian/llvm-3.5-tools.dirs deleted file mode 100644 index 9f4e3164..00000000 --- a/debian/llvm-3.5-tools.dirs +++ /dev/null @@ -1,3 +0,0 @@ -/usr/lib/llvm-3.5/build/unittests -/usr/lib/llvm-3.5/build/utils/lit/ - diff --git a/debian/llvm-3.5-tools.install b/debian/llvm-3.5-tools.install deleted file mode 100644 index 36e33bfd..00000000 --- a/debian/llvm-3.5-tools.install +++ /dev/null @@ -1,13 +0,0 @@ -usr/lib/llvm-3.5/bin/count -usr/lib/llvm-3.5/bin/FileCheck -usr/lib/llvm-3.5/bin/not - - -unittests/Makefile.unittest /usr/lib/llvm-3.5/build/unittests/ - -utils/lit/* /usr/lib/llvm-3.5/build/utils/lit/ - - -usr/bin/count-3.5 -usr/bin/FileCheck-3.5 -usr/bin/not-3.5 diff --git a/debian/llvm-3.5.dirs b/debian/llvm-3.5.dirs deleted file mode 100644 index f004e445..00000000 --- a/debian/llvm-3.5.dirs +++ /dev/null @@ -1,3 +0,0 @@ -/usr/lib/llvm-3.5/bin -usr/share/man/man1 -usr/share/doc/llvm-3.5 diff --git a/debian/llvm-3.5.install b/debian/llvm-3.5.install deleted file mode 100644 index efb6a4e0..00000000 --- a/debian/llvm-3.5.install +++ /dev/null @@ -1,10 +0,0 @@ -usr/lib/llvm-3.5/bin/llvm-* -usr/lib/llvm-3.5/bin/opt* -usr/lib/llvm-3.5/bin/macho-dump* -usr/lib/llvm-3.5/bin/bugpoint* -usr/lib/llvm-3.5/bin/llc* -usr/bin/llvm-* -usr/bin/opt* -usr/bin/macho-dump* -usr/bin/bugpoint* -usr/bin/llc* diff --git a/debian/llvm-3.5.lintian-overrides b/debian/llvm-3.5.lintian-overrides deleted file mode 100644 index aac74df4..00000000 --- a/debian/llvm-3.5.lintian-overrides +++ /dev/null @@ -1,9 +0,0 @@ -# I know but well... -llvm-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-dwarfdump-3.5.1.gz -llvm-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mc-3.5.1.gz -llvm-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mcmarkup-3.5.1.gz -llvm-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-objdump-3.5.1.gz -llvm-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rtdyld-3.5.1.gz -llvm-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-3.5.1.gz -llvm-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-3.5.1.gz -llvm-3.5: manpage-has-useless-whatis-entry usr/share/man/man1/macho-dump-3.5.1.gz diff --git a/debian/llvm-3.5.manpages b/debian/llvm-3.5.manpages deleted file mode 100644 index cd32c0c6..00000000 --- a/debian/llvm-3.5.manpages +++ /dev/null @@ -1,10 +0,0 @@ -docs/_build/man/* -debian/man/llvm-dwarfdump-3.5.1 -debian/man/llvm-mc-3.5.1 -debian/man/llvm-mcmarkup-3.5.1 -debian/man/llvm-objdump-3.5.1 -debian/man/llvm-rtdyld-3.5.1 -debian/man/llvm-size-3.5.1 -debian/man/llvm-tblgen-3.5.1 -debian/man/macho-dump-3.5.1 - diff --git a/debian/llvm-X.Y-dev.dirs.in b/debian/llvm-X.Y-dev.dirs.in new file mode 100644 index 00000000..3b3b5862 --- /dev/null +++ b/debian/llvm-X.Y-dev.dirs.in @@ -0,0 +1,5 @@ +/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 new file mode 100644 index 00000000..40c0405f --- /dev/null +++ b/debian/llvm-X.Y-dev.install.in @@ -0,0 +1,24 @@ +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@/ +# Explicit debian/tmp since there are multiple declarations +debian/tmp/usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/ + +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-@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-@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 new file mode 100644 index 00000000..622d436d --- /dev/null +++ b/debian/llvm-X.Y-dev.links.in @@ -0,0 +1,11 @@ +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 new file mode 100644 index 00000000..5379e8ec --- /dev/null +++ b/debian/llvm-X.Y-doc.dirs.in @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000..19293ece --- /dev/null +++ b/debian/llvm-X.Y-doc.install.in @@ -0,0 +1,6 @@ +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 new file mode 100644 index 00000000..a8b75c66 --- /dev/null +++ b/debian/llvm-X.Y-examples.dirs.in @@ -0,0 +1 @@ +usr/share/doc/llvm-@LLVM_VERSION@-examples diff --git a/debian/llvm-3.5-examples.examples b/debian/llvm-X.Y-examples.examples.in similarity index 100% rename from debian/llvm-3.5-examples.examples rename to debian/llvm-X.Y-examples.examples.in diff --git a/debian/llvm-X.Y-examples.links.in b/debian/llvm-X.Y-examples.links.in new file mode 100644 index 00000000..a8d74aa2 --- /dev/null +++ b/debian/llvm-X.Y-examples.links.in @@ -0,0 +1,3 @@ +/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-3.5-runtime.binfmt.in b/debian/llvm-X.Y-runtime.binfmt.in similarity index 100% rename from debian/llvm-3.5-runtime.binfmt.in rename to debian/llvm-X.Y-runtime.binfmt.in diff --git a/debian/llvm-X.Y-runtime.install.in b/debian/llvm-X.Y-runtime.install.in new file mode 100644 index 00000000..d8e16a7c --- /dev/null +++ b/debian/llvm-X.Y-runtime.install.in @@ -0,0 +1,8 @@ +usr/lib/llvm-@LLVM_VERSION@/bin/lli +usr/lib/llvm-@LLVM_VERSION@/bin/lli-child-target + +usr/bin/lli-@LLVM_VERSION@ +usr/bin/lli-child-target-@LLVM_VERSION@ + +debian/llvm-@LLVM_VERSION@-runtime.binfmt usr/share/binfmts/ + diff --git a/debian/llvm-3.5-runtime.links b/debian/llvm-X.Y-runtime.links.in similarity index 100% rename from debian/llvm-3.5-runtime.links rename to debian/llvm-X.Y-runtime.links.in diff --git a/debian/llvm-3.5-runtime.manpages b/debian/llvm-X.Y-runtime.manpages.in similarity index 100% rename from debian/llvm-3.5-runtime.manpages rename to debian/llvm-X.Y-runtime.manpages.in diff --git a/debian/llvm-3.5-runtime.postinst b/debian/llvm-X.Y-runtime.postinst.in similarity index 60% rename from debian/llvm-3.5-runtime.postinst rename to debian/llvm-X.Y-runtime.postinst.in index cd49c15d..68300326 100644 --- a/debian/llvm-3.5-runtime.postinst +++ 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.5-runtime.binfmt || true + update-binfmts --import llvm-@LLVM_VERSION@-runtime.binfmt || true fi fi diff --git a/debian/llvm-3.5-runtime.prerm.in b/debian/llvm-X.Y-runtime.prerm.in similarity index 100% rename from debian/llvm-3.5-runtime.prerm.in rename to debian/llvm-X.Y-runtime.prerm.in diff --git a/debian/llvm-X.Y-tools.dirs.in b/debian/llvm-X.Y-tools.dirs.in new file mode 100644 index 00000000..ee339823 --- /dev/null +++ b/debian/llvm-X.Y-tools.dirs.in @@ -0,0 +1,3 @@ +/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 new file mode 100644 index 00000000..3b9b96c6 --- /dev/null +++ b/debian/llvm-X.Y-tools.install.in @@ -0,0 +1,13 @@ +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-@LLVM_VERSION@/build/unittests/ + +utils/lit/* /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ + + +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 new file mode 100644 index 00000000..56a9655f --- /dev/null +++ b/debian/llvm-X.Y.dirs.in @@ -0,0 +1,3 @@ +/usr/lib/llvm-@LLVM_VERSION@/bin +usr/share/man/man1 +usr/share/doc/llvm-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in new file mode 100644 index 00000000..68b5cbe3 --- /dev/null +++ b/debian/llvm-X.Y.install.in @@ -0,0 +1,10 @@ +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* +usr/bin/bugpoint* +usr/bin/llc* diff --git a/debian/llvm-3.5.links b/debian/llvm-X.Y.links.in similarity index 100% rename from debian/llvm-3.5.links rename to debian/llvm-X.Y.links.in diff --git a/debian/llvm-X.Y.lintian-overrides.in b/debian/llvm-X.Y.lintian-overrides.in new file mode 100644 index 00000000..ac3f7567 --- /dev/null +++ b/debian/llvm-X.Y.lintian-overrides.in @@ -0,0 +1,9 @@ +# I know but well... +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 new file mode 100644 index 00000000..b74242d7 --- /dev/null +++ b/debian/llvm-X.Y.manpages.in @@ -0,0 +1,10 @@ +docs/_build/man/* +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/python-clang-3.5.install b/debian/python-clang-X.Y.install.in similarity index 100% rename from debian/python-clang-3.5.install rename to debian/python-clang-X.Y.install.in diff --git a/debian/rules b/debian/rules index a65a3003..581edb01 100755 --- a/debian/rules +++ b/debian/rules @@ -129,14 +129,22 @@ endif dh $@ --with ocaml -debian/%: debian/%.in - sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $< > $@ + +preconfigure: + for f in debian/*.in; do \ + f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ + 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 # Override this two targets. They are trying to manage the .in conversion for me override_dh_ocamlinit: override_dh_ocamlclean: -override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/libclang1-$(LLVM_VERSION).install.in debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/libllvm$(LLVM_VERSION).links debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/libclang-$(LLVM_VERSION)-dev.links debian/libclang1-$(LLVM_VERSION).install debian/pollycc +override_dh_auto_configure: preconfigure echo "Using gcc: " $(CC) -v mkdir -p $(TARGET_BUILD)