r29110 - /desktop/unstable/totem/debian/patches/70_bbc_plugin.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Jul 26 16:57:39 2011
New Revision: 29110

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29110
Log:
Refresh patch to apply without fuzz

Modified:
    desktop/unstable/totem/debian/patches/70_bbc_plugin.patch

Modified: desktop/unstable/totem/debian/patches/70_bbc_plugin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/70_bbc_plugin.patch?rev=29110&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/70_bbc_plugin.patch [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/70_bbc_plugin.patch [utf-8] Tue Jul 26 16:57:39 2011
@@ -1,7 +1,7 @@
-Index: b/bindings/python/totem.defs
+Index: totem-2.30.2.bak/bindings/python/totem.defs
 ===================================================================
---- a/bindings/python/totem.defs
-+++ b/bindings/python/totem.defs
+--- totem-2.30.2.bak.orig/bindings/python/totem.defs	2011-07-26 16:51:41.168061968 +0200
++++ totem-2.30.2.bak/bindings/python/totem.defs	2011-07-26 17:29:32.871502789 +0200
 @@ -216,6 +216,16 @@
    (return-type "none")
  )
@@ -19,10 +19,10 @@
  (define-method action_stop
    (of-object "TotemObject")
    (c-name "totem_action_stop")
-Index: b/configure.in
+Index: totem-2.30.2.bak/configure.in
 ===================================================================
---- a/configure.in
-+++ b/configure.in
+--- totem-2.30.2.bak.orig/configure.in	2011-07-26 16:51:41.144062271 +0200
++++ totem-2.30.2.bak/configure.in	2011-07-26 17:29:32.875502739 +0200
 @@ -52,7 +52,7 @@
  AC_SUBST(TOTEM_VERSION_MICRO)
  
@@ -32,7 +32,7 @@
  
  PLUGINDIR='${libdir}/totem/plugins'
  AC_SUBST(PLUGINDIR)
-@@ -512,6 +512,32 @@
+@@ -489,6 +489,32 @@
  				add_plugin="0"
  			fi
  		;;
@@ -65,7 +65,7 @@
  		bemused)
  			PKG_CHECK_MODULES(BEMUSED, bluez, [HAVE_BLUEZ=yes], [HAVE_BLUEZ=no])
  			if test "${HAVE_BLUEZ}" != "yes" ; then
-@@ -814,6 +840,7 @@
+@@ -796,6 +822,7 @@
  lib/Makefile
  src/Makefile
  src/plugins/Makefile
@@ -73,10 +73,10 @@
  src/plugins/bemused/Makefile
  src/plugins/coherence_upnp/Makefile
  src/plugins/dbus-service/Makefile
-Index: b/src/plugins/bbc/Makefile.am
+Index: totem-2.30.2.bak/src/plugins/bbc/Makefile.am
 ===================================================================
---- /dev/null
-+++ b/src/plugins/bbc/Makefile.am
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.30.2.bak/src/plugins/bbc/Makefile.am	2011-07-26 17:29:32.891502538 +0200
 @@ -0,0 +1,26 @@
 +plugindir = $(PLUGINDIR)/bbc
 +plugin_PYTHON = bbc.py contentview.py genres.py installablecodecs.py
@@ -104,10 +104,10 @@
 +	echo
 +
 +
-Index: b/src/plugins/bbc/bbc.py
+Index: totem-2.30.2.bak/src/plugins/bbc/bbc.py
 ===================================================================
---- /dev/null
-+++ b/src/plugins/bbc/bbc.py
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.30.2.bak/src/plugins/bbc/bbc.py	2011-07-26 17:29:32.891502538 +0200
 @@ -0,0 +1,95 @@
 +#!/usr/bin/python
 +# coding=UTF-8
@@ -204,10 +204,10 @@
 +		else:
 +		  gst.error('No uri for episode ' + episode.title)
 +
-Index: b/src/plugins/bbc/bbc.totem-plugin.in
+Index: totem-2.30.2.bak/src/plugins/bbc/bbc.totem-plugin.in
 ===================================================================
---- /dev/null
-+++ b/src/plugins/bbc/bbc.totem-plugin.in
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.30.2.bak/src/plugins/bbc/bbc.totem-plugin.in	2011-07-26 17:29:32.899502436 +0200
 @@ -0,0 +1,9 @@
 +[Totem Plugin]
 +Loader=python
@@ -218,10 +218,10 @@
 +Authors=Tim-Philipp Müller <tim.muller at collabora.co.uk>
 +Copyright=Copyright © 2008 Tim-Philipp Müller and Canonical Ltd. 
 +Website=http://www.gnome.org/projects/totem/
-Index: b/src/plugins/bbc/contentview.py
+Index: totem-2.30.2.bak/src/plugins/bbc/contentview.py
 ===================================================================
---- /dev/null
-+++ b/src/plugins/bbc/contentview.py
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.30.2.bak/src/plugins/bbc/contentview.py	2011-07-26 17:29:32.899502436 +0200
 @@ -0,0 +1,1019 @@
 +#!/usr/bin/python
 +# coding=UTF-8
@@ -1242,10 +1242,10 @@
 +    window.show_all()
 +    gtk.main()
 +
-Index: b/src/plugins/bbc/genres.py
+Index: totem-2.30.2.bak/src/plugins/bbc/genres.py
 ===================================================================
---- /dev/null
-+++ b/src/plugins/bbc/genres.py
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.30.2.bak/src/plugins/bbc/genres.py	2011-07-26 17:29:32.899502436 +0200
 @@ -0,0 +1,251 @@
 +#!/usr/bin/python
 +# coding=UTF-8
@@ -1498,10 +1498,10 @@
 +if __name__ == "__main__":
 +  pass
 +
-Index: b/src/plugins/bbc/installablecodecs.py
+Index: totem-2.30.2.bak/src/plugins/bbc/installablecodecs.py
 ===================================================================
---- /dev/null
-+++ b/src/plugins/bbc/installablecodecs.py
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.30.2.bak/src/plugins/bbc/installablecodecs.py	2011-07-26 17:29:32.903502386 +0200
 @@ -0,0 +1,112 @@
 +#!/usr/bin/python
 +# coding=UTF-8