[firmware-free] 08/19: Include all symlinks in package descriptions

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-free.

commit 6fa3635a9b6ea7910ed167b0f2086d2e81a1503d
Author: Ben Hutchings <benh at debian.org>
Date:   Mon May 6 05:19:35 2013 +0000

    Include all symlinks in package descriptions
    
    We need to resolve the symlink target based on its containing
    directory in order to pair it up with the real file.  Otherwise
    this only works this for symlinks that are installed directly in
    /lib/firmware.
    
    [bwh: Cherry-picked from firmware-nonfree commit
     acae9335ac2c7169425ad060f210b517c8e35221]
---
 debian/bin/gencontrol.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 2c20bf0..ecf4cfc 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -202,7 +202,9 @@ class GenControl(debian_linux.gencontrol.Gencontrol):
                 if os.path.islink(cur_path):
                     if f in files_orig:
                         links[f] = os.readlink(cur_path)
-                        links_rev.setdefault(links[f], []).append(f)
+                        link_target = os.path.normpath(
+                            os.path.join(f, '..', links[f]))
+                        links_rev.setdefault(link_target, []).append(f)
                     continue
                 f1 = f.rsplit('-', 1)
                 if f in files_orig:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-free.git