~mozillateam/songbird/songbird.head

#

# Ubuntu: none

# Upstream: bug reported

# Description: paths containing metacharacters make the regexp fail

#  and then break make-jars leading to a build failure.

#  Quote the path in the regexp.

#

---

 build-tree/songbird/tools/scripts/expand-jar-mn.pl |    2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

Index: songbird-1.0.0+0/build-tree/songbird/tools/scripts/expand-jar-mn.pl

===================================================================

--- songbird-1.0.0+0.orig/build-tree/songbird/tools/scripts/expand-jar-mn.pl

+++ songbird-1.0.0+0/build-tree/songbird/tools/scripts/expand-jar-mn.pl

@@ -82,17 +82,17 @@

 If this extension is valid, modify tools/scripts/expand-jar-mn.pl line 74.

 Better yet, make Ben do it.  This was his idea. 

 ---------------

 END

       }

       # Get the relative path of the file 

-      $file =~ s/$source_path\///;

+      $file =~ s/\Q$source_path\E\///;

       print "  $jar_destination$file       ($file)\n";

     }

   }

   else

   {

     # No instruction found.  Just print the line as-is. 

     print;