NMU diff to drop the clang-tidy-6.0 binary as discussed.  I'll upload this 
shortly.

Scott K
diff -Nru llvm-toolchain-6.0-6.0.1/debian/changelog llvm-toolchain-6.0-6.0.1/debian/changelog
--- llvm-toolchain-6.0-6.0.1/debian/changelog	2020-03-23 06:59:23.000000000 -0400
+++ llvm-toolchain-6.0-6.0.1/debian/changelog	2020-05-15 12:25:16.000000000 -0400
@@ -1,3 +1,12 @@
+llvm-toolchain-6.0 (1:6.0.1-14.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Maintainer agreed NMU to drop clang-tidy-6.0 since it is not needed to
+    support ghc, the only remaining llvm-6.0 user, and allows progress on
+    python2 removal (Closes: #956903)
+
+ -- Scott Kitterman <sc...@kitterman.com>  Fri, 15 May 2020 12:25:16 -0400
+
 llvm-toolchain-6.0 (1:6.0.1-14) unstable; urgency=medium
 
   * debian/patches/947f9692440836dcb8d88b74b69dd379d85974ce.patch:
diff -Nru llvm-toolchain-6.0-6.0.1/debian/control llvm-toolchain-6.0-6.0.1/debian/control
--- llvm-toolchain-6.0-6.0.1/debian/control	2020-03-22 13:28:44.000000000 -0400
+++ llvm-toolchain-6.0-6.0.1/debian/control	2020-05-15 12:25:13.000000000 -0400
@@ -69,19 +69,6 @@
  .
  This package also provides vim and emacs plugins.
 
-Package: clang-tidy-6.0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python2,
- libllvm6.0 (= ${binary:Version}), libclang-common-6.0-dev,
- clang-tools-6.0, python-yaml
-Replaces: clang-modernize-6.0, clang-6.0 (<< 1:6.0~svn250696-1)
-Breaks: clang-modernize-6.0, clang-6.0 (<< 1:6.0~svn250696-1)
-Description: clang-based C++ linter tool
- Provide an extensible framework for diagnosing and fixing typical programming
- errors, like style violations, interface misuse, or bugs that can be deduced
- via static analysis. clang-tidy is modular and provides a convenient interface
- for writing new checks.
-
 Package: libclang1-6.0
 Section: libs
 Architecture: any
diff -Nru llvm-toolchain-6.0-6.0.1/debian/rules llvm-toolchain-6.0-6.0.1/debian/rules
--- llvm-toolchain-6.0-6.0.1/debian/rules	2020-03-22 17:03:20.000000000 -0400
+++ llvm-toolchain-6.0-6.0.1/debian/rules	2020-05-15 12:25:13.000000000 -0400
@@ -519,6 +519,12 @@
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
 endif
 endif
+	# clang-tidy no longer built
+	rm -rf $(CURDIR)/debian/tmp/usr/bin/clang-tidy-6.0
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-6.0/bin/clang-tidy
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-6.0/share/clang/run-clang-tidy.py
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-6.0/share/clang/clang-tidy-diff.py
+
 	dh_install --fail-missing
 
 override_dh_installdeb:

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to