r518: * dh_movefiles has long been a sore point in debhelper. Inherited

     from debstd, its interface and implementation suck, and I have maintained
     it while never really deigning to use it. Now there is a remplacment:
     dh_install, which ...
     - copies files, doesn't move them. Closes: #75360, #82649
     - doesn't have that whole annoying debian/package.files vs. debian/files
       mess, as it uses debian/install.
     - supports copying empty subdirs. Closes: #133037
     - doesn't use tar, thus no error reproting problems. Closes: #112538
     - files are listed relative to the pwd, debian/tmp need not be used at
       all, so no globbing issues. Closes: #100404
     - supports -X. Closes: #116902
     - the whole concept of moving files out of a directory is gone, so this
       bug doesn't really apply. Closes: #120026
     - This is exactly what Bill Allombert asked for in #117383, even though I
       designed it seemingly independantly. Thank you Bill! Closes: #117383
   * Made debhelper's debian/rules a lot simpler by means of the above.
   * Updated example rules file to use dh_install. Also some reordering and
     other minor changes.
   * dh_movefiles is lightly deprecated, and when you run into its bugs and
     bad design, you are incouraged to just use dh_install instead.
   * dh_fixperms: in v4 only, make all files in bin/ dirs +x. Closes: #119039
   * dh_fixperms: in v4 only, make all files in etc/init.d executable (of
     course there's -X ..)
   * dh_link: in v4 only, finds existing, non-policy-conformant symlinks
     and corrects them. This has the side effect of making dh_link idempotent.
   * Added a -h/--help option. This seems very obvious, but it never occured to
     me before..
   * use v4 for building debhelper itself
   * v4 mode is done, you may now use it without fear of it changing.
     (This idea of this upload is to get v4 into woody so people won't run into
     many issues backporting from sarge to woody later on. Packages targeted
     for woody should continue to use whatever compatability level they are
     using.)

1 files changed, 27 insertions, 0 deletions

diff --git a/dh_link b/dh_link
index 41754f5c..5c2a5693 100755
--- a/dh_link
+++ b/dh_link
@@ -7,6 +7,7 @@ dh_link - create symlinks in package build directories
 =cut
 
 use strict;
+use File::Find;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -41,6 +42,9 @@ when policy says they should be absolute, and relative links with as short
 a path as possible. It will also create any subdirectories it needs to to put
 the symlinks in.
 
+dh_link also scans the package build tree for existing symlinks which do not
+conform to debian policy, and corrects them (v4 only).
+
 =head1 OPTIONS
 
 =over 4
@@ -98,6 +102,29 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		error("parameters list a link without a destination.");
 	}
 
+	# v4 only
+	if (! compat(3)) {
+		# Scan for existing links and add them to @links, so they
+		# are recreated policy conformant.
+		find(
+			sub {
+				return unless -l;
+				my $dir=$File::Find::dir;
+				$dir=~s/^\Q$tmp\E//;
+				my $target = readlink($_);
+				if ($target=~/^\//) {
+					push @links, $target;
+				}
+				else {
+					push @links, "$dir/$target";
+				}
+				push @links, "$dir/$_";
+				doit("rm","-f",$_);
+				
+			},
+			$tmp);
+	}
+	
 	while (@links) {
 		my $dest=pop @links;
 		my $src=pop @links;