r19643 - in /desktop/experimental/totem/debian: changelog patches/70_bbc_plugin.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Apr 19 14:49:30 2009
New Revision: 19643

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19643
Log:
debian/patches/70_bbc_plugin.patch: Updated

Modified:
    desktop/experimental/totem/debian/changelog
    desktop/experimental/totem/debian/patches/70_bbc_plugin.patch

Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=19643&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog (original)
+++ desktop/experimental/totem/debian/changelog Sun Apr 19 14:49:30 2009
@@ -8,12 +8,13 @@
   * debian/patches/02_flv.patch: Dropped, fixed upstream
   * debian/patches/04_tracker_build.patch: Dropped, fixed upstream
   * debian/patches/01_fake_keypresses.patch: Updated and simplified
+  * debian/patches/70_bbc_plugin.patch: Updated
 
   [ Emilio Pozuelo Monfort ]
   * Recommend gnome-codec-install rather than gnome-app-install.
     Closes: #523052.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 19 Apr 2009 14:57:14 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 19 Apr 2009 15:49:15 +0100
 
 totem (2.24.3-3) unstable; urgency=low
 

Modified: desktop/experimental/totem/debian/patches/70_bbc_plugin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/70_bbc_plugin.patch?rev=19643&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/70_bbc_plugin.patch (original)
+++ desktop/experimental/totem/debian/patches/70_bbc_plugin.patch Sun Apr 19 14:49:30 2009
@@ -1,8 +1,8 @@
 diff --git a/bindings/python/totem.defs b/bindings/python/totem.defs
-index 03681ec..7ccaaac 100644
+index 059b400..33aaf49 100644
 --- a/bindings/python/totem.defs
 +++ b/bindings/python/totem.defs
-@@ -204,6 +204,16 @@
+@@ -206,6 +206,16 @@
    (return-type "none")
  )
  
@@ -20,19 +20,19 @@
    (of-object "TotemObject")
    (c-name "totem_action_stop")
 diff --git a/configure.in b/configure.in
-index 1bdd1a8..08d5f14 100644
+index d6f24e5..b9d12d7 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -50,7 +50,7 @@ AC_SUBST(TOTEM_VERSION_MINOR)
  AC_SUBST(TOTEM_VERSION_MICRO)
  
  # The full list of plugins
--allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bemused youtube publish tracker pythonconsole"
-+allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bbc bemused youtube publish tracker pythonconsole"
+-allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bemused youtube publish tracker pythonconsole jamendo opensubtitles screenshot brasero-disc-recorder coherence_upnp"
++allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bbc bemused youtube publish tracker pythonconsole jamendo opensubtitles screenshot brasero-disc-recorder coherence_upnp"
  
  PLUGINDIR='${libdir}/totem/plugins'
  AC_SUBST(PLUGINDIR)
-@@ -547,6 +547,36 @@ for plugin in ${used_plugins}; do
+@@ -564,6 +564,36 @@ for plugin in ${used_plugins}; do
  				add_plugin="0"
  			fi
  		;;
@@ -69,14 +69,14 @@
  		bemused)
  			PKG_CHECK_MODULES(BEMUSED, bluez, [HAVE_BLUEZ=yes], [HAVE_BLUEZ=no])
  			if test "${HAVE_BLUEZ}" != "yes" ; then
-@@ -836,6 +866,7 @@ totem.spec
+@@ -852,6 +882,7 @@ totem.spec
  lib/Makefile
  src/Makefile
  src/plugins/Makefile
 +src/plugins/bbc/Makefile
  src/plugins/bemused/Makefile
+ src/plugins/coherence_upnp/Makefile
  src/plugins/screensaver/Makefile
- src/plugins/ontop/Makefile
 diff --git a/src/plugins/bbc/Makefile.am b/src/plugins/bbc/Makefile.am
 new file mode 100644
 index 0000000..f733dd2