diff --git a/debian/control b/debian/control index c33d90ef..ee2ff8c4 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libcloog-isl-dev, libisl-dev (>= 0.11.1), libjsoncpp-dev, lcov, procps, help2man, dh-ocaml -Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev +Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.6-ocaml-dev Standards-Version: 3.9.5 Homepage: http://www.llvm.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/ @@ -18,14 +18,14 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snap # ------------- clang ------------- -Package: clang-3.5 +Package: clang-3.6 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-common-3.5-dev (= ${binary:Version}), - libclang1-3.5 (= ${binary:Version}), libc6-dev + libclang-common-3.6-dev (= ${binary:Version}), + libclang1-3.6 (= ${binary:Version}), libc6-dev Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-3.5-dev, python -Suggests: gnustep, gnustep-devel, clang-3.5-doc +Recommends: llvm-3.6-dev, python +Suggests: gnustep, gnustep-devel, clang-3.6-doc Replaces: clang, clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt Breaks: clang, clang-3.1, clang-3.2, clang-3.3, clang-3.4, compiler-rt Description: C, C++ and Objective-C compiler (LLVM based) @@ -36,7 +36,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.5 +Package: clang-format-3.6 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python Replaces: clang-format-3.3 @@ -53,9 +53,9 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: cpp11-migrate-3.5 +Package: cpp11-migrate-3.6 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-modernize-3.5 +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-modernize-3.6 Replaces: cpp11-migrate-3.3 Breaks: cpp11-migrate-3.3 Description: Tool to convert C++98 and C++03 code to C++11 @@ -68,9 +68,9 @@ 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.5 +Package: clang-modernize-3.6 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.5 +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.6 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 @@ -82,7 +82,7 @@ Description: Tool to convert C++98 and C++03 code to C++11 the AST Matching library. -Package: clang-3.5-doc +Package: clang-3.6-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -96,7 +96,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) - Documentation . This package contains the documentation. -Package: libclang1-3.5 +Package: libclang1-3.6 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs} Pre-Depends: ${misc:Pre-Depends} @@ -117,11 +117,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.5-dbg +Package: libclang1-3.6-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.5 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.6 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 @@ -132,11 +132,11 @@ Description: clang library . This package contains the debugging symbols. -Package: libclang-3.5-dev +Package: libclang-3.6-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang1-3.5 (= ${binary:Version}), libclang-common-3.5-dev (= ${binary:Version}) + libclang1-3.6 (= ${binary:Version}), libclang-common-3.6-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 @@ -146,12 +146,12 @@ Description: clang library - Development package a partial support of C++1y. . This package contains the clang headers to develop extensions over - libclang1-3.5. + libclang1-3.6. -Package: libclang-common-3.5-dev +Package: libclang-common-3.6-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.6 (= ${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 @@ -164,7 +164,7 @@ Description: clang library - Common development package (profiling, etc). -Package: python-clang-3.5 +Package: python-clang-3.6 Section: python Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python @@ -174,7 +174,7 @@ Description: Clang Python Bindings This binding package provides access to the Clang compiler and libraries. -Package: clang-3.5-examples +Package: clang-3.6-examples Architecture: any Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -190,7 +190,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm3.5 +Package: libllvm3.6 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -203,11 +203,11 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: libllvm3.5-dbg +Package: libllvm3.6-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.6 Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: Modular compiler and toolchain technologies, debugging libraries @@ -217,11 +217,11 @@ Description: Modular compiler and toolchain technologies, debugging libraries . This package contains the LLVM runtime library debug symbols. -Package: llvm-3.5 +Package: llvm-3.6 Architecture: any -Suggests: llvm-3.5-doc -Depends: llvm-3.5-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-3.5-dev +Suggests: llvm-3.6-doc +Depends: llvm-3.6-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-3.6-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 @@ -248,7 +248,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.5-runtime +Package: llvm-3.6-runtime Architecture: any Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} Conflicts: llvm (<< 2.7-1) @@ -269,10 +269,10 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-3.5-dev +Package: llvm-3.6-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends}, - llvm-3.5 (= ${binary:Version}), libtinfo-dev + llvm-3.6 (= ${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 @@ -292,10 +292,10 @@ Description: Modular compiler and toolchain technologies, libraries and headers -Package: llvm-3.5-tools +Package: llvm-3.6-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, - llvm-3.5-dev (= ${binary:Version}) + llvm-3.6-dev (= ${binary:Version}) Description: Modular compiler and toolchain technologies, tools LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -312,11 +312,11 @@ Description: Modular compiler and toolchain technologies, tools This package provides tools for testing. -Package: libllvm-3.5-ocaml-dev +Package: libllvm-3.6-ocaml-dev Section: ocaml Architecture: any -Suggests: llvm-3.5-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.5-dev (= ${binary:Version}) +Suggests: llvm-3.6-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.6-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 @@ -333,7 +333,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-3.5-doc +Package: llvm-3.6-doc Section: doc Architecture: all Depends: ${misc:Depends}, libjs-jquery, libjs-underscore @@ -352,10 +352,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-3.5-examples +Package: llvm-3.6-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-3.5-dev (>= ${source:Version}), llvm-3.5-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-3.6-dev (>= ${source:Version}), llvm-3.6-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 @@ -375,10 +375,10 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- -Package: lldb-3.5 +Package: lldb-3.6 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc # ia64 mips mipsel hurd have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 (= ${binary:Version}), python, llvm-3.5-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.6 (= ${binary:Version}), python, llvm-3.6-dev Pre-Depends: ${misc:Pre-Depends} Replaces: lldb-3.2, lldb-3.3, lldb-3.4 Breaks: lldb-3.2, lldb-3.3, lldb-3.4 @@ -387,10 +387,10 @@ 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.5-dev +Package: lldb-3.6-dev Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc # ia64 mips mipsel hurd have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.5 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.6 (= ${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/orig-tar.sh b/debian/orig-tar.sh index a36580ec..ddccfb95 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -14,8 +14,8 @@ set -e # sh 3.4/debian/orig-tar.sh RELEASE_34 rc1 SVN_BASE_URL=http://llvm.org/svn/llvm-project/ -MAJOR_VERSION=3.5 -CURRENT_VERSION=3.5 # Should be changed to 3.5.1 later +MAJOR_VERSION=3.6 +CURRENT_VERSION=3.6 # Should be changed to 3.6.1 later if test -n "$1"; then # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/ diff --git a/debian/rules b/debian/rules index 5a2a373c..333fbdfc 100755 --- a/debian/rules +++ b/debian/rules @@ -4,10 +4,10 @@ TARGET_BUILD := build-llvm DEB_INST := $(CURDIR)/debian/tmp/ #GCC_VERSION := 4.8 GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') -LLVM_VERSION := 3.5 +LLVM_VERSION := 3.6 LLVM_VERSION_FULL := $(LLVM_VERSION).0 SONAME_EXT := 1 -# Manage the case when the version is 1:3.5~svn213052-1~exp1 or 1:3.4.2-1 +# Manage the case when the version is 1:3.6~svn213.62-1~exp1 or 1:3.4.2-1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p") ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) @@ -90,7 +90,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.5" +# EXTRAPACKAGES="clang-3.6" PRE_PROCESS=scan-build -analyzer-config stable-report-filename=true PRE_PROCESS_CONF=scan-build # no need to run tests in this case