X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installchangelogs;h=4620473b0ca83795fdeaa95af79ee4a39c725c6b;hb=fb8f18f4a98669c3b85e1bd7920fbabfc00b886e;hp=27e433c00f92e254ddeb3c0358f2fdde6aa6e35f;hpb=a243946176b92b5fafd84f43d5a455551cf27210;p=debhelper.git diff --git a/dh_installchangelogs b/dh_installchangelogs index 27e433c..4620473 100755 --- a/dh_installchangelogs +++ b/dh_installchangelogs @@ -15,27 +15,27 @@ B [S>] [B<-k>] [B<-X>I] [I is a debhelper program that is responsible for installing changelogs into package build directories. -An upstream changelog file may be specified as an option. If none is -specified, a few common filenames are tried. (In compatibility level 7 and -above.) +An upstream F file may be specified as an option. If none is +specified, it looks for files with names that seem likely to be changelogs. +(In compatibility level 7 and above.) -If there is an upstream changelog file, it will be be installed as -usr/share/doc/package/changelog in the package build directory. If the -changelog is a html file (determined by file extension), it will be -installed as usr/share/doc/package/changelog.html instead, and will be -converted to plain text with html2text to generate -usr/share/doc/package/changelog. +If there is an upstream F file, it will be be installed as +F in the package build directory. If the +changelog is a F file (determined by file extension), it will be +installed as F instead, and will be +converted to plain text with B to generate +F. =head1 FILES =over 4 -=item debian/changelog +=item F -=item debian/NEWS +=item F =item debian/I.changelog @@ -45,11 +45,11 @@ Automatically installed into usr/share/doc/I/ in the package build directory. Use the package specific name if I needs a different -NEWS or changelog file. +F or F file. -The changelog file is installed with a name of changelog -for native packages, and changelog.Debian for non-native packages. -The NEWS file is always installed with a name of NEWS.Debian. +The F file is installed with a name of changelog +for native packages, and F for non-native packages. +The F file is always installed with a name of F. =back @@ -60,14 +60,14 @@ The NEWS file is always installed with a name of NEWS.Debian. =item B<-k>, B<--keep> Keep the original name of the upstream changelog. This will be accomplished -by installing the upstream changelog as "changelog", and making a symlink from -that to the original name of the changelog file. This can be useful if the +by installing the upstream changelog as F, and making a symlink from +that to the original name of the F file. This can be useful if the upstream changelog has an unusual name, or if other documentation in the -package refers to the changelog file. +package refers to the F file. -=item B<-Xitem>, B<--exclude=item> +=item B<-X>I, B<--exclude=>I -Exclude upstream changelog files that contain "item" anywhere in their +Exclude upstream F files that contain I anywhere in their filename from being installed. =item I @@ -84,14 +84,16 @@ my $upstream=shift; my $changelog_name="changelog.Debian"; if (! defined $upstream) { if (! isnative($dh{MAINPACKAGE}) && !compat(6)) { - my @files=sort glob("*"); - foreach my $name (qw{changelog changes changelog.txt changes.txt}) { - my @matches=grep { - lc $_ eq $name && -s $_ && ! excludefile($_) - } @files; - if (@matches) { - $upstream=shift @matches; - last; + foreach my $dir (qw{. doc docs}) { + my @files=sort glob("$dir/*"); + foreach my $name (qw{changelog changes changelog.txt changes.txt history history.txt}) { + my @matches=grep { + lc basename($_) eq $name && -s $_ && ! excludefile($_) + } @files; + if (@matches) { + $upstream=shift @matches; + last; + } } } } @@ -119,12 +121,22 @@ foreach my $package (@{$dh{DOPACKAGES}}) { error("could not find changelog $changelog"); } - if (! -d "$tmp/usr/share/doc/$package") { - # If it is a dangling symlink, then don't do anything. - # Think multi-binary packages that depend on each other and - # want to link doc dirs. - next if -l "$tmp/usr/share/doc/$package"; + # If it is a symlink to a documentation directory from the same + # source package, then don't do anything. Think multi-binary + # packages that depend on each other and want to link doc dirs. + if (-l "$tmp/usr/share/doc/$package") { + my $linkval=readlink("$tmp/usr/share/doc/$package"); + my %allpackages=map { $_ => 1 } getpackages(); + if ($allpackages{basename($linkval)}) { + next; + } + # Even if the target doesn't seem to be a doc dir from the + # same source package, don't do anything if it's a dangling + # symlink. + next unless -d "$tmp/usr/share/doc/$package"; + } + if (! -d "$tmp/usr/share/doc/$package") { doit("install","-d","$tmp/usr/share/doc/$package"); } doit("install","-o",0,"-g",0,"-p","-m644",$changelog,