diff -Nru gecko-mediaplayer-1.0.9/debian/changelog gecko-mediaplayer-1.0.9/debian/changelog --- gecko-mediaplayer-1.0.9/debian/changelog 2014-06-18 19:25:24.000000000 +1000 +++ gecko-mediaplayer-1.0.9/debian/changelog 2014-06-20 13:28:22.000000000 +1000 @@ -1,3 +1,14 @@ +gecko-mediaplayer (1.0.9-2ubuntu1) utopic; urgency=low + + * Merge from Debian unstable. Remaining 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 + * Add 0003-plugin-name.patch. Fixes the plugin's name in firefox. LP:#1313163 + + -- Jackson Doak Thu, 19 Jun 2014 12:21:52 +0000 + gecko-mediaplayer (1.0.9-2) unstable; urgency=medium * debian/control: Switch from xulrunner-dev to iceweasel-dev. @@ -17,6 +28,16 @@ -- Sebastian Ramacher Thu, 12 Jun 2014 18:41:24 +0200 +gecko-mediaplayer (1.0.8-4ubuntu1) saucy; 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 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 @@ -40,6 +61,19 @@ -- Sebastian Ramacher Thu, 06 Jun 2013 22:42:00 +0200 +gecko-mediaplayer (1.0.8-1ubuntu1) raring; urgency=low + + * Merge from Debian experimental, Ubuntu remaining 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 + (LP: #1055639) + + -- Julien Lavergne Thu, 07 Mar 2013 11:00:21 +0100 + gecko-mediaplayer (1.0.8-1) experimental; urgency=low * New upstream release. @@ -49,6 +83,19 @@ -- Sebastian Ramacher Sun, 03 Mar 2013 19:23:44 +0100 +gecko-mediaplayer (1.0.7-1ubuntu1) raring; urgency=low + + * Merge from Debian experimental, Ubuntu remaining changes : + * debian/rules: + - Disable --as-needed to fix another FTBFS on Ubuntu. + * 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 + (LP: #1055639) + + -- Julien Lavergne Wed, 21 Nov 2012 22:33:14 +0100 + gecko-mediaplayer (1.0.7-1) experimental; urgency=low * New upstream release. @@ -64,6 +111,28 @@ -- Sebastian Ramacher Sun, 18 Nov 2012 11:33:04 +0100 +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) + * Ubuntu remaining changes : + - debian/rules: + + Add --with-xulrunner-sdk to fix FTBFS on Ubuntu (LP: #935501) + + Disable --as-needed to fix another FTBFS on Ubuntu. + + -- Julien Lavergne Fri, 04 May 2012 19:11:21 +0200 + gecko-mediaplayer (1.0.6-1) unstable; urgency=low * New upstream release. @@ -411,3 +480,4 @@ * Initial release (Closes: #483551) -- Cesare Tirabassi Wed, 02 Jul 2008 15:21:38 +0200 + diff -Nru gecko-mediaplayer-1.0.9/debian/control gecko-mediaplayer-1.0.9/debian/control --- gecko-mediaplayer-1.0.9/debian/control 2014-06-15 00:38:26.000000000 +1000 +++ gecko-mediaplayer-1.0.9/debian/control 2014-06-20 12:56:53.000000000 +1000 @@ -1,7 +1,8 @@ Source: gecko-mediaplayer Section: video Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: Julien Lavergne , Aron Xu , @@ -17,7 +18,8 @@ libx11-dev, libgmlib-dev (>= 1.0.7), libgconf2-dev, - libcurl4-gnutls-dev | libcurl-dev + libcurl4-gnutls-dev | libcurl-dev, + libnspr4-dev Standards-Version: 3.9.5 Homepage: http://code.google.com/p/gecko-mediaplayer/ Vcs-Git: git://anonscm.debian.org/pkg-multimedia/gecko-mediaplayer.git diff -Nru gecko-mediaplayer-1.0.9/debian/patches/0002-require-nspr.patch gecko-mediaplayer-1.0.9/debian/patches/0002-require-nspr.patch --- gecko-mediaplayer-1.0.9/debian/patches/0002-require-nspr.patch 1970-01-01 10:00:00.000000000 +1000 +++ gecko-mediaplayer-1.0.9/debian/patches/0002-require-nspr.patch 2014-06-20 13:02:27.000000000 +1000 @@ -0,0 +1,25 @@ +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 + +--- + configure.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/configure.in ++++ b/configure.in +@@ -80,8 +80,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.9/debian/patches/0003-plugin-name.patch gecko-mediaplayer-1.0.9/debian/patches/0003-plugin-name.patch --- gecko-mediaplayer-1.0.9/debian/patches/0003-plugin-name.patch 1970-01-01 10:00:00.000000000 +1000 +++ gecko-mediaplayer-1.0.9/debian/patches/0003-plugin-name.patch 2014-06-20 13:23:43.000000000 +1000 @@ -0,0 +1,18 @@ +Description: Fix the plugin name in firefox + Use a logical plugin name rather than "mplayerplug-in is now gecko-mediaplayer" +Author: Jackson Doak +Bug: https://code.google.com/p/gecko-mediaplayer/issues/detail?id=190 +Bug-Ubuntu: https://launchpad.net/bugs/1313163 +Forwarded: not-needed + +--- gecko-mediaplayer-1.0.9.orig/src/plugin_types_std.cpp ++++ gecko-mediaplayer-1.0.9/src/plugin_types_std.cpp +@@ -142,7 +142,7 @@ NPError PluginGetValue(NPPVariable varia + // some sites use this description to figure out what formats can be played. So we have to make sure the + // description matches the features + if (variable == NPPVpluginNameString) { +- *((const char **) value) = "mplayerplug-in is now gecko-mediaplayer " VERSION; ++ *((const char **) value) = "Gecko Media Player" VERSION; + } + if (variable == NPPVpluginDescriptionString) { + *((const char **) value) = diff -Nru gecko-mediaplayer-1.0.9/debian/patches/series gecko-mediaplayer-1.0.9/debian/patches/series --- gecko-mediaplayer-1.0.9/debian/patches/series 2014-06-15 00:34:35.000000000 +1000 +++ gecko-mediaplayer-1.0.9/debian/patches/series 2014-06-20 13:19:39.000000000 +1000 @@ -1,2 +1,4 @@ 0001-nomozalloc.patch np_loadds.patch +0002-require-nspr.patch +0003-plugin-name.patch diff -Nru gecko-mediaplayer-1.0.9/debian/rules gecko-mediaplayer-1.0.9/debian/rules --- gecko-mediaplayer-1.0.9/debian/rules 2014-06-12 01:46:05.000000000 +1000 +++ gecko-mediaplayer-1.0.9/debian/rules 2014-06-20 13:14:20.000000000 +1000 @@ -15,8 +15,7 @@ override_dh_auto_configure: dh_auto_configure -- \ - --with-plugin-dir=/usr/lib/mozilla/plugins \ - --with-xulrunner-sdk=$(shell pkg-config libxul --variable=sdkdir) + --with-plugin-dir=/usr/lib/mozilla/plugins override_dh_auto_install: dh_auto_install