diff -Nru iwyu-6.0/debian/changelog iwyu-6.0/debian/changelog --- iwyu-6.0/debian/changelog 2018-04-28 08:20:19.000000000 +0000 +++ iwyu-6.0/debian/changelog 2018-09-23 21:12:33.000000000 +0000 @@ -1,6 +1,18 @@ +iwyu (6.0-2) unstable; urgency=medium + + * Switch to llvm/clang 7 + - debian/patches/clang-7-build.diff needed + * Standards-Version updated to 4.2.1 + * Fix space-in-std-shortname-in-dep5-copyright + * Also ship a manpage for iwyu_tool + * Refresh manpage for fix_include + + -- Sylvestre Ledru Sun, 23 Sep 2018 22:12:33 +0100 + iwyu (6.0-1) unstable; urgency=medium * New upstream release + - Switched to llvm/clang 6 * Package moved to salsa & git -- Sylvestre Ledru Sat, 28 Apr 2018 10:20:19 +0200 diff -Nru iwyu-6.0/debian/control iwyu-6.0/debian/control --- iwyu-6.0/debian/control 2018-04-28 08:20:19.000000000 +0000 +++ iwyu-6.0/debian/control 2018-09-23 21:12:33.000000000 +0000 @@ -3,16 +3,17 @@ Priority: optional Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru -Build-Depends: debhelper (>= 10.0.0), cmake, libclang-6.0-dev, llvm-6.0-dev, +Build-Depends: debhelper (>= 10.0.0), cmake, libclang-7-dev, llvm-7-dev, help2man, libncurses5-dev, zlib1g-dev -Standards-Version: 4.1.3 +Standards-Version: 4.2.1 Homepage: http://include-what-you-use.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/iwyu.git Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/iwyu Package: iwyu Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang | clang-4.0 | clang-5.0 | clang-6.0 | clang-7, +Depends: ${shlibs:Depends}, ${misc:Depends}, + clang | clang-4.0 | clang-5.0 | clang-6.0 | clang-7 | clang-8, python Description: Analyze #includes in C and C++ source files "Include what you use" means this: for every symbol (type, function variable, diff -Nru iwyu-6.0/debian/copyright iwyu-6.0/debian/copyright --- iwyu-6.0/debian/copyright 2018-04-28 08:17:16.000000000 +0000 +++ iwyu-6.0/debian/copyright 2018-09-23 21:12:33.000000000 +0000 @@ -5,7 +5,9 @@ Files: * Copyright: Google and others 2010 - 2013 -License: University of Illinois/NCSA Open Source License +License: U-OF-I-BSD-LIKE + +License: U-OF-I-BSD-LIKE Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to diff -Nru iwyu-6.0/debian/fix_include.1 iwyu-6.0/debian/fix_include.1 --- iwyu-6.0/debian/fix_include.1 2018-04-28 08:17:16.000000000 +0000 +++ iwyu-6.0/debian/fix_include.1 2018-09-23 21:12:33.000000000 +0000 @@ -1,28 +1,25 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.2. -.TH FIX_INCLUDE "1" "November 2013" "fix_include 3.3" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH FIX_INCLUDES.PY "1" "September 2018" "fix_includes.py 6.0-2" "User Commands" .SH NAME -fix_include \- Update the source code with iwyu output +fix_includes.py \- manual page for fix_includes.py 6.0-2 .SH SYNOPSIS -.B fix_include -[\fIoptions\fR] [\fIfilename\fR] ... \fI< \fR -OR -.B fix_include -\fB\-s\fR [other options] ... +.B fix_includes.py +[\fI\,options\/\fR] [\fI\,filename\/\fR] ... \fI\,< \/\fR .SH DESCRIPTION +.IP +OR fix_includes.py \fB\-s\fR [other options] ... .PP -fix_include reads the output from the include\-what\-you\-use -script on stdin \fB\-\-\fR run with \fB\-\-v\fR=\fI1\fR (default) verbose or above \fB\-\-\fR and, +fix_includes.py reads the output from the include\-what\-you\-use +script on stdin \fB\-\-\fR run with \fB\-\-v\fR=\fI\,1\/\fR (default) verbose or above \fB\-\-\fR and, unless \fB\-\-sort_only\fR or \fB\-\-dry_run\fR is specified, modifies the files mentioned in the output, removing their old #include lines and replacing them with the lines given by the include_what_you_use script. It also sorts the #include and forward\-declare lines. .PP -Only writable files (those opened for p4 edit) are modified (unless -\fB\-\-checkout_command\fR is specified). All files mentioned in the -include\-what\-you\-use script are modified, unless filenames are -specified on the commandline, in which case only those files are -modified. +All files mentioned in the include\-what\-you\-use script are modified, +unless filenames are specified on the commandline, in which case only +those files are modified. .PP The exit code is the number of files that were modified (or that would be modified if \fB\-\-dry_run\fR was specified) unless that number exceeds 100, @@ -59,28 +56,11 @@ Return code is 0 if no changes are needed, else min(the number of files that would be modified, 100) .TP -\fB\-\-ignore_re\fR=\fIIGNORE_RE\fR +\fB\-\-ignore_re\fR=\fI\,IGNORE_RE\/\fR fix_includes.py will skip editing any file whose name matches this regular expression. .TP -\fB\-\-checkout_command\fR=\fICHECKOUT_COMMAND\fR -A command, such as "p4 edit", to run on all the nonwriteable files before modifying them. The filenames -will be appended to the command after a space. The -command will not be run on any file that does not need -to change. -.TP -\fB\-\-create_cl_if_possible\fR -If \fB\-\-checkout_command\fR is "p4|g4|v4 edit" and all files -to be modified needed to be checked out, then create a -CL containing those files. -.HP -\fB\-\-nocreate_cl_if_possible\fR -.TP -\fB\-\-append_to_cl\fR=\fIAPPEND_TO_CL\fR -If provided, with a checkout_command, add files that -need fixing to the specified existing CL. -.TP -\fB\-\-separate_project_includes\fR=\fISEPARATE_PROJECT_INCLUDES\fR +\fB\-\-separate_project_includes\fR=\fI\,SEPARATE_PROJECT_INCLUDES\/\fR Sort #includes for current project separately from all other #includes. This flag specifies the root directory of the current project. If the value is @@ -89,7 +69,7 @@ not specified, project #includes will be sorted with other non\-system #includes. .TP -\fB\-\-invoking_command_line\fR=\fIINVOKING_COMMAND_LINE\fR +\fB\-\-invoking_command_line\fR=\fI\,INVOKING_COMMAND_LINE\/\fR Internal flag used by iwyu.py, It should be the command line used to invoke iwyu.py .TP diff -Nru iwyu-6.0/debian/iwyu.manpages iwyu-6.0/debian/iwyu.manpages --- iwyu-6.0/debian/iwyu.manpages 2018-04-28 08:17:16.000000000 +0000 +++ iwyu-6.0/debian/iwyu.manpages 2018-09-23 21:12:33.000000000 +0000 @@ -1,4 +1,4 @@ iwyu-build/include-what-you-use.1 iwyu-build/iwyu.1 +debian/iwyu_tool.1 debian/fix_include.1 - diff -Nru iwyu-6.0/debian/iwyu_tool.1 iwyu-6.0/debian/iwyu_tool.1 --- iwyu-6.0/debian/iwyu_tool.1 1970-01-01 00:00:00.000000000 +0000 +++ iwyu-6.0/debian/iwyu_tool.1 2018-09-23 21:12:33.000000000 +0000 @@ -0,0 +1,34 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH IWYU_TOOL.PY "1" "September 2018" "iwyu_tool.py 6.0-2" "User Commands" +.SH NAME +iwyu_tool.py \- Include-what-you-use compilation database driver +.SH DESCRIPTION +usage: iwyu_tool.py [\-h] [\-v] [\-o {clang,iwyu}] [\-j JOBS] \fB\-p\fR +.TP +[source [source ...]] \fB\-\-\fR [] +[source [source ...]] +.PP +Include\-what\-you\-use compilation database driver. +.SS "positional arguments:" +.TP +source +Zero or more source files to run IWYU on. Defaults to +all in compilation database. +.SS "optional arguments:" +.TP +\fB\-h\fR, \fB\-\-help\fR +show this help message and exit +.TP +\fB\-v\fR, \fB\-\-verbose\fR +Print IWYU commands +.TP +\fB\-o\fR {clang,iwyu}, \fB\-\-output\-format\fR {clang,iwyu} +Output format (default: iwyu) +.TP +\fB\-j\fR JOBS, \fB\-\-jobs\fR JOBS +Number of concurrent subprocesses +.TP +\fB\-p\fR +Compilation database path +.PP +Assumes include\-what\-you\-use is available on the PATH. diff -Nru iwyu-6.0/debian/patches/clang-7-build.diff iwyu-6.0/debian/patches/clang-7-build.diff --- iwyu-6.0/debian/patches/clang-7-build.diff 1970-01-01 00:00:00.000000000 +0000 +++ iwyu-6.0/debian/patches/clang-7-build.diff 2018-09-23 21:12:33.000000000 +0000 @@ -0,0 +1,39 @@ +From 88af04c3218a762f01e8dad9e3d69d68bfba9f47 Mon Sep 17 00:00:00 2001 +From: Kim Grasman +Date: Fri, 11 May 2018 10:15:15 +0200 +Subject: [PATCH] Update for Clang r332021 + +PPCallbacks::InclusionDirective grew a new parameter. +--- + iwyu_preprocessor.cc | 3 ++- + iwyu_preprocessor.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/iwyu_preprocessor.cc b/iwyu_preprocessor.cc +index 00bcb32c..91ea1069 100644 +--- a/iwyu_preprocessor.cc ++++ b/iwyu_preprocessor.cc +@@ -654,7 +654,8 @@ void IwyuPreprocessorInfo::InclusionDirective( + const FileEntry* file, + StringRef search_path, + StringRef relative_path, +- const clang::Module* imported) { ++ const clang::Module* imported, ++ SrcMgr::CharacteristicKind file_type) { + include_filename_loc_ = filename_range.getBegin(); + } + +diff --git a/iwyu_preprocessor.h b/iwyu_preprocessor.h +index 47fa79fa..85c6e983 100644 +--- a/iwyu_preprocessor.h ++++ b/iwyu_preprocessor.h +@@ -199,7 +199,8 @@ class IwyuPreprocessorInfo : public clang::PPCallbacks, + const clang::FileEntry* file, + llvm::StringRef search_path, + llvm::StringRef relative_path, +- const clang::Module* imported) override; ++ const clang::Module* imported, ++ clang::SrcMgr::CharacteristicKind file_type) override; + + void FileChanged(clang::SourceLocation loc, FileChangeReason reason, + clang::SrcMgr::CharacteristicKind file_type, diff -Nru iwyu-6.0/debian/patches/series iwyu-6.0/debian/patches/series --- iwyu-6.0/debian/patches/series 2018-04-28 08:17:16.000000000 +0000 +++ iwyu-6.0/debian/patches/series 2018-09-23 21:12:33.000000000 +0000 @@ -0,0 +1 @@ +clang-7-build.diff diff -Nru iwyu-6.0/debian/rules iwyu-6.0/debian/rules --- iwyu-6.0/debian/rules 2018-04-28 08:20:19.000000000 +0000 +++ iwyu-6.0/debian/rules 2018-09-23 21:12:33.000000000 +0000 @@ -17,7 +17,7 @@ dh $@ --buildsystem=cmake --builddirectory=$(TARGET_BUILD) override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_CXX_FLAGS="$(ADDITIONAL_CXX_FLAGS)" -DLLVM_PATH=/usr/lib/llvm-6.0/ + dh_auto_configure -- -DCMAKE_CXX_FLAGS="$(ADDITIONAL_CXX_FLAGS)" -DLLVM_PATH=/usr/lib/llvm-7/ override_dh_auto_build: