diff -Nru llvm-defaults-0.33ubuntu2/debian/changelog llvm-defaults-0.33ubuntu3/debian/changelog --- llvm-defaults-0.33ubuntu2/debian/changelog 2016-02-11 09:01:24.000000000 +0000 +++ llvm-defaults-0.33ubuntu3/debian/changelog 2016-02-12 12:37:48.000000000 +0000 @@ -1,3 +1,9 @@ +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. diff -Nru llvm-defaults-0.33ubuntu2/debian/control llvm-defaults-0.33ubuntu3/debian/control --- llvm-defaults-0.33ubuntu2/debian/control 2016-02-11 09:00:46.000000000 +0000 +++ llvm-defaults-0.33ubuntu3/debian/control 2016-02-12 12:37:24.000000000 +0000 @@ -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.33ubuntu2/debian/rules llvm-defaults-0.33ubuntu3/debian/rules --- llvm-defaults-0.33ubuntu2/debian/rules 2016-02-11 09:01:02.000000000 +0000 +++ llvm-defaults-0.33ubuntu3/debian/rules 2016-02-12 12:39:03.000000000 +0000 @@ -56,7 +56,7 @@ 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 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel @@ -210,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) \