Merge remote-tracking branch 'vanilla/next' into gaps-next

RELEASE-NOTES-next

@@ -35,6 +35,7 @@ option is enabled and only then sets a screenshot as background.
   • i3-nagbar: add option to position on primary monitor
   • alternate focusing tab/stack children-parent containers by clicking on their titlebars
   • i3bar: use first bar config by default
+  • i3-dmenu-desktop: ignore duplicate files and directories (fixes crash on NixOS)
   • i3-dump-log -f now uses UNIX sockets instead of pthreads. The UNIX socket approach
     should be more reliable and also more portable.
   • Implement the include config directive

i3-dmenu-desktop

@@ -154,6 +154,8 @@ find(
         },
         no_chdir => 1,
         follow_fast => 1,
+        # Ignore any duplicate files and directories and proceed normally:
+        follow_skip => 2,
     },
     @searchdirs
 );

travis/check-spelling.pl

@@ -11,6 +11,7 @@
 use v5.10;
 use autodie;
 use lib 'testcases/lib';
+use lib '/usr/share/lintian/lib';
 use i3test::Util qw(slurp);
 use Lintian::Spelling qw(check_spelling);
 
@@ -21,8 +22,6 @@
 my $profile = Lintian::Profile->new;
 $profile->load('debian', ['/usr/share/lintian']);
 
-Lintian::Data->set_vendor($profile);
-
 my $exitcode = 0;
 
 # Whitelist for spelling errors in manpages, in case the spell checker has
@@ -42,7 +41,7 @@
     build/i3bar
 );
 for my $binary (@binaries) {
-    check_spelling(slurp($binary), $binary_spelling_exceptions, sub {
+    check_spelling($profile, slurp($binary), $binary_spelling_exceptions, sub {
         my ($current, $fixed) = @_;
         say STDERR qq|Binary "$binary" contains a spelling error: "$current" should be "$fixed"|;
         $exitcode = 1;
@@ -57,7 +56,7 @@
 for my $name (glob('build/man/*.1')) {
     for my $line (split(/\n/, slurp($name))) {
         next if $line =~ /^\.\\\"/o;
-        check_spelling($line, $manpage_spelling_exceptions, sub {
+        check_spelling($profile, $line, $manpage_spelling_exceptions, sub {
             my ($current, $fixed) = @_;
             say STDERR qq|Manpage "$name" contains a spelling error: "$current" should be "$fixed"|;
             $exitcode = 1;