diff -Nru llvm-defaults-0.33/debian/changelog llvm-defaults-0.33ubuntu3/debian/changelog --- llvm-defaults-0.33/debian/changelog 2016-01-01 20:41:44.000000000 +0000 +++ llvm-defaults-0.33ubuntu3/debian/changelog 2016-02-12 12:37:48.000000000 +0000 @@ -1,3 +1,22 @@ +llvm-defaults (0.33ubuntu3) xenial; urgency=medium + + * Stop building the clang-modernize package. + + -- Matthias Klose Fri, 12 Feb 2016 13:37:27 +0100 + +llvm-defaults (0.33ubuntu2) xenial; urgency=medium + + * Don't build lldb on powerpc. + + -- Matthias Klose Thu, 11 Feb 2016 09:58:44 +0100 + +llvm-defaults (0.33ubuntu1) xenial; urgency=medium + + * Default to llvm-toolchain-3.8 + * lldb is not supported on s390x. + + -- Matthias Klose Wed, 10 Feb 2016 20:23:39 +0100 + llvm-defaults (0.33) unstable; urgency=medium * Fix for real bug #803558 by using 1:3.6-28 instead of << 0.28 diff -Nru llvm-defaults-0.33/debian/control llvm-defaults-0.33ubuntu3/debian/control --- llvm-defaults-0.33/debian/control 2016-01-01 20:14:45.000000000 +0000 +++ llvm-defaults-0.33ubuntu3/debian/control 2016-02-12 12:37:24.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Matthias Klose , Sylvestre Ledru Standards-Version: 3.9.6 Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.9), lsb-release, - llvm-3.6-dev, libllvm-3.6-ocaml-dev, m4, + llvm-3.8-dev, libllvm-3.8-ocaml-dev, m4, Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-defaults/trunk/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-defaults/trunk/ @@ -66,21 +66,6 @@ . This is a dependency package providing the default clang compiler. -Package: clang-modernize -Architecture: any -Depends: clang-modernize-${pv:llvm} ${reqv:llvm}, ${misc:Depends} -Breaks: clang (<< 1:3.6-28) -Replaces: clang (<< 1:3.6-28) -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 - maintainability, readability, runtime performance, and compile-time - performance. Development is still early and transforms fall mostly into - the first two categories. The migrator is based on Clang's LibTooling and - the AST Matching library. - . - This is a dependency package providing the clang modernize tool. - Package: clang-tidy Architecture: any Depends: clang-tidy-${pv:llvm} ${reqv:llvm}, ${misc:Depends} diff -Nru llvm-defaults-0.33/debian/README.Debian llvm-defaults-0.33ubuntu3/debian/README.Debian --- llvm-defaults-0.33/debian/README.Debian 2015-10-19 08:11:21.000000000 +0000 +++ llvm-defaults-0.33ubuntu3/debian/README.Debian 2016-02-10 19:38:55.000000000 +0000 @@ -34,7 +34,7 @@ The default compiler versions for Debian GNU/Linux on amd64 are (minor version numbers omitted): - llvm : llvm-3.6 + llvm : llvm-3.8 Thanks to llvm-defaults, each architecture can choose its own preferred llvm version, and that preference can change without diff -Nru llvm-defaults-0.33/debian/rules llvm-defaults-0.33ubuntu3/debian/rules --- llvm-defaults-0.33/debian/rules 2015-10-29 12:35:22.000000000 +0000 +++ llvm-defaults-0.33ubuntu3/debian/rules 2016-02-12 12:39:03.000000000 +0000 @@ -40,23 +40,26 @@ # llvm-defaults 0.27 is the first version for 3.6. REL_NO_36 := $(shell expr $(VMINOR) - 0)$(REL_EXT) +# llvm-defaults 0.33 is the first version for 3.6. +REL_NO_38 := $(shell expr $(VMINOR) - 0)$(REL_EXT) + # minimum required version -REQV := (>= 3.6~) +REQV := (>= 3.8~) -CURRENT_VERSION := 3.6 +CURRENT_VERSION := 3.8 # architecture dependent variables DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) # complete version number, including the release -CV_LLVM := 1:$(CURRENT_VERSION)-$(REL_NO_36) +CV_LLVM := 1:$(CURRENT_VERSION)-$(REL_NO_38) distribution := $(shell lsb_release -is) -all_packages := llvm llvm-runtime llvm-dev libllvm-ocaml-dev clang libclang1 libclang-dev clang-format clang-modernize clang-tidy +all_packages := llvm llvm-runtime llvm-dev libllvm-ocaml-dev clang libclang1 libclang-dev clang-format clang-tidy no_packages := llvm-gcc # must be built? -LLDB_SUPPORTED=amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel +LLDB_SUPPORTED=amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel ifneq (,$(filter $(DEB_HOST_ARCH),$(LLDB_SUPPORTED))) all_packages += lldb else @@ -207,14 +210,6 @@ /usr/lib/llvm-$(PV_LLVM)/bin/$$bin \ /usr/bin/$$bin ; \ done - - for bin in \ - clang-modernize \ - ; do \ - dh_link -pclang-modernize \ - /usr/lib/llvm-$(PV_LLVM)/bin/$$bin \ - /usr/bin/$$bin ; \ - done dh_link -pclang-format \ /usr/bin/clang-format-$(PV_LLVM) \