[kernel] r20050 - in dists/trunk/firmware-nonfree/debian: . bin

[Ben Hutchings]

Author: benh
Date: Mon May  6 05:19:35 2013
New Revision: 20050

Log:
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.

Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/changelog

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Mon May  6 05:08:11 2013	(r20049)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Mon May  6 05:19:35 2013	(r20050)
@@ -227,7 +227,9 @@
                 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:

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Mon May  6 05:08:11 2013	(r20049)
+++ dists/trunk/firmware-nonfree/debian/changelog	Mon May  6 05:19:35 2013	(r20050)
@@ -20,8 +20,9 @@
   * netxen: Update QLogic Intelligent Ethernet firmware to version 4.0.590
   * linux-nonfree: Add Radeon HD 8500/8600/8700 series firmware
   * realtek: Add RTL8106E-2, RTL81868G-2 and RTL8168G-3 firmware patches
+  * Include all symlinks in package descriptions
 
- -- Ben Hutchings <ben at decadent.org.uk>  Mon, 06 May 2013 05:58:13 +0100
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 06 May 2013 06:14:40 +0100
 
 firmware-nonfree (0.37) experimental; urgency=low