diff -Nru gecko-mediaplayer-1.0.6/debian/changelog gecko-mediaplayer-1.0.6/debian/changelog --- gecko-mediaplayer-1.0.6/debian/changelog 2012-05-04 13:11:36.000000000 -0400 +++ gecko-mediaplayer-1.0.6/debian/changelog 2012-09-24 13:06:28.000000000 -0400 @@ -1,3 +1,15 @@ +gecko-mediaplayer (1.0.6-1ubuntu2) quantal; urgency=low + + * debian/patches/0002-require-nspr.patch: + - firefox-dev now only provides npapi headers so require nspr to build + (LP: #1055639) + * debian/rules: + - Drop --with-xulrunner-sdk + * debian/control: + - Build depend on libnspr4-dev + + -- Jason Conti Mon, 24 Sep 2012 12:57:53 -0400 + gecko-mediaplayer (1.0.6-1ubuntu1) quantal; urgency=low * Sync with Debian (LP: #928101) diff -Nru gecko-mediaplayer-1.0.6/debian/control gecko-mediaplayer-1.0.6/debian/control --- gecko-mediaplayer-1.0.6/debian/control 2012-05-03 12:37:01.000000000 -0400 +++ gecko-mediaplayer-1.0.6/debian/control 2012-09-24 12:50:21.000000000 -0400 @@ -11,6 +11,7 @@ pkg-config (>= 0.26), libglib2.0-dev (>= 2.14), xulrunner-dev | firefox-dev, + libnspr4-dev, libdbus-1-dev (>= 0.95), libdbus-glib-1-dev (>= 0.70), libx11-dev, diff -Nru gecko-mediaplayer-1.0.6/debian/patches/0002-require-nspr.patch gecko-mediaplayer-1.0.6/debian/patches/0002-require-nspr.patch --- gecko-mediaplayer-1.0.6/debian/patches/0002-require-nspr.patch 1969-12-31 19:00:00.000000000 -0500 +++ gecko-mediaplayer-1.0.6/debian/patches/0002-require-nspr.patch 2012-09-24 13:07:32.000000000 -0400 @@ -0,0 +1,21 @@ +Description: require nspr to build plugin + firefox-dev in quantal only provides the npapi headers so we need nspr to + build the plugin. (Perhaps firefox-dev should provide npapi-sdk.pc instead? + Then this patch wouldn't be required.) +Author: Jason Conti +Last-Update: 2012-09-24 +Bug-Ubuntu: https://launchpad.net/bugs/1055639 + +--- gecko-mediaplayer-1.0.6.orig/configure.in ++++ gecko-mediaplayer-1.0.6/configure.in +@@ -68,8 +68,9 @@ PKG_CHECK_MODULES(GECKO, [libxul-unstabl + fi + + if test "$GECKO_CFLAGS" = ""; then +-PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ AC_MSG_NOTICE([Using mozilla]) ++PKG_CHECK_MODULES(GECKO, [mozilla-plugin],[ AC_MSG_NOTICE([Using mozilla]) + ],[AC_MSG_WARN([mozilla-plugin not found, trying another])]) ++ require_nspr="yes" + fi + + if test "$GECKO_CFLAGS" = ""; then diff -Nru gecko-mediaplayer-1.0.6/debian/patches/series gecko-mediaplayer-1.0.6/debian/patches/series --- gecko-mediaplayer-1.0.6/debian/patches/series 2012-05-02 18:22:20.000000000 -0400 +++ gecko-mediaplayer-1.0.6/debian/patches/series 2012-09-24 12:52:29.000000000 -0400 @@ -1 +1,2 @@ 0001-nomozalloc.patch +0002-require-nspr.patch diff -Nru gecko-mediaplayer-1.0.6/debian/rules gecko-mediaplayer-1.0.6/debian/rules --- gecko-mediaplayer-1.0.6/debian/rules 2012-05-03 12:38:34.000000000 -0400 +++ gecko-mediaplayer-1.0.6/debian/rules 2012-09-24 12:57:43.000000000 -0400 @@ -13,8 +13,7 @@ dh $@ --parallel --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --with-plugin-dir=/usr/lib/mozilla/plugins \ - --with-xulrunner-sdk=$(shell pkg-config --variable=sdkdir mozilla-plugin) + dh_auto_configure -- --with-plugin-dir=/usr/lib/mozilla/plugins override_dh_auto_install: dh_auto_install