Merge lp:~noskcaj/ubuntu/saucy/gecko-mediaplayer/1.0.8-4u1 into lp:ubuntu/saucy/gecko-mediaplayer

[Jackson Doak]

Merge from debian testing, closes 2 of 3 complete bugs, maybe all of them

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

32. By Jackson Doak on 2013-08-29

* Merge from Debian testing, remaining ubuntu changes:
  - debian/rules: Drop --with-xulrunner-sdk flag, it's empty and cause FTBFS.
  - debian/control: Build depend on libnspr4-dev
  - debian/patches/0002-require-nspr.patch:
    firefox-dev now only provides npapi headers so require nspr to build

=== removed directory '.pc/0001-nomozalloc.patch'
=== removed file '.pc/0001-nomozalloc.patch/configure.in'
--- .pc/0001-nomozalloc.patch/configure.in	2013-03-07 11:00:21 +0000
+++ .pc/0001-nomozalloc.patch/configure.in	1970-01-01 00:00:00 +0000
@@ -1,228 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl Created by Anjuta application wizard.
-
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gecko-mediaplayer, 1.0.8)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE([enable])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_ISC_POSIX
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-
-
-AC_PROG_CPP
-AC_PROG_CXX
-AM_PROG_CC_C_O
-AC_PROG_RANLIB
-
-dnl Set gettext package name
-GETTEXT_PACKAGE=gecko-mediaplayer
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
-
-dnl Add the languages which your application supports here.
-ALL_LINGUAS="cs de es fr ja it nl pl pt pt_BR tr"
-AM_GLIB_GNU_GETTEXT
-
-PKG_CHECK_MODULES(GLIB, [glib-2.0])
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-PKG_CHECK_MODULES(GMLIB, [gmlib >= 1.0.7])
-AC_SUBST(GMLIB_CFLAGS)
-AC_SUBST(GMLIB_LIBS)
-
-
-AC_ARG_WITH([xulrunner-sdk],
-    [AS_HELP_STRING([--with-xulrunner-sdk=path_to_sdk],
-        [Path to xulrunner SDK for build --with-xulrunner-sdk=/path/to/sdk])],
-        [
-	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
-	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
-	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
-	],
-        [])
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul >= 2],[GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
-        AC_MSG_NOTICE([Using libxul >= 2.0 ]) 
-    ],[AC_MSG_NOTICE([libxul >= 2 not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_MSG_NOTICE([Using libxul >= 1.9.2])
-    ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([Using libxul < 1.9.2])
-    ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul-unstable],[ AC_MSG_NOTICE([Using libxul-unstable])
-    ],[AC_MSG_WARN([libxul-unstable not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ AC_MSG_NOTICE([Using mozilla])
-    ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [firefox-plugin firefox-xpcom],[ AC_MSG_NOTICE([Using firefox])
-    ],[AC_MSG_WARN([firefox-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [seamonkey-plugin seamonkey-xpcom],[ AC_MSG_NOTICE([Using seamonkey])
-    ],[AC_MSG_WARN([seamonkey-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [xulrunner-plugin xulrunner-xpcom],[ AC_MSG_NOTICE([Using xulrunner])
-    ],[AC_MSG_WARN([xulrunner-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [iceape-plugin iceape-xpcom],[ AC_MSG_NOTICE([Using iceape])
-    ],[AC_MSG_WARN([iceape-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [npapi-sdk],[ AC_MSG_NOTICE([Using npapi-sdk])
-    ],[AC_MSG_ERROR([npapi-sdk not found, all out of tries])])
-    require_nspr="yes"
-fi
-
-AC_MSG_CHECKING([for const return value of NPP_GetMIMEDescription])
-oCFLAGS=$CFLAGS
-CFLAGS="$GECKO_CFLAGS"
-AC_LANG_PUSH([C])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifndef XP_UNIX
-#define XP_UNIX 1
-#endif
-#include <npapi.h>
-#if NP_VERSION_MAJOR == 0 && NP_VERSION_MINOR < 27
-#error
-#else
-const char*NPP_GetMIMEDescription(void) {
-  return "test";
-}
-#endif
-],[
-const char *f=NPP_GetMIMEDescription();
-])],[
-    AC_MSG_RESULT([yes])
-    AC_DEFINE([NPAPI_USE_CONSTCHARS],[1],[Define if NPAPI declares NPP_GetMIMEDescription as a const char*])
-],[
-    AC_MSG_RESULT([no])
-])
-AC_LANG_POP([C])
-CFLAGS=$oCFLAGS
-
-AC_MSG_CHECKING([for usage of UTF8Characters])
-oCFLAGS=$CFLAGS
-CFLAGS="$GECKO_CFLAGS"
-AC_LANG_PUSH([C])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifndef XP_UNIX
-#define XP_UNIX 1
-#endif
-#include <npapi.h>
-#include <npruntime.h>
-],[
-NPString s;
-s.UTF8Characters = "Testing";
-])],[
-    AC_MSG_RESULT([yes])
-    AC_DEFINE([NPAPI_USE_UPPERCASE_UTF8],[1],[Define if NPAPI declares NPString with an uppercase UTF8])
-],[
-    AC_MSG_RESULT([no])
-])
-AC_LANG_POP([C])
-CFLAGS=$oCFLAGS
-
-    
-dnl Locate where the plugins should go
-PKG_CHECK_MODULES(NSPR, [nspr],[
-    libdir=`$PKG_CONFIG --variable=libdir nspr`
-    AC_SUBST(libdir)
-    if test "$require_nspr" = "yes"; then
-      AC_DEFINE([HAVE_NSPR],[1],[Define to 1 if using nspr])
-      GECKO_CFLAGS="$GECKO_CFLAGS $NSPR_CFLAGS"
-    fi],[if test "$require_nspr" = "yes"; then
-      AC_MSG_ERROR([nspr not found, required by detected gecko])
-    else
-      AC_MSG_WARN([nspr not found, may not be needed])
-    fi])
-
-
-AC_SUBST(GECKO_CFLAGS)
-AC_SUBST(GECKO_LIBS)
-
-PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95 dbus-glib-1 >= 0.70])
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
-AC_ARG_WITH([plugin_dir],
-    [AS_HELP_STRING([--with-plugin-dir=dir],
-        [Directory where plugins are stored])],
-        [plugindir=$withval],
-        [plugindir='$(libdir)/mozilla/plugins'])
-AC_SUBST(plugindir)
-
-AC_ARG_ENABLE(caching,
-	AC_HELP_STRING([--disable-caching],[Disable caching of remote media to local storage]),
-	[usecache=$enableval],[usecache=yes])
-
-if test $usecache != yes; then
-	GECKO_CFLAGS="$GECKO_CFLAGS -DDISABLE_CACHE"
-fi
-
-AC_ARG_WITH([libcurl],
-    [AS_HELP_STRING([--with-libcurl],
-        [Add support for libcurl])],
-        [],
-        [with_libcurl=check])
-AS_IF([test "x$with_libcurl" != xno], 
-    [PKG_CHECK_MODULES(CURL,[libcurl],[CURL_DEFINES="-DHAVE_CURL" AC_DEFINE([CURL_ENABLED],[1],[Define to 1 if you have curl support])],AC_MSG_NOTICE([Compiling without curl support. May disable apple.com sites]))
-    AC_SUBST(CURL_DEFINES)
-    AC_SUBST(CURL_CFLAGS)
-    AC_SUBST(CURL_LIBS)
-    ])    
-
-
-BACKEND=`pkg-config --variable=preference_backend gmlib`
-
-if test ${BACKEND} = "gsettings"; then
-    AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
-    dnl GLIB_GSETTINGS
-    AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
-    USE_GSETTINGS=1
-    AC_SUBST(USE_GSETTINGS)
-elif test ${BACKEND} = "gconf"; then
-    AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
-    GSETTINGS_RULES=""
-    AC_SUBST(GSETTINGS_RULES)
-    AM_GCONF_SOURCE_2 
-    USE_GCONF=1
-    AC_SUBST(USE_GCONF)    
-elif test ${BACKEND} = "keystore"; then
-    GSETTINGS_RULES=""
-    AC_SUBST(GSETTINGS_RULES)
-    AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
-fi
-
-
-AC_OUTPUT([
-Makefile
-gecko-mediaplayer.spec
-src/Makefile
-po/Makefile.in
-])
-

=== removed directory '.pc/0002-require-nspr.patch'
=== removed file '.pc/0002-require-nspr.patch/configure.in'
--- .pc/0002-require-nspr.patch/configure.in	2013-03-07 11:00:21 +0000
+++ .pc/0002-require-nspr.patch/configure.in	1970-01-01 00:00:00 +0000
@@ -1,228 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl Created by Anjuta application wizard.
-
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gecko-mediaplayer, 1.0.8)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE([enable])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_ISC_POSIX
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-
-
-AC_PROG_CPP
-AC_PROG_CXX
-AM_PROG_CC_C_O
-AC_PROG_RANLIB
-
-dnl Set gettext package name
-GETTEXT_PACKAGE=gecko-mediaplayer
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
-
-dnl Add the languages which your application supports here.
-ALL_LINGUAS="cs de es fr ja it nl pl pt pt_BR tr"
-AM_GLIB_GNU_GETTEXT
-
-PKG_CHECK_MODULES(GLIB, [glib-2.0])
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-PKG_CHECK_MODULES(GMLIB, [gmlib >= 1.0.7])
-AC_SUBST(GMLIB_CFLAGS)
-AC_SUBST(GMLIB_LIBS)
-
-
-AC_ARG_WITH([xulrunner-sdk],
-    [AS_HELP_STRING([--with-xulrunner-sdk=path_to_sdk],
-        [Path to xulrunner SDK for build --with-xulrunner-sdk=/path/to/sdk])],
-        [
-	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
-	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
-	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s_nomozalloc -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
-	],
-        [])
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul >= 2],[GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
-        AC_MSG_NOTICE([Using libxul >= 2.0 ]) 
-    ],[AC_MSG_NOTICE([libxul >= 2 not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_MSG_NOTICE([Using libxul >= 1.9.2])
-    ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([Using libxul < 1.9.2])
-    ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [libxul-unstable],[ AC_MSG_NOTICE([Using libxul-unstable])
-    ],[AC_MSG_WARN([libxul-unstable not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ AC_MSG_NOTICE([Using mozilla])
-    ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [firefox-plugin firefox-xpcom],[ AC_MSG_NOTICE([Using firefox])
-    ],[AC_MSG_WARN([firefox-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [seamonkey-plugin seamonkey-xpcom],[ AC_MSG_NOTICE([Using seamonkey])
-    ],[AC_MSG_WARN([seamonkey-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [xulrunner-plugin xulrunner-xpcom],[ AC_MSG_NOTICE([Using xulrunner])
-    ],[AC_MSG_WARN([xulrunner-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [iceape-plugin iceape-xpcom],[ AC_MSG_NOTICE([Using iceape])
-    ],[AC_MSG_WARN([iceape-plugin not found, trying another])])
-fi
-
-if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [npapi-sdk],[ AC_MSG_NOTICE([Using npapi-sdk])
-    ],[AC_MSG_ERROR([npapi-sdk not found, all out of tries])])
-    require_nspr="yes"
-fi
-
-AC_MSG_CHECKING([for const return value of NPP_GetMIMEDescription])
-oCFLAGS=$CFLAGS
-CFLAGS="$GECKO_CFLAGS"
-AC_LANG_PUSH([C])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifndef XP_UNIX
-#define XP_UNIX 1
-#endif
-#include <npapi.h>
-#if NP_VERSION_MAJOR == 0 && NP_VERSION_MINOR < 27
-#error
-#else
-const char*NPP_GetMIMEDescription(void) {
-  return "test";
-}
-#endif
-],[
-const char *f=NPP_GetMIMEDescription();
-])],[
-    AC_MSG_RESULT([yes])
-    AC_DEFINE([NPAPI_USE_CONSTCHARS],[1],[Define if NPAPI declares NPP_GetMIMEDescription as a const char*])
-],[
-    AC_MSG_RESULT([no])
-])
-AC_LANG_POP([C])
-CFLAGS=$oCFLAGS
-
-AC_MSG_CHECKING([for usage of UTF8Characters])
-oCFLAGS=$CFLAGS
-CFLAGS="$GECKO_CFLAGS"
-AC_LANG_PUSH([C])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifndef XP_UNIX
-#define XP_UNIX 1
-#endif
-#include <npapi.h>
-#include <npruntime.h>
-],[
-NPString s;
-s.UTF8Characters = "Testing";
-])],[
-    AC_MSG_RESULT([yes])
-    AC_DEFINE([NPAPI_USE_UPPERCASE_UTF8],[1],[Define if NPAPI declares NPString with an uppercase UTF8])
-],[
-    AC_MSG_RESULT([no])
-])
-AC_LANG_POP([C])
-CFLAGS=$oCFLAGS
-
-    
-dnl Locate where the plugins should go
-PKG_CHECK_MODULES(NSPR, [nspr],[
-    libdir=`$PKG_CONFIG --variable=libdir nspr`
-    AC_SUBST(libdir)
-    if test "$require_nspr" = "yes"; then
-      AC_DEFINE([HAVE_NSPR],[1],[Define to 1 if using nspr])
-      GECKO_CFLAGS="$GECKO_CFLAGS $NSPR_CFLAGS"
-    fi],[if test "$require_nspr" = "yes"; then
-      AC_MSG_ERROR([nspr not found, required by detected gecko])
-    else
-      AC_MSG_WARN([nspr not found, may not be needed])
-    fi])
-
-
-AC_SUBST(GECKO_CFLAGS)
-AC_SUBST(GECKO_LIBS)
-
-PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95 dbus-glib-1 >= 0.70])
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
-AC_ARG_WITH([plugin_dir],
-    [AS_HELP_STRING([--with-plugin-dir=dir],
-        [Directory where plugins are stored])],
-        [plugindir=$withval],
-        [plugindir='$(libdir)/mozilla/plugins'])
-AC_SUBST(plugindir)
-
-AC_ARG_ENABLE(caching,
-	AC_HELP_STRING([--disable-caching],[Disable caching of remote media to local storage]),
-	[usecache=$enableval],[usecache=yes])
-
-if test $usecache != yes; then
-	GECKO_CFLAGS="$GECKO_CFLAGS -DDISABLE_CACHE"
-fi
-
-AC_ARG_WITH([libcurl],
-    [AS_HELP_STRING([--with-libcurl],
-        [Add support for libcurl])],
-        [],
-        [with_libcurl=check])
-AS_IF([test "x$with_libcurl" != xno], 
-    [PKG_CHECK_MODULES(CURL,[libcurl],[CURL_DEFINES="-DHAVE_CURL" AC_DEFINE([CURL_ENABLED],[1],[Define to 1 if you have curl support])],AC_MSG_NOTICE([Compiling without curl support. May disable apple.com sites]))
-    AC_SUBST(CURL_DEFINES)
-    AC_SUBST(CURL_CFLAGS)
-    AC_SUBST(CURL_LIBS)
-    ])    
-
-
-BACKEND=`pkg-config --variable=preference_backend gmlib`
-
-if test ${BACKEND} = "gsettings"; then
-    AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
-    dnl GLIB_GSETTINGS
-    AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
-    USE_GSETTINGS=1
-    AC_SUBST(USE_GSETTINGS)
-elif test ${BACKEND} = "gconf"; then
-    AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
-    GSETTINGS_RULES=""
-    AC_SUBST(GSETTINGS_RULES)
-    AM_GCONF_SOURCE_2 
-    USE_GCONF=1
-    AC_SUBST(USE_GCONF)    
-elif test ${BACKEND} = "keystore"; then
-    GSETTINGS_RULES=""
-    AC_SUBST(GSETTINGS_RULES)
-    AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
-fi
-
-
-AC_OUTPUT([
-Makefile
-gecko-mediaplayer.spec
-src/Makefile
-po/Makefile.in
-])
-

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-09-24 12:57:53 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-0001-nomozalloc.patch
-0002-require-nspr.patch

=== modified file 'configure.in'
--- configure.in	2013-03-07 11:00:21 +0000
+++ configure.in	2013-08-29 21:48:20 +0000
@@ -42,7 +42,7 @@
         [
 	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
 	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
-	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s_nomozalloc -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
+	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
 	],
         [])
 
@@ -68,9 +68,8 @@
 fi
 
 if test "$GECKO_CFLAGS" = ""; then
-PKG_CHECK_MODULES(GECKO, [mozilla-plugin],[ AC_MSG_NOTICE([Using mozilla])
+PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ AC_MSG_NOTICE([Using mozilla])
     ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
-    require_nspr="yes"
 fi
 
 if test "$GECKO_CFLAGS" = ""; then

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-07 11:00:21 +0000
+++ debian/changelog	2013-08-29 21:48:20 +0000
@@ -1,3 +1,36 @@
+gecko-mediaplayer (1.0.8-4ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian testing, remaining ubuntu changes:
+    - debian/rules: Drop --with-xulrunner-sdk flag, it's empty and cause FTBFS.
+    - debian/control: Build depend on libnspr4-dev
+    - debian/patches/0002-require-nspr.patch:
+      firefox-dev now only provides npapi headers so require nspr to build
+
+ -- Jackson Doak <[e-mail]>  Fri, 30 Aug 2013 07:26:44 +1000
+
+gecko-mediaplayer (1.0.8-4) unstable; urgency=low
+
+  * debian/patches/functable-check.patch: Actually check the correct function
+    table. This should now cover all cases correctly.
+
+ -- Sebastian Ramacher <[e-mail]>  Mon, 24 Jun 2013 12:51:09 +0200
+
+gecko-mediaplayer (1.0.8-3) unstable; urgency=low
+
+  * debian/patches/functable-check.patch: Fix function table check. This
+    improves the compatibility with browser other than iceweasel and with
+    older versions of iceweasel if built against a newer one. (LP: #870115,
+    #1069635)
+
+ -- Sebastian Ramacher <[e-mail]>  Sun, 23 Jun 2013 17:44:51 +0200
+
+gecko-mediaplayer (1.0.8-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * debian/install: Don't install obsolete gconf2 scheme.
+
+ -- Sebastian Ramacher <[e-mail]>  Thu, 06 Jun 2013 22:42:00 +0200
+
 gecko-mediaplayer (1.0.8-1ubuntu1) raring; urgency=low
 
   * Merge from Debian experimental, Ubuntu remaining changes :

=== modified file 'debian/gbp.conf'
--- debian/gbp.conf	2012-11-18 11:33:04 +0000
+++ debian/gbp.conf	2013-08-29 21:48:20 +0000
@@ -1,3 +1,3 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = experimental
+debian-branch = master

=== removed file 'debian/install'
--- debian/install	2008-11-25 21:39:54 +0000
+++ debian/install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-gecko-mediaplayer.schemas /usr/share/gconf/schemas

=== added file 'debian/patches/functable-check.patch'
--- debian/patches/functable-check.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/functable-check.patch	2013-08-29 21:48:20 +0000
@@ -0,0 +1,33 @@
+Description: Fix function table check
+ We only need to know if we have access to all the values we need. Everything
+ else is not necessary.
+Author: Sebastian Ramacher <[e-mail]>
+Last-Update: 2013-06-24
+Forwarded: https://code.google.com/p/gecko-mediaplayer/issues/detail?id=184
+
+--- a/src/np_entry.cpp
++++ b/src/np_entry.cpp
+@@ -42,6 +42,7 @@
+ #include <npapi.h>
+ #include <npfunctions.h>
+ #include "npupp.h"
++#include <cstddef>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+@@ -117,9 +118,14 @@
+     if (HIBYTE(pFuncs->version) > NP_VERSION_MAJOR)
+         return NPERR_INCOMPATIBLE_VERSION_ERROR;
+ 
+-    if (pFuncs->size < sizeof(NPNetscapeFuncs))
++    if (pFuncs->size < offsetof(NPNetscapeFuncs, setexception) + sizeof(NPN_SetExceptionProcPtr))
+         return NPERR_INVALID_FUNCTABLE_ERROR;
+ 
++#ifdef XP_UNIX
++    if (pluginFuncs->size < offsetof(NPPluginFuncs, getvalue) + sizeof(NPP_GetValueProcPtr))
++      return NPERR_INVALID_FUNCTABLE_ERROR;
++#endif
++
+     NPNFuncs.size = pFuncs->size;
+     NPNFuncs.version = pFuncs->version;
+     NPNFuncs.geturlnotify = pFuncs->geturlnotify;

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-24 12:57:53 +0000
+++ debian/patches/series	2013-08-29 21:48:20 +0000
@@ -1,2 +1,3 @@
 0001-nomozalloc.patch
 0002-require-nspr.patch
+functable-check.patch