[Python-modules-commits] r17754 - in packages/sphinx/trunk/debian (dh_sphinxdoc)

[jwilk at users.alioth.debian.org]

    Date: Friday, July 8, 2011 @ 20:37:24
  Author: jwilk
Revision: 17754

dh_sphinxdoc: always create symlinks pointing to /usr/share/javascript/sphinxdoc/.
That way we can easily detect that a symlink was created by us.

Modified:
  packages/sphinx/trunk/debian/dh_sphinxdoc

Modified: packages/sphinx/trunk/debian/dh_sphinxdoc
===================================================================
--- packages/sphinx/trunk/debian/dh_sphinxdoc	2011-07-08 20:23:35 UTC (rev 17753)
+++ packages/sphinx/trunk/debian/dh_sphinxdoc	2011-07-08 20:37:24 UTC (rev 17754)
@@ -52,21 +52,22 @@
         wanted => sub {
             my $js = $_;
             my ($version, $name) = m{([0-9.]+)/(\w+[.]js)$} or return;
+            my $md5;
             if (-l $js)
             {
                 my $js_target = readlink($js);
-                if ($js_target =~ m{^/})
+                unless ($js_target =~ m{^/})
                 {
-                    $js = $js_target;
+                    $js_target = "$js/../$js_target";
+                    while ($js_target =~ s{[^./][^/]+/[.][.]/}{}) {};
                 }
-                else
-                {
-                    $js =~ s{[^/]+$}{$js_target};
-                    while ($js =~ s{[^./][^/]+/[.][.]/}{}) {};
-                }
+                $md5 = md5($js_target);
             }
-            $js =~ s{^\Q$root\E}{} unless -f $js;
-            my $md5 = md5($js);
+            else
+            {
+                $js =~ s{^\Q$root\E}{} unless -f $js;
+                $md5 = md5($js);
+            }
             $js =~ s{^\Q$root\E}{};
             $packaged_js{$md5} = [$js, "libjs-sphinxdoc (>= $version)"];
         },