[SCM] vlc/master: Refresh xulrunner patch.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2e491cb9b2ef479f8d0b6f480c1d583c357a39f5
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Mar 24 14:00:47 2011 +0100

    Refresh xulrunner patch.

diff --git a/debian/patches/xulrunner-1.9.1.patch b/debian/patches/xulrunner-1.9.1.patch
index 3a684f3..998f094 100644
--- a/debian/patches/xulrunner-1.9.1.patch
+++ b/debian/patches/xulrunner-1.9.1.patch
@@ -2,9 +2,9 @@ Description: Make vlc compatible with xulrunner 1.9.1
 Author: Benjamin Drung <bdrung at debian.org>
 Forwarded: not-needed
 
---- vlc-1.1.7.orig/configure
-+++ vlc-1.1.7/configure
-@@ -47498,9 +47498,9 @@ $as_echo "$as_me: Checking for Mozilla"
+--- a/configure
++++ b/configure
+@@ -47504,9 +47504,9 @@
            if test -n "$i"
            then
              echo "Trying to find $i package" >&5
@@ -17,7 +17,7 @@ Forwarded: not-needed
              then
                echo "Using $i pkg-config package." >&5
                echo "Using $i package." >&6
-@@ -47728,7 +47728,7 @@ fi
+@@ -47734,7 +47734,7 @@
  done
  test -n "$MOZILLA_CONFIG" || MOZILLA_CONFIG="no"
  
@@ -26,9 +26,9 @@ Forwarded: not-needed
  
  
  fi
---- vlc-1.1.7.orig/configure.ac
-+++ vlc-1.1.7/configure.ac
-@@ -4554,8 +4554,8 @@ then
+--- a/configure.ac
++++ b/configure.ac
+@@ -4556,8 +4556,8 @@
            if test -n "$i"
            then
              echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
@@ -39,8 +39,8 @@ Forwarded: not-needed
              then
                echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
                echo "Using $i package." >&AS_MESSAGE_FD
---- vlc-1.1.7.orig/projects/mozilla/vlcplugin.h
-+++ vlc-1.1.7/projects/mozilla/vlcplugin.h
+--- a/projects/mozilla/vlcplugin.h
++++ b/projects/mozilla/vlcplugin.h
 @@ -29,6 +29,10 @@
  #ifndef __VLCPLUGIN_H__
  #define __VLCPLUGIN_H__
@@ -52,3 +52,15 @@ Forwarded: not-needed
  #include <vlc/vlc.h>
  
  // Setup XP_MACOSX, XP_UNIX, XP_WIN
+--- a/projects/mozilla/control/nporuntime.cpp
++++ b/projects/mozilla/control/nporuntime.cpp
+@@ -27,8 +27,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "nporuntime.h"
+ #include "vlcplugin.h"
++#include "nporuntime.h"
+ 
+ char* RuntimeNPObject::stringValue(const NPString &s)
+ {

-- 
VLC media player packaging