diff --git a/debian/changelog b/debian/changelog index fc50c04f..2a80edf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ llvm-toolchain-snapshot (1:3.4~svn194079-2) UNRELEASED; urgency=low + * Switch from 3.4 to 3.5 * Remove patch 0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch Useless now and missleading + * Standards-Version updated to 3.9.5 -- Sylvestre Ledru Wed, 20 Nov 2013 21:24:28 +0100 diff --git a/debian/clang-3.4.install b/debian/clang-3.4.install deleted file mode 100644 index da6dc412..00000000 --- a/debian/clang-3.4.install +++ /dev/null @@ -1,11 +0,0 @@ -usr/lib/llvm-3.4/bin/clang /usr/bin/ -usr/lib/llvm-3.4/bin/clang++ /usr/bin/ -usr/lib/llvm-3.4/bin/clang-check /usr/bin/ -usr/lib/llvm-3.4/bin/clang-tblgen /usr/bin/ -usr/lib/llvm-3.4/bin/c-index-test* -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/ - diff --git a/debian/clang-3.4.lintian-overrides b/debian/clang-3.4.lintian-overrides deleted file mode 100644 index 890b17a7..00000000 --- a/debian/clang-3.4.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# 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 diff --git a/debian/clang-3.4-doc.docs b/debian/clang-3.5-doc.docs similarity index 100% rename from debian/clang-3.4-doc.docs rename to debian/clang-3.5-doc.docs diff --git a/debian/clang-3.4-examples.examples b/debian/clang-3.5-examples.examples similarity index 100% rename from debian/clang-3.4-examples.examples rename to debian/clang-3.5-examples.examples diff --git a/debian/clang-3.5.install b/debian/clang-3.5.install new file mode 100644 index 00000000..52350dab --- /dev/null +++ b/debian/clang-3.5.install @@ -0,0 +1,11 @@ +usr/lib/llvm-3.5/bin/clang /usr/bin/ +usr/lib/llvm-3.5/bin/clang++ /usr/bin/ +usr/lib/llvm-3.5/bin/clang-check /usr/bin/ +usr/lib/llvm-3.5/bin/clang-tblgen /usr/bin/ +usr/lib/llvm-3.5/bin/c-index-test* +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/ + diff --git a/debian/clang-3.4.links b/debian/clang-3.5.links similarity index 55% rename from debian/clang-3.4.links rename to debian/clang-3.5.links index bd6dbed6..cb8d4c49 100644 --- a/debian/clang-3.4.links +++ b/debian/clang-3.5.links @@ -1,5 +1,5 @@ -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-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 diff --git a/debian/clang-3.5.lintian-overrides b/debian/clang-3.5.lintian-overrides new file mode 100644 index 00000000..58aa8315 --- /dev/null +++ b/debian/clang-3.5.lintian-overrides @@ -0,0 +1,4 @@ +# 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.4.manpages b/debian/clang-3.5.manpages similarity index 100% rename from debian/clang-3.4.manpages rename to debian/clang-3.5.manpages diff --git a/debian/clang-3.4.postinst b/debian/clang-3.5.postinst similarity index 100% rename from debian/clang-3.4.postinst rename to debian/clang-3.5.postinst diff --git a/debian/clang-3.4.prerm b/debian/clang-3.5.prerm similarity index 100% rename from debian/clang-3.4.prerm rename to debian/clang-3.5.prerm diff --git a/debian/clang-format-3.4.install b/debian/clang-format-3.4.install deleted file mode 100644 index 68b087da..00000000 --- a/debian/clang-format-3.4.install +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/debian/clang-format-3.4.lintian-overrides b/debian/clang-format-3.4.lintian-overrides deleted file mode 100644 index cd34b189..00000000 --- a/debian/clang-format-3.4.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# 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 - diff --git a/debian/clang-format-3.4.manpages b/debian/clang-format-3.4.manpages deleted file mode 100644 index 636bc81e..00000000 --- a/debian/clang-format-3.4.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/clang-format-diff-3.4.1 - diff --git a/debian/clang-format-3.5.install b/debian/clang-format-3.5.install new file mode 100644 index 00000000..d07987ef --- /dev/null +++ b/debian/clang-format-3.5.install @@ -0,0 +1,5 @@ +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 new file mode 100644 index 00000000..38547e42 --- /dev/null +++ b/debian/clang-format-3.5.lintian-overrides @@ -0,0 +1,4 @@ +# 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 new file mode 100644 index 00000000..db3082ad --- /dev/null +++ b/debian/clang-format-3.5.manpages @@ -0,0 +1,2 @@ +debian/man/clang-format-diff-3.5.1 + diff --git a/debian/clang-modernize-3.4.install b/debian/clang-modernize-3.4.install deleted file mode 100644 index a05991a9..00000000 --- a/debian/clang-modernize-3.4.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/llvm-3.4/bin/clang-modernize -usr/bin/clang-modernize-3.4 diff --git a/debian/clang-modernize-3.4.lintian-overrides b/debian/clang-modernize-3.4.lintian-overrides deleted file mode 100644 index 40dff786..00000000 --- a/debian/clang-modernize-3.4.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# I know but well... -clang-modernize-3.4: manpage-has-useless-whatis-entry usr/share/man/man1/clang-modernize-3.4.1.gz diff --git a/debian/clang-modernize-3.4.manpages b/debian/clang-modernize-3.4.manpages deleted file mode 100644 index 539cd271..00000000 --- a/debian/clang-modernize-3.4.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/clang-modernize-3.4.1 diff --git a/debian/clang-modernize-3.5.install b/debian/clang-modernize-3.5.install new file mode 100644 index 00000000..e8d45dad --- /dev/null +++ b/debian/clang-modernize-3.5.install @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..4a8f1296 --- /dev/null +++ b/debian/clang-modernize-3.5.lintian-overrides @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 00000000..7692f9f5 --- /dev/null +++ b/debian/clang-modernize-3.5.manpages @@ -0,0 +1 @@ +debian/man/clang-modernize-3.5.1 diff --git a/debian/control b/debian/control index 07d61c57..e8917659 100644 --- a/debian/control +++ b/debian/control @@ -18,17 +18,15 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snap # ------------- clang ------------- -Package: clang-3.4 +Package: clang-3.5 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-common-3.4-dev (= ${binary:Version}), - libclang1-3.4 (= ${binary:Version}) + libclang-common-3.5-dev (= ${binary:Version}), + libclang1-3.5 (= ${binary:Version}) Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-3.4-dev, python -Replaces: clang (<< 1:3.4), clang-3.1, clang-3.2, clang-3.3, compiler-rt, - llvm-3.4 (<< 1:3.4~svn194058) -Breaks: clang (<< 1:3.4), clang-3.1, clang-3.2, clang-3.3, compiler-rt, - llvm-3.4 (<< 1:3.4~svn194058) +Recommends: llvm-3.5-dev, python +Replaces: clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt +Breaks: clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt Description: C, C++ and Objective-C compiler (LLVM based) Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -37,7 +35,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) Clang implements all of the ISO C++ 1998 and 2001 standards and also provides a partial support of C++1y. -Package: clang-format-3.4 +Package: clang-format-3.5 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python Replaces: clang-format-3.3 @@ -54,9 +52,9 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: cpp11-migrate-3.4 +Package: cpp11-migrate-3.5 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-modernize-3.4 +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-modernize-3.5 Replaces: cpp11-migrate-3.3 Breaks: cpp11-migrate-3.3 Description: Tool to convert C++98 and C++03 code to C++11 @@ -69,11 +67,11 @@ Description: Tool to convert C++98 and C++03 code to C++11 . This is a transitional dummy package. It can safely be removed. -Package: clang-modernize-3.4 +Package: clang-modernize-3.5 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.4 -Replaces: cpp11-migrate-3.3, cpp11-migrate-3.4 (<< 1:3.4~svn189984-1) -Breaks: cpp11-migrate-3.3, cpp11-migrate-3.4 (<< 1:3.4~svn189984-1) +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.5 +Replaces: cpp11-migrate-3.3, cpp11-migrate-3.4 +Breaks: cpp11-migrate-3.3, cpp11-migrate-3.4 Description: Tool to convert C++98 and C++03 code to C++11 The purpose of the C++11 Migrator is to do source-to-source translation to migrate existing C++ code to use C++11 features to enhance @@ -83,7 +81,7 @@ Description: Tool to convert C++98 and C++03 code to C++11 the AST Matching library. -Package: clang-3.4-doc +Package: clang-3.5-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -97,7 +95,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) - Documentation . This package contains the documentation. -Package: libclang1-3.4 +Package: libclang1-3.5 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs} Pre-Depends: ${misc:Pre-Depends} @@ -118,11 +116,11 @@ Description: C interface to the clang library locations with elements within the AST, and other facilities that support Clang-based development tools. -Package: libclang1-3.4-dbg +Package: libclang1-3.5-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.4 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.5 Description: clang library Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -133,11 +131,11 @@ Description: clang library . This package contains the debugging symbols. -Package: libclang-3.4-dev +Package: libclang-3.5-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang1-3.4 (= ${binary:Version}), libclang-common-3.4-dev (= ${binary:Version}) + libclang1-3.5 (= ${binary:Version}), libclang-common-3.5-dev (= ${binary:Version}) Description: clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -147,14 +145,12 @@ Description: clang library - Development package a partial support of C++1y. . This package contains the clang headers to develop extensions over - libclang1-3.4. + libclang1-3.5. -Package: libclang-common-3.4-dev +Package: libclang-common-3.5-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}) -Replaces: llvm-3.4-dev (<< 1:3.2repack), libclang-3.4-dev -Breaks: llvm-3.4-dev (<< 1:3.2repack) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 (= ${binary:Version}) Description: clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -167,7 +163,7 @@ Description: clang library - Common development package (profiling, etc). -Package: python-clang-3.4 +Package: python-clang-3.5 Section: python Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python @@ -177,7 +173,7 @@ Description: Clang Python Bindings This binding package provides access to the Clang compiler and libraries. -Package: clang-3.4-examples +Package: clang-3.5-examples Architecture: any Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -193,7 +189,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm3.4 +Package: libllvm3.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -206,11 +202,11 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: libllvm3.4-dbg +Package: libllvm3.5-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: Modular compiler and toolchain technologies, debugging libraries @@ -220,13 +216,11 @@ Description: Modular compiler and toolchain technologies, debugging libraries . This package contains the LLVM runtime library debug symbols. -Package: llvm-3.4 +Package: llvm-3.5 Architecture: any -Suggests: llvm-3.4-doc -Depends: llvm-3.4-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-3.4-dev -Conflicts: llvm (<< 2.7-1) -Replaces: llvm (<< 2.7-1) +Suggests: llvm-3.5-doc +Depends: llvm-3.5-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-3.5-dev Description: Modular compiler and toolchain technologies LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -253,7 +247,7 @@ Description: Modular compiler and toolchain technologies LLVM is the key component of the clang compiler and the gcc plugin called dragonegg. -Package: llvm-3.4-runtime +Package: llvm-3.5-runtime Architecture: any Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} Conflicts: llvm (<< 2.7-1) @@ -274,10 +268,10 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-3.4-dev +Package: llvm-3.5-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends}, - llvm-3.4 (= ${binary:Version}), libtinfo-dev + llvm-3.5 (= ${binary:Version}), libtinfo-dev Replaces: llvm (<< 2.2-3) Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build @@ -295,13 +289,11 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: libllvm-3.4-ocaml-dev +Package: libllvm-3.5-ocaml-dev Section: ocaml Architecture: any -Suggests: llvm-3.4-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.4-dev (= ${binary:Version}) -Replaces: libllvm-ocaml-3.4-dev -Conflicts: libllvm-ocaml-3.4-dev +Suggests: llvm-3.5-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.5-dev (= ${binary:Version}) Provides: ${ocaml:Provides} Description: Modular compiler and toolchain technologies, OCaml bindings LLVM is a collection of libraries and tools that make it easy to build @@ -318,7 +310,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-3.4-doc +Package: llvm-3.5-doc Section: doc Architecture: all Depends: ${misc:Depends}, libjs-jquery, libjs-underscore @@ -337,10 +329,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-3.4-examples +Package: llvm-3.5-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-3.4-dev (>= ${source:Version}), llvm-3.4-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-3.5-dev (>= ${source:Version}), llvm-3.5-dev (<< ${source:Version}+c~) Description: Modular compiler and toolchain technologies, examples LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -360,10 +352,10 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- -Package: lldb-3.4 +Package: lldb-3.5 Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 # Only hurd has been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}), python, llvm-3.4-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 (= ${binary:Version}), python, llvm-3.5-dev Pre-Depends: ${misc:Pre-Depends} Replaces: lldb-3.2, lldb-3.3 Breaks: lldb-3.2, lldb-3.3 @@ -372,9 +364,9 @@ Description: Next generation, high-performance debugger reusable components which highly leverage existing libraries in the larger LLVM Project, such as the Clang expression parser and LLVM disassembler. -Package: lldb-3.4-dev +Package: lldb-3.5-dev Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.4 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.5 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger - Header files LLDB is a next generation, high-performance debugger. It is built as a set of diff --git a/debian/libclang-3.4-dev.links.in b/debian/libclang-3.4-dev.links.in deleted file mode 100644 index 611ca4cd..00000000 --- a/debian/libclang-3.4-dev.links.in +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/debian/libclang-3.4-dev.install b/debian/libclang-3.5-dev.install similarity index 66% rename from debian/libclang-3.4-dev.install rename to debian/libclang-3.5-dev.install index 62e0376f..91e83a93 100644 --- a/debian/libclang-3.4-dev.install +++ b/debian/libclang-3.5-dev.install @@ -1,7 +1,7 @@ -usr/lib/llvm-3.4/include/clang -usr/lib/llvm-3.4/include/clang-c +usr/lib/llvm-3.5/include/clang +usr/lib/llvm-3.5/include/clang-c #usr/include/clang /usr/include/ #usr/include/clang-c /usr/include/ #usr/lib/libclang.so /usr/lib/ -usr/lib/llvm-3.4/lib/libclang*a +usr/lib/llvm-3.5/lib/libclang*a #usr/lib/libclang*a /usr/lib/ diff --git a/debian/libclang-3.5-dev.links.in b/debian/libclang-3.5-dev.links.in new file mode 100644 index 00000000..eae5c0e3 --- /dev/null +++ b/debian/libclang-3.5-dev.links.in @@ -0,0 +1,3 @@ +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-common-3.4-dev.install b/debian/libclang-common-3.4-dev.install deleted file mode 100644 index 5678e0a4..00000000 --- a/debian/libclang-common-3.4-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/llvm-3.4/lib/clang/3.4/include -#usr/lib/clang/3.4/include/ /usr/include/clang/3.4/ -usr/lib/llvm-3.4/lib/clang/3.4/lib -#usr/lib/clang/3.4/lib /usr/lib/clang/3.4/ diff --git a/debian/libclang-common-3.4-dev.links b/debian/libclang-common-3.4-dev.links deleted file mode 100644 index 9afa9e0f..00000000 --- a/debian/libclang-common-3.4-dev.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/llvm-3.4/lib/clang/3.4/include usr/include/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4/lib /usr/lib/clang/3.4/lib diff --git a/debian/libclang-common-3.5-dev.install b/debian/libclang-common-3.5-dev.install new file mode 100644 index 00000000..78c8ccc4 --- /dev/null +++ b/debian/libclang-common-3.5-dev.install @@ -0,0 +1,4 @@ +usr/lib/llvm-3.5/lib/clang/3.5/include +#usr/lib/clang/3.5/include/ /usr/include/clang/3.5/ +usr/lib/llvm-3.5/lib/clang/3.5/lib +#usr/lib/clang/3.5/lib /usr/lib/clang/3.5/ diff --git a/debian/libclang-common-3.5-dev.links b/debian/libclang-common-3.5-dev.links new file mode 100644 index 00000000..cea59cb1 --- /dev/null +++ b/debian/libclang-common-3.5-dev.links @@ -0,0 +1,2 @@ +usr/lib/llvm-3.5/lib/clang/3.5/include usr/include/clang/3.5/include +usr/lib/llvm-3.5/lib/clang/3.5/lib /usr/lib/clang/3.5/lib diff --git a/debian/libclang1-3.4.install.in b/debian/libclang1-3.4.install.in deleted file mode 100644 index 5b87f454..00000000 --- a/debian/libclang1-3.4.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-3.4/lib/libclang-3.4.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libclang1-3.4.links.in b/debian/libclang1-3.4.links.in deleted file mode 100644 index 8a00b651..00000000 --- a/debian/libclang1-3.4.links.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang.so.1 diff --git a/debian/libclang1-3.5.install.in b/debian/libclang1-3.5.install.in new file mode 100644 index 00000000..516ccab3 --- /dev/null +++ b/debian/libclang1-3.5.install.in @@ -0,0 +1 @@ +usr/lib/llvm-3.5/lib/libclang-3.5.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libclang1-3.5.links.in b/debian/libclang1-3.5.links.in new file mode 100644 index 00000000..c495143d --- /dev/null +++ b/debian/libclang1-3.5.links.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.5.so.1 usr/lib/llvm-3.5/lib/libclang.so.1 diff --git a/debian/libclang1-3.4.symbols b/debian/libclang1-3.5.symbols similarity index 91% rename from debian/libclang1-3.4.symbols rename to debian/libclang1-3.5.symbols index 875c2ce0..25d9de89 100644 --- a/debian/libclang1-3.4.symbols +++ b/debian/libclang1-3.5.symbols @@ -1,4 +1,4 @@ -libclang.so.1 libclang1-3.4 #MINVER# +libclang.so.1 libclang1-3.5 #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:3.5 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:3.5 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:3.5 + clang_Cursor_getObjCPropertyAttributes@Base 1:3.5 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:3.5 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:3.5 + clang_Cursor_isVariadic@Base 1:3.5 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:3.5 + clang_Location_isInSystemHeader@Base 1:3.5 + clang_Module_getASTFile@Base 1:3.5 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:3.5 + clang_Type_getCXXRefQualifier@Base 1:3.5 + clang_Type_getClassType@Base 1:3.5 + clang_Type_getOffsetOf@Base 1:3.5 + clang_Type_getSizeOf@Base 1:3.5 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:3.5 + clang_findIncludesInFileWithBlock@Base 1:3.5 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:3.5 clang_getFile@Base 3.2 - clang_getFileLocation@Base 1:3.4 + clang_getFileLocation@Base 1:3.5 clang_getFileName@Base 3.2 clang_getFileTime@Base 3.2 - clang_getFileUniqueID@Base 1:3.4 + clang_getFileUniqueID@Base 1:3.5 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:3.5 clang_getTypedefDeclUnderlyingType@Base 3.2 clang_hashCursor@Base 3.2 clang_indexLoc_getCXSourceLocation@Base 3.2 diff --git a/debian/libllvm-3.4-ocaml-dev.doc-base b/debian/libllvm-3.4-ocaml-dev.doc-base deleted file mode 100644 index 01042fd1..00000000 --- a/debian/libllvm-3.4-ocaml-dev.doc-base +++ /dev/null @@ -1,8 +0,0 @@ -Document: libllvm-3.4-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/* diff --git a/debian/libllvm-3.4-ocaml-dev.install.in b/debian/libllvm-3.4-ocaml-dev.install.in deleted file mode 100644 index 27018b07..00000000 --- a/debian/libllvm-3.4-ocaml-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/@OCAML_STDLIB_DIR@/llvm-3.4 @OCAML_STDLIB_DIR@/ -debian/tmp//usr/lib/llvm-3.4/docs/llvm/ocamldoc/html usr/share/doc/libllvm-3.4-ocaml-dev/ diff --git a/debian/libllvm-3.4-ocaml-dev.lintian-overrides b/debian/libllvm-3.4-ocaml-dev.lintian-overrides deleted file mode 100644 index afa70d5c..00000000 --- a/debian/libllvm-3.4-ocaml-dev.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/debian/libllvm-3.4-ocaml-dev.META b/debian/libllvm-3.5-ocaml-dev.META similarity index 76% rename from debian/libllvm-3.4-ocaml-dev.META rename to debian/libllvm-3.5-ocaml-dev.META index c8fc9ad0..a197e44a 100644 --- a/debian/libllvm-3.4-ocaml-dev.META +++ b/debian/libllvm-3.5-ocaml-dev.META @@ -1,7 +1,7 @@ description = "Low Level Virtual Machine bindings" -version = "3.4" +version = "3.5" -directory = "+llvm-3.4" +directory = "+llvm-3.5" 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-3_5" + version = "3.5" 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-3_5" + version = "3.5" 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-3_5 llvm-3_5.target" + version = "3.5" 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-3_5" + version = "3.5" 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-3_5" + version = "3.5" 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-3_5 llvm-3_5.bitwriter" + version = "3.5" archive(native) = "llvm_bitreader.cmxa" archive(byte) = "llvm_bitreader.cma" linkopts = "-cclib -lllvm_bitreader" diff --git a/debian/libllvm-3.4-ocaml-dev.dirs.in b/debian/libllvm-3.5-ocaml-dev.dirs.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.dirs.in rename to debian/libllvm-3.5-ocaml-dev.dirs.in diff --git a/debian/libllvm-3.5-ocaml-dev.doc-base b/debian/libllvm-3.5-ocaml-dev.doc-base new file mode 100644 index 00000000..3f7834e3 --- /dev/null +++ b/debian/libllvm-3.5-ocaml-dev.doc-base @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..852e9229 --- /dev/null +++ b/debian/libllvm-3.5-ocaml-dev.install.in @@ -0,0 +1,2 @@ +debian/tmp/@OCAML_STDLIB_DIR@/llvm-3.5 @OCAML_STDLIB_DIR@/ +debian/tmp//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 new file mode 100644 index 00000000..c331ef17 --- /dev/null +++ b/debian/libllvm-3.5-ocaml-dev.lintian-overrides @@ -0,0 +1,2 @@ +# 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/libllvm3.4.install b/debian/libllvm3.4.install deleted file mode 100644 index e76f4b45..00000000 --- a/debian/libllvm3.4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-3.4/lib/libLLVM-3.4.so.1 /usr/lib/x86_64-linux-gnu/ diff --git a/debian/libllvm3.4.install.in b/debian/libllvm3.4.install.in deleted file mode 100644 index 29368d96..00000000 --- a/debian/libllvm3.4.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-3.4/lib/libLLVM-3.4.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libllvm3.5.install b/debian/libllvm3.5.install new file mode 100644 index 00000000..f917c7c6 --- /dev/null +++ b/debian/libllvm3.5.install @@ -0,0 +1 @@ +usr/lib/llvm-3.5/lib/libLLVM-3.5.so.1 /usr/lib/x86_64-linux-gnu/ diff --git a/debian/libllvm3.5.install.in b/debian/libllvm3.5.install.in new file mode 100644 index 00000000..9c3500c4 --- /dev/null +++ b/debian/libllvm3.5.install.in @@ -0,0 +1 @@ +usr/lib/llvm-3.5/lib/libLLVM-3.5.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libllvm3.4.lintian-overrides b/debian/libllvm3.5.lintian-overrides similarity index 51% rename from debian/libllvm3.4.lintian-overrides rename to debian/libllvm3.5.lintian-overrides index 2ae98305..c9c5b411 100644 --- a/debian/libllvm3.4.lintian-overrides +++ b/debian/libllvm3.5.lintian-overrides @@ -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 +libllvm3.5: package-name-doesnt-match-sonames libLLVM-3.5-1 diff --git a/debian/lldb-3.4-dev.install b/debian/lldb-3.4-dev.install deleted file mode 100644 index 97831b4a..00000000 --- a/debian/lldb-3.4-dev.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/llvm-3.4/include/lldb diff --git a/debian/lldb-3.4.install.in b/debian/lldb-3.4.install.in deleted file mode 100644 index 389d5f50..00000000 --- a/debian/lldb-3.4.install.in +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin/lldb-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@/ -build-llvm/Release/lib/python2.7/site-packages/lldb/ /usr/lib/python2.7/dist-packages/ diff --git a/debian/lldb-3.4.lintian-overrides b/debian/lldb-3.4.lintian-overrides deleted file mode 100644 index b190d37d..00000000 --- a/debian/lldb-3.4.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# That is normal. The lib is not shipped as a new package -lldb-3.4: package-name-doesnt-match-sonames liblldb -lldb-3.4: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so diff --git a/debian/lldb-3.4.manpages b/debian/lldb-3.4.manpages deleted file mode 100644 index 456a421b..00000000 --- a/debian/lldb-3.4.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/lldb-3.4.1 - diff --git a/debian/lldb-3.5-dev.install b/debian/lldb-3.5-dev.install new file mode 100644 index 00000000..d2b67a90 --- /dev/null +++ b/debian/lldb-3.5-dev.install @@ -0,0 +1 @@ +/usr/lib/llvm-3.5/include/lldb diff --git a/debian/lldb-3.5.install.in b/debian/lldb-3.5.install.in new file mode 100644 index 00000000..acf6aa4b --- /dev/null +++ b/debian/lldb-3.5.install.in @@ -0,0 +1,5 @@ +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/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-3.4.links.in b/debian/lldb-3.5.links.in similarity index 100% rename from debian/lldb-3.4.links.in rename to debian/lldb-3.5.links.in diff --git a/debian/lldb-3.5.lintian-overrides b/debian/lldb-3.5.lintian-overrides new file mode 100644 index 00000000..d2ba7d5a --- /dev/null +++ b/debian/lldb-3.5.lintian-overrides @@ -0,0 +1,3 @@ +# 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 diff --git a/debian/lldb-3.5.manpages b/debian/lldb-3.5.manpages new file mode 100644 index 00000000..dbfb05f0 --- /dev/null +++ b/debian/lldb-3.5.manpages @@ -0,0 +1,2 @@ +debian/man/lldb-3.5.1 + diff --git a/debian/lldb-3.4.postinst b/debian/lldb-3.5.postinst similarity index 100% rename from debian/lldb-3.4.postinst rename to debian/lldb-3.5.postinst diff --git a/debian/llvm-3.4-dev.dirs b/debian/llvm-3.4-dev.dirs deleted file mode 100644 index 5dac3aa4..00000000 --- a/debian/llvm-3.4-dev.dirs +++ /dev/null @@ -1,5 +0,0 @@ -/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 diff --git a/debian/llvm-3.4-dev.install b/debian/llvm-3.4-dev.install deleted file mode 100644 index 447ed1d3..00000000 --- a/debian/llvm-3.4-dev.install +++ /dev/null @@ -1,21 +0,0 @@ -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/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/ - -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/ - -utils/vim/llvm-3.4.vim usr/share/vim/addons/syntax/ -utils/vim/tablegen-3.4.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/ diff --git a/debian/llvm-3.4-dev.links.in b/debian/llvm-3.4-dev.links.in deleted file mode 100644 index 518412b3..00000000 --- a/debian/llvm-3.4-dev.links.in +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.so -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 diff --git a/debian/llvm-3.4-doc.dirs b/debian/llvm-3.4-doc.dirs deleted file mode 100644 index 5e1c9848..00000000 --- a/debian/llvm-3.4-doc.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/llvm-3.4-doc diff --git a/debian/llvm-3.4-doc.install b/debian/llvm-3.4-doc.install deleted file mode 100644 index b20f44a5..00000000 --- a/debian/llvm-3.4-doc.install +++ /dev/null @@ -1 +0,0 @@ -docs/_build/html usr/share/doc/llvm-3.4-doc/ diff --git a/debian/llvm-3.4-examples.dirs b/debian/llvm-3.4-examples.dirs deleted file mode 100644 index 3e131339..00000000 --- a/debian/llvm-3.4-examples.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/llvm-3.4-examples diff --git a/debian/llvm-3.4-examples.links b/debian/llvm-3.4-examples.links deleted file mode 100644 index 1496d2ee..00000000 --- a/debian/llvm-3.4-examples.links +++ /dev/null @@ -1,3 +0,0 @@ -/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 diff --git a/debian/llvm-3.4-runtime.install b/debian/llvm-3.4-runtime.install deleted file mode 100644 index 9b5d1d3b..00000000 --- a/debian/llvm-3.4-runtime.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/lib/llvm-3.4/bin/lli /usr/lib/llvm-3.4/bin/ -debian/tmp/usr/bin/lli-3.4 /usr/bin/ -debian/llvm-3.4-runtime.binfmt usr/share/binfmts/ diff --git a/debian/llvm-3.4.dirs b/debian/llvm-3.4.dirs deleted file mode 100644 index f9db0728..00000000 --- a/debian/llvm-3.4.dirs +++ /dev/null @@ -1,3 +0,0 @@ -/usr/lib/llvm-3.4/bin -usr/share/man/man1 -usr/share/doc/llvm-3.4 diff --git a/debian/llvm-3.4.install b/debian/llvm-3.4.install deleted file mode 100644 index d40669a3..00000000 --- a/debian/llvm-3.4.install +++ /dev/null @@ -1,10 +0,0 @@ -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/bin/llvm-* -usr/bin/opt* -usr/bin/macho-dump* -usr/bin/bugpoint* -usr/bin/llc* diff --git a/debian/llvm-3.4.lintian-overrides b/debian/llvm-3.4.lintian-overrides deleted file mode 100644 index b57d03bb..00000000 --- a/debian/llvm-3.4.lintian-overrides +++ /dev/null @@ -1,9 +0,0 @@ -# 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 diff --git a/debian/llvm-3.4.manpages b/debian/llvm-3.4.manpages deleted file mode 100644 index 111d594b..00000000 --- a/debian/llvm-3.4.manpages +++ /dev/null @@ -1,10 +0,0 @@ -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 - diff --git a/debian/llvm-3.5-dev.dirs b/debian/llvm-3.5-dev.dirs new file mode 100644 index 00000000..983d712c --- /dev/null +++ b/debian/llvm-3.5-dev.dirs @@ -0,0 +1,5 @@ +/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 new file mode 100644 index 00000000..5c03da02 --- /dev/null +++ b/debian/llvm-3.5-dev.install @@ -0,0 +1,21 @@ +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/include/llvm/ usr/include/llvm-3.5/ +usr/lib/llvm-3.5/include/llvm-c/ usr/include/llvm-c-3.5/ +cmake/modules/*.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 new file mode 100644 index 00000000..13c57332 --- /dev/null +++ b/debian/llvm-3.5-dev.links.in @@ -0,0 +1,4 @@ +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/llvm-3.5/lib/libLLVM-3.5.so +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 diff --git a/debian/llvm-3.5-doc.dirs b/debian/llvm-3.5-doc.dirs new file mode 100644 index 00000000..74e070fb --- /dev/null +++ b/debian/llvm-3.5-doc.dirs @@ -0,0 +1 @@ +usr/share/doc/llvm-3.5-doc diff --git a/debian/llvm-3.5-doc.install b/debian/llvm-3.5-doc.install new file mode 100644 index 00000000..57900b2a --- /dev/null +++ b/debian/llvm-3.5-doc.install @@ -0,0 +1 @@ +docs/_build/html usr/share/doc/llvm-3.5-doc/ diff --git a/debian/llvm-3.5-examples.dirs b/debian/llvm-3.5-examples.dirs new file mode 100644 index 00000000..79afcd8d --- /dev/null +++ b/debian/llvm-3.5-examples.dirs @@ -0,0 +1 @@ +usr/share/doc/llvm-3.5-examples diff --git a/debian/llvm-3.4-examples.examples b/debian/llvm-3.5-examples.examples similarity index 100% rename from debian/llvm-3.4-examples.examples rename to debian/llvm-3.5-examples.examples diff --git a/debian/llvm-3.5-examples.links b/debian/llvm-3.5-examples.links new file mode 100644 index 00000000..28c3d37e --- /dev/null +++ b/debian/llvm-3.5-examples.links @@ -0,0 +1,3 @@ +/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.4-runtime.binfmt.in b/debian/llvm-3.5-runtime.binfmt.in similarity index 100% rename from debian/llvm-3.4-runtime.binfmt.in rename to debian/llvm-3.5-runtime.binfmt.in diff --git a/debian/llvm-3.5-runtime.install b/debian/llvm-3.5-runtime.install new file mode 100644 index 00000000..9a438eea --- /dev/null +++ b/debian/llvm-3.5-runtime.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/llvm-3.5/bin/lli /usr/lib/llvm-3.5/bin/ +debian/tmp/usr/bin/lli-3.5 /usr/bin/ +debian/llvm-3.5-runtime.binfmt usr/share/binfmts/ diff --git a/debian/llvm-3.4-runtime.links b/debian/llvm-3.5-runtime.links similarity index 100% rename from debian/llvm-3.4-runtime.links rename to debian/llvm-3.5-runtime.links diff --git a/debian/llvm-3.4-runtime.manpages b/debian/llvm-3.5-runtime.manpages similarity index 100% rename from debian/llvm-3.4-runtime.manpages rename to debian/llvm-3.5-runtime.manpages diff --git a/debian/llvm-3.4-runtime.postinst b/debian/llvm-3.5-runtime.postinst similarity index 64% rename from debian/llvm-3.4-runtime.postinst rename to debian/llvm-3.5-runtime.postinst index 9fbcd722..cd49c15d 100644 --- a/debian/llvm-3.4-runtime.postinst +++ b/debian/llvm-3.5-runtime.postinst @@ -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-3.5-runtime.binfmt || true fi fi diff --git a/debian/llvm-3.4-runtime.prerm.in b/debian/llvm-3.5-runtime.prerm.in similarity index 100% rename from debian/llvm-3.4-runtime.prerm.in rename to debian/llvm-3.5-runtime.prerm.in diff --git a/debian/llvm-3.5.dirs b/debian/llvm-3.5.dirs new file mode 100644 index 00000000..f004e445 --- /dev/null +++ b/debian/llvm-3.5.dirs @@ -0,0 +1,3 @@ +/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 new file mode 100644 index 00000000..efb6a4e0 --- /dev/null +++ b/debian/llvm-3.5.install @@ -0,0 +1,10 @@ +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.4.links b/debian/llvm-3.5.links similarity index 100% rename from debian/llvm-3.4.links rename to debian/llvm-3.5.links diff --git a/debian/llvm-3.5.lintian-overrides b/debian/llvm-3.5.lintian-overrides new file mode 100644 index 00000000..aac74df4 --- /dev/null +++ b/debian/llvm-3.5.lintian-overrides @@ -0,0 +1,9 @@ +# 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 new file mode 100644 index 00000000..cd32c0c6 --- /dev/null +++ b/debian/llvm-3.5.manpages @@ -0,0 +1,10 @@ +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/orig-tar.sh b/debian/orig-tar.sh index ff1895c8..83ad3b4f 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -50,7 +50,7 @@ else SVN_CMD="svn export -r $REVISION" fi -MAJOR_VERSION=3.4 +MAJOR_VERSION=3.5 # LLVM LLVM_TARGET=llvm-toolchain-snapshot_$MAJOR_VERSION~svn$REVISION diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 3fc002cc..0dada9ea 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -1,8 +1,8 @@ #!/bin/sh -ORIG_VERSION=3.3 -TARGET_VERSION=3.4 -ORIG_VERSION_2=3_3 -TARGET_VERSION_2=3_4 +ORIG_VERSION=3.4 +TARGET_VERSION=3.5 +ORIG_VERSION_2=3_4 +TARGET_VERSION_2=3_5 LIST=`ls debian/*$ORIG_VERSION*` for F in $LIST; do diff --git a/debian/python-clang-3.4.install b/debian/python-clang-3.5.install similarity index 100% rename from debian/python-clang-3.4.install rename to debian/python-clang-3.5.install diff --git a/debian/rules b/debian/rules index e8f89a0a..f5486cc6 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ TARGET_BUILD := build-llvm GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') -LLVM_VERSION := 3.4 +LLVM_VERSION := 3.5 SONAME_EXT := 1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*-(.*),\1,p') ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) @@ -79,7 +79,7 @@ ifneq (,$(filter scan-build,$(DEB_BUILD_OPTIONS))) # enable the build using scan-build # The package are installed through the variable declarations: # OTHERMIRROR="deb http://llvm.org/apt/unstable/ llvm-toolchain main" -# EXTRAPACKAGES="clang-3.4" +# EXTRAPACKAGES="clang-3.5" PRE_PROCESS=scan-build PRE_PROCESS_CONF=scan-build # no need to run tests in this case