--- totem-2.30.2.orig/debian/watch +++ totem-2.30.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://download.gnome.org/sources/totem/([\d\.]+)[02468]/totem-([\d\.]+)\.tar\.gz --- totem-2.30.2.orig/debian/totem-plugins.install +++ totem-2.30.2/debian/totem-plugins.install @@ -0,0 +1,23 @@ +debian/tmp/usr/lib/totem/plugins/bbc +# Installed from debian/rules +# debian/tmp/usr/lib/totem/plugins/bemused +debian/tmp/usr/lib/totem/plugins/brasero-disc-recorder +debian/tmp/usr/lib/totem/plugins/dbus +debian/tmp/usr/lib/totem/plugins/galago +debian/tmp/usr/lib/totem/plugins/gromit +debian/tmp/usr/lib/totem/plugins/iplayer +debian/tmp/usr/lib/totem/plugins/jamendo +debian/tmp/usr/lib/totem/plugins/lirc +debian/tmp/usr/lib/totem/plugins/media-player-keys +debian/tmp/usr/lib/totem/plugins/ontop +debian/tmp/usr/lib/totem/plugins/opensubtitles +debian/tmp/usr/lib/totem/plugins/properties +debian/tmp/usr/lib/totem/plugins/publish +debian/tmp/usr/lib/totem/plugins/pythonconsole +debian/tmp/usr/lib/totem/plugins/screensaver +debian/tmp/usr/lib/totem/plugins/screenshot +debian/tmp/usr/lib/totem/plugins/skipto +debian/tmp/usr/lib/totem/plugins/thumbnail +debian/tmp/usr/lib/totem/plugins/totem +debian/tmp/usr/lib/totem/plugins/tracker +debian/tmp/usr/lib/totem/plugins/youtube --- totem-2.30.2.orig/debian/totem.install +++ totem-2.30.2/debian/totem.install @@ -0,0 +1,6 @@ +debian/bug/control /usr/share/bug/totem/ +debian/tmp/usr/bin +debian/tmp/usr/lib/totem/totem +debian/tmp/usr/lib/totem/totem-plugin-viewer +debian/tmp/usr/lib/nautilus +debian/tmp/usr/share/applications --- totem-2.30.2.orig/debian/control +++ totem-2.30.2/debian/control @@ -0,0 +1,235 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: totem +Section: video +Priority: optional +Maintainer: Sebastien Bacher +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Michael Biebl , Sebastian Dröge +Build-Depends: debhelper (>= 5.0.51~), + cdbs, + quilt, + python-support (>= 0.6), + libepc-ui-dev (>= 0.3.0), + libglib2.0-dev (>= 2.22), + libatk1.0-dev (>= 1.29.4), + libgtk2.0-dev (>= 2.19.5), + libunique-dev, + libtotem-plparser-dev (>= 2.29.1), + libtracker-client-0.8-dev (>= 0.8.1), + liblircclient-dev (>= 0.6.6), + libirman-dev (>= 0.4.2), + gnome-pkg-tools (>= 0.10), + scrollkeeper, + libgstreamer0.10-dev (>= 0.10.28.1), + libgstreamer-plugins-base0.10-dev (>= 0.10.26), + gstreamer0.10-tools (>= 0.10.26), + gstreamer0.10-plugins-base (>= 0.10.26), + gstreamer0.10-plugins-good, + librsvg2-dev (>= 2.16.0-2), + librsvg2-common (>= 2.16.0-2), + libnautilus-extension-dev (>= 2.22), + libmusicbrainz4-dev (>= 2.1.1-4.1), + gnome-icon-theme (>= 2.15.90), + libdbus-glib-1-dev (>= 0.61), + xulrunner-dev, + intltool (>= 0.40), + autotools-dev, + dpkg-dev (>= 1.13.19), + libgconf2-dev, + shared-mime-info (>= 0.22), + libhal-dev (>= 0.5), + libcam-dev [kfreebsd-i386 kfreebsd-amd64], + libxtst-dev, + libxrandr-dev (>= 1.1.1), + libxxf86vm-dev (>= 1.0.1), + libx11-dev, + x11proto-core-dev, + gnome-doc-utils, + python-dev (>= 2.3), + python-gobject-dev (>= 2.15.3), + python-gtk2-dev (>= 2.13), + python-gst0.10-dev (>= 0.10.11), + python-xdg, + python-rdflib, + libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + libgalago-dev (>= 0.5.2), + libgdata-dev (>= 0.6.0) +Standards-Version: 3.8.4 +Homepage: http://www.gnome.org/projects/totem/ + +Package: totem +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + gstreamer0.10-plugins-base (>= 0.10.26), + gstreamer0.10-alsa | gstreamer0.10-audiosink, + gstreamer0.10-plugins-good (>= 0.10.7), + gstreamer0.10-x, + gnome-icon-theme (>= 2.15.90), + totem-common (= ${source:Version}) +Conflicts: totem (<< 0.99.12-2), + gnome-control-center (<< 2.15.90), + totem-mozilla (<< 2.20.0-3), + totem-gstreamer (<< 2.27.1), + totem-xine (<< 2.27.1) +Replaces: totem-xine (<< 2.27.1), + totem-gstreamer (<< 2.27.1), + totem-common (<< 2.28.1-1) +Provides: totem-xine, + totem-gstreamer +Recommends: totem-plugins, + gstreamer0.10-plugins-ugly, + gstreamer0.10-plugins-bad, + gstreamer0.10-ffmpeg +Suggests: gnome-codec-install, + gstreamer0.10-pulseaudio (>= 0.10.16-5), + totem-mozilla, + totem-coherence +Description: A simple media player for the GNOME desktop based on GStreamer + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. It features : + . + * Shoutcast, m3u, asx, SMIL and ra playlists support + * DVD (with menus), VCD and Digital CD (with CDDB) playback + * TV-Out configuration with optional resolution switching + * 4.0, 5.0, 5.1 and stereo audio output + * Full-screen mode (move your mouse and you get nice controls) with + Xinerama, dual-head and RandR support + * Aspect ratio toggling, scaling based on the video's original size + * Full keyboard control + * Simple playlist with repeat mode and saving feature + * GNOME, Nautilus and GIO integration + * Screenshot of the current movie + * Brightness and Contrast control + * Visualisation plugin when playing audio-only files + * Video thumbnailer for nautilus + * Nautilus properties page + * Works on remote displays + * DVD, VCD and OGG/OGM subtitles with automatic language selection + * Extensible with plugins + +Package: totem-mozilla +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + totem (= ${binary:Version}), + dbus-x11 (>= 0.61) +Recommends: epiphany-browser | www-browser +Description: Totem Mozilla plugin + This package contains the Totem Mozilla plugin, which will + enhance your Gecko-based browser to be able to display movie + clips. + . + This plugin should work for Iceweasel as well as XULRunner based browsers. + +Package: totem-common +Architecture: all +Depends: ${misc:Depends} +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Description: Data files for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains common data files and translations. + +Package: totem-dbg +Architecture: any +Section: debug +Priority: extra +Depends: totem (= ${binary:Version}), + ${misc:Depends} +Conflicts: libtotem-plparser1-dbg, libtotem-plparser7-dbg +Description: Debugging symbols for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains detached debugging symbols. + +Package: totem-plugins +Architecture: any +Depends: totem (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + ${python:Depends}, + python-gobject (>= 2.18), + python-gtk2 (>= 2.13), + python-gconf, + python-gdata, + python-gst0.10 (>= 0.10.11), + python-xdg, + python-rdflib, + python-gdbm, + python-httplib2, + python-feedparser, + python-beautifulsoup +Recommends: gnome-settings-daemon, + totem-coherence +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Suggests: gromit +Description: Plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains a set of recommended plugins for Totem, which + allow to: + . + * Annotate the screen with the Gromit tool + * Control Totem with an Infrared remote control + * Control Totem with the keyboard's media player keys + * Keep the Totem window on top of the screen + * Display movie properties + * Deactivate the screensaver when a movie is playing + * Skip to a defined time in the movie + * Set the away status in the instant messenger when a movie is + playing + * Control totem with a mobile phone using the Bluetooth protocol + * Share the current playlist via HTTP + * Search, browse for and play videos from YouTube + * Search for videos using tracker + . + Additional plugins can be written in C, Python or Vala. + +Package: totem-coherence +Architecture: all +Depends: totem-plugins (>= ${source:Version}), + totem-common (>= ${gnome:Version}), + totem-common (<< ${gnome:NextVersion}), + ${misc:Depends}, + ${python:Depends}, + python-gtk2 (>= 2.13), + python-coherence +Conflicts: totem-plugins (<< 2.28.2-4) +Replaces: totem-plugins (<< 2.30.2-3) +Description: Coherence UPnP/DLNA plugin for totem + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This plugin allows totem to read videos on a UPnP Media server on the + network. + +Package: totem-xine +Architecture: all +Depends: totem (>= 2.27.1), + gstreamer0.10-plugins-bad, + gstreamer0.10-plugins-ugly, + ${misc:Depends} +Description: A simple media player for the GNOME desktop (transitional package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package is a transitional package. + +Package: totem-gstreamer +Architecture: all +Depends: totem (>= 2.27.1), + ${misc:Depends} +Description: A simple media player for the GNOME desktop (transitional package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package is a transitional package. + --- totem-2.30.2.orig/debian/totem.preinst +++ totem-2.30.2/debian/totem.preinst @@ -0,0 +1,13 @@ +#! /bin/sh +set -e + +# can be dropped after squeeze is released +if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt "2.30.1-1" ; then + update-alternatives --quiet --remove-all gnome-video-thumbnailer || true + update-alternatives --quiet --remove-all totem || true +fi + +#DEBHELPER# + +exit 0 + --- totem-2.30.2.orig/debian/test.html +++ totem-2.30.2/debian/test.html @@ -0,0 +1,51 @@ + + +Test + + +
+

PIMP

+

PIMP Internet Media Player

+ + + + + + + + + +
+ +
+ + + + + +
+ +
+ + --- totem-2.30.2.orig/debian/copyright +++ totem-2.30.2/debian/copyright @@ -0,0 +1,59 @@ +This package was debianized by Sebastien Bacher on +Sat, 24 Aug 2002 15:12:51 +0200. + +It was downloaded from http://www.hadess.net/totem.php3 + +Upstream Author: Bastien Nocera + +License: + + Totem is distributed under the GPL by default, with a special excemption + clause added: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + The excemption clause is: + The Totem project hereby grants permission for non-GPL compatible GStreamer + plugins to be used and distributed together with GStreamer and Totem. This + permission is above and beyond the permissions granted by the GPL licensei + by which Totem is covered. If you modify this code, you may. extend this + exception to your version of the code, but you are not obligated. to do + so. If you do not wish to do so, delete this exception statement from. + your version. + + The Totem Playlist parser library, "pl-parser", is licensed under the terms of + the LGPL. This includes the files starting with totem-pl-parser* in the src + directory. See for + details. + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- totem-2.30.2.orig/debian/totem.README.Debian +++ totem-2.30.2/debian/totem.README.Debian @@ -0,0 +1,9 @@ +---[ Configuring the output sink + +You can choose your preferred output sink by using gnome-sound-properties (in +the gnome-control-center package), or by editing the GConf key: + /system/gstreamer/0.10/default/musicaudiosink + +The default is to detect your output sink automagically. + + --- totem-2.30.2.orig/debian/control.in +++ totem-2.30.2/debian/control.in @@ -0,0 +1,230 @@ +Source: totem +Section: video +Priority: optional +Maintainer: Sebastien Bacher +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5.0.51~), + cdbs, + quilt, + python-support (>= 0.6), + libepc-ui-dev (>= 0.3.0), + libglib2.0-dev (>= 2.22), + libatk1.0-dev (>= 1.29.4), + libgtk2.0-dev (>= 2.19.5), + libunique-dev, + libtotem-plparser-dev (>= 2.29.1), + libtracker-client-0.8-dev (>= 0.8.1), + liblircclient-dev (>= 0.6.6), + libirman-dev (>= 0.4.2), + gnome-pkg-tools (>= 0.10), + scrollkeeper, + libgstreamer0.10-dev (>= 0.10.28.1), + libgstreamer-plugins-base0.10-dev (>= 0.10.26), + gstreamer0.10-tools (>= 0.10.26), + gstreamer0.10-plugins-base (>= 0.10.26), + gstreamer0.10-plugins-good, + librsvg2-dev (>= 2.16.0-2), + librsvg2-common (>= 2.16.0-2), + libnautilus-extension-dev (>= 2.22), + libmusicbrainz4-dev (>= 2.1.1-4.1), + gnome-icon-theme (>= 2.15.90), + libdbus-glib-1-dev (>= 0.61), + xulrunner-dev, + intltool (>= 0.40), + autotools-dev, + dpkg-dev (>= 1.13.19), + libgconf2-dev, + shared-mime-info (>= 0.22), + libhal-dev (>= 0.5), + libcam-dev [kfreebsd-i386 kfreebsd-amd64], + libxtst-dev, + libxrandr-dev (>= 1.1.1), + libxxf86vm-dev (>= 1.0.1), + libx11-dev, + x11proto-core-dev, + gnome-doc-utils, + python-dev (>= 2.3), + python-gobject-dev (>= 2.15.3), + python-gtk2-dev (>= 2.13), + python-gst0.10-dev (>= 0.10.11), + python-xdg, + python-rdflib, + libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + libgalago-dev (>= 0.5.2), + libgdata-dev (>= 0.6.0) +Standards-Version: 3.8.4 +Homepage: http://www.gnome.org/projects/totem/ + +Package: totem +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + gstreamer0.10-plugins-base (>= 0.10.26), + gstreamer0.10-alsa | gstreamer0.10-audiosink, + gstreamer0.10-plugins-good (>= 0.10.7), + gstreamer0.10-x, + gnome-icon-theme (>= 2.15.90), + totem-common (= ${source:Version}) +Conflicts: totem (<< 0.99.12-2), + gnome-control-center (<< 2.15.90), + totem-mozilla (<< 2.20.0-3), + totem-gstreamer (<< 2.27.1), + totem-xine (<< 2.27.1) +Replaces: totem-xine (<< 2.27.1), + totem-gstreamer (<< 2.27.1), + totem-common (<< 2.28.1-1) +Provides: totem-xine, + totem-gstreamer +Recommends: totem-plugins, + gstreamer0.10-plugins-ugly, + gstreamer0.10-plugins-bad, + gstreamer0.10-ffmpeg +Suggests: gnome-codec-install, + gstreamer0.10-pulseaudio (>= 0.10.16-5), + totem-mozilla, + totem-coherence +Description: A simple media player for the GNOME desktop based on GStreamer + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. It features : + . + * Shoutcast, m3u, asx, SMIL and ra playlists support + * DVD (with menus), VCD and Digital CD (with CDDB) playback + * TV-Out configuration with optional resolution switching + * 4.0, 5.0, 5.1 and stereo audio output + * Full-screen mode (move your mouse and you get nice controls) with + Xinerama, dual-head and RandR support + * Aspect ratio toggling, scaling based on the video's original size + * Full keyboard control + * Simple playlist with repeat mode and saving feature + * GNOME, Nautilus and GIO integration + * Screenshot of the current movie + * Brightness and Contrast control + * Visualisation plugin when playing audio-only files + * Video thumbnailer for nautilus + * Nautilus properties page + * Works on remote displays + * DVD, VCD and OGG/OGM subtitles with automatic language selection + * Extensible with plugins + +Package: totem-mozilla +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + totem (= ${binary:Version}), + dbus-x11 (>= 0.61) +Recommends: epiphany-browser | www-browser +Description: Totem Mozilla plugin + This package contains the Totem Mozilla plugin, which will + enhance your Gecko-based browser to be able to display movie + clips. + . + This plugin should work for Iceweasel as well as XULRunner based browsers. + +Package: totem-common +Architecture: all +Depends: ${misc:Depends} +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Description: Data files for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains common data files and translations. + +Package: totem-dbg +Architecture: any +Section: debug +Priority: extra +Depends: totem (= ${binary:Version}), + ${misc:Depends} +Conflicts: libtotem-plparser1-dbg, libtotem-plparser7-dbg +Description: Debugging symbols for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains detached debugging symbols. + +Package: totem-plugins +Architecture: any +Depends: totem (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + ${python:Depends}, + python-gobject (>= 2.18), + python-gtk2 (>= 2.13), + python-gconf, + python-gdata, + python-gst0.10 (>= 0.10.11), + python-xdg, + python-rdflib, + python-gdbm, + python-httplib2, + python-feedparser, + python-beautifulsoup +Recommends: gnome-settings-daemon, + totem-coherence +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Suggests: gromit +Description: Plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains a set of recommended plugins for Totem, which + allow to: + . + * Annotate the screen with the Gromit tool + * Control Totem with an Infrared remote control + * Control Totem with the keyboard's media player keys + * Keep the Totem window on top of the screen + * Display movie properties + * Deactivate the screensaver when a movie is playing + * Skip to a defined time in the movie + * Set the away status in the instant messenger when a movie is + playing + * Control totem with a mobile phone using the Bluetooth protocol + * Share the current playlist via HTTP + * Search, browse for and play videos from YouTube + * Search for videos using tracker + . + Additional plugins can be written in C, Python or Vala. + +Package: totem-coherence +Architecture: all +Depends: totem-plugins (>= ${source:Version}), + totem-common (>= ${gnome:Version}), + totem-common (<< ${gnome:NextVersion}), + ${misc:Depends}, + ${python:Depends}, + python-gtk2 (>= 2.13), + python-coherence +Conflicts: totem-plugins (<< 2.28.2-4) +Replaces: totem-plugins (<< 2.30.2-3) +Description: Coherence UPnP/DLNA plugin for totem + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This plugin allows totem to read videos on a UPnP Media server on the + network. + +Package: totem-xine +Architecture: all +Depends: totem (>= 2.27.1), + gstreamer0.10-plugins-bad, + gstreamer0.10-plugins-ugly, + ${misc:Depends} +Description: A simple media player for the GNOME desktop (transitional package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package is a transitional package. + +Package: totem-gstreamer +Architecture: all +Depends: totem (>= 2.27.1), + ${misc:Depends} +Description: A simple media player for the GNOME desktop (transitional package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package is a transitional package. + --- totem-2.30.2.orig/debian/changelog +++ totem-2.30.2/debian/changelog @@ -0,0 +1,1730 @@ +totem (2.30.2-6) unstable; urgency=low + + * Only suggest totem-mozilla. Closes: #599638. + * totem-coherence depends on totem-plugins. Closes: #607436. + + -- Josselin Mouette Wed, 22 Dec 2010 20:32:01 +0100 + +totem (2.30.2-5) unstable; urgency=low + + * Revert r25131: switch back to 1.0 source format + quilt. + + -- Josselin Mouette Sun, 03 Oct 2010 14:44:56 +0200 + +totem (2.30.2-4) unstable; urgency=low + + * Only install the bemused plugin on Linux. + + -- Emilio Pozuelo Monfort Fri, 01 Oct 2010 16:40:23 +0200 + +totem (2.30.2-3) unstable; urgency=low + + [ Emilio Pozuelo Monfort ] + * Really ship the UPnP plugin in totem-coherence. + + [ Josselin Mouette ] + * 82_youtube_api.patch: patch from upstream git to fix youtube plugin, + since the youtube API has changed *again* (sigh). + * Switch to 3.0 source package format. + + -- Emilio Pozuelo Monfort Fri, 01 Oct 2010 13:52:30 +0200 + +totem (2.30.2-2) unstable; urgency=low + + * debian/patches/80_webm.patch, + debian/patches/81_mpegts.patch: + + Patches from upstream GIT to add MPEG TS and WebM support in + the browser plugin and to add the mimetypes to the list of + supported mimetypes. + + -- Sebastian Dröge Sat, 29 May 2010 11:25:57 +0200 + +totem (2.30.2-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/90_autotools.patch: + - Updated for the new version. + + -- Sebastian Dröge Wed, 12 May 2010 18:34:53 +0200 + +totem (2.30.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastian Dröge Mon, 03 May 2010 13:52:51 +0200 + +totem (2.30.1-1) experimental; urgency=low + + [ Loïc Minier ] + * totem.preinst: Actually remove alternatives by checking for action + "upgrade" instead of "configure" which isn't used with preinsts; bump + verison to 2.30.0-2 for that to be effective. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/control.in: + - Update build dependencies. + + debian/patches/02_tracker_0.8.patch: + - Dropped, merged upstream. + + debian/patches/90_autotools.patch: + - Updated for the new version. + + -- Sebastian Dröge Wed, 28 Apr 2010 14:41:52 +0200 + +totem (2.30.0-2) experimental; urgency=low + + * debian/patches/03_tracker_0.8.patch + - Add support for tracker 0.8. Closes: #577207 + Patch cherry-picked from upstream Git. + * Refresh patches to apply cleanly. + * debian/control.in + - Re-enable tracker plugin support. Add Build-Depends on + libtracker-client-0.8-dev (>= 0.8.1). + - Update package description of totem-plugins. + + -- Michael Biebl Sat, 17 Apr 2010 00:46:43 +0200 + +totem (2.30.0-1) experimental; urgency=low + + * New upstream stable release: + + debian/patches/90_autotools.patch: + - Refreshed for the new version. + + -- Sebastian Dröge Wed, 31 Mar 2010 13:32:09 +0200 + +totem (2.29.92-1) experimental; urgency=low + + * New upstream development release: + + debian/patches/90_autotools.patch: + - Refreshed for the new version. + + debian/patches/99_gst-bus_flush.patch: + - Dropped, merged upstream. + * Merge changes from 2.28.5-2. + + -- Sebastian Dröge Tue, 16 Mar 2010 09:06:31 +0100 + +totem (2.29.91-1) experimental; urgency=low + + * New upstream development release: + + debian/patches/90_autotools.patch: + - Refreshed for the new version. + + debian/control.in: + - Update build dependencies and dependencies. + * debian/patches/99_gst-bus_flush.patch: + + Patch from upstream GIT to fix automatic codec installation + and random errors showing up from previous tracks. + * debian/control.in: + + Add ATK build dependency to allow buildds to actually install + the correct version instead of producing an error. + + -- Sebastian Dröge Thu, 25 Feb 2010 19:11:33 +0100 + +totem (2.29.4-1) experimental; urgency=low + + * New upstream development release: + + debian/patches/90_autotools.patch: + - Refreshed for the new version. + + debian/control.in: + - Update build dependencies and dependencies. + - Drop tracker plugin, it needs tracker 0.7. + + debian/totem-mozilla.links: + - Drop the complex plugin, it doesn't exist anymore. + + -- Sebastian Dröge Wed, 27 Jan 2010 09:40:18 +0100 + +totem (2.28.5-2) unstable; urgency=low + + [ Josselin Mouette ] + * totem-mozilla.links: removed. We don’t need iceweasel-specific + links, it is able to use the files in /usr/lib/mozilla/plugins. + Closes: #569891. + * Require totem-common = ${source:Version}. Closes: #571164. + + [ Emilio Pozuelo Monfort ] + * debian/patches/02_python2.6.patch: + - Backport change from GIT to fix FTBFS with Python 2.6 as the + default interpreter. Closes: #571517. + * debian/patches/90_autotools.patch: + - Updated. + * debian/control.in: + - Standards-Version is 3.8.4, no changes needed. + + -- Emilio Pozuelo Monfort Thu, 04 Mar 2010 10:06:44 +0100 + +totem (2.28.5-1) unstable; urgency=low + + * New upstream bugfix release. + - debian/patches/90_autotools.patch, + debian/patches/70_bbc_plugin.patch: + + Refreshed for the new version. + * debian/control.in: + - Don't build depend on libbluetooth-dev on Hurd. + * debian/watch: + - Only track stable releases. + + -- Emilio Pozuelo Monfort Wed, 23 Dec 2009 00:35:07 +0100 + +totem (2.28.4-1) unstable; urgency=low + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/90_autotools.patch: + - Regenerated. + + [ Josselin Mouette ] + * Let the transitional totem-xine package depend on gst-plugins-bad + and -ugly. Closes: #559558. + + -- Sebastian Dröge Tue, 08 Dec 2009 15:50:19 +0100 + +totem (2.28.3-1) unstable; urgency=low + + [ Josselin Mouette ] + * Split the UPnP plugin in a separate totem-coherence package. + Closes: #553058. + + [ Emilio Pozuelo Monfort ] + * debian/control.in: + - Build depend on xulrunner-dev rather than on iceape-dev. + Closes: #555914. + - Let totem-coherence depend on ${misc:Depends}. + + [ Josselin Mouette ] + * Call dh_pysupport and add ${python:Depends} for totem-coherence. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/02_use_gconf_audio_sink.patch, + debian/patches/80_fix_youtube_regex.patch: + - Dropped, merged upstream. + + debian/patches/90_autotools.patch: + - Regenerated. + + -- Sebastian Dröge Sat, 14 Nov 2009 10:12:07 +0100 + +totem (2.28.2-3) unstable; urgency=low + + [ Josselin Mouette ] + * totem-plugins depends on python-coherence. Closes: #553058. + * The section for totem-mozilla is video too. + + [ Sjoerd Simons ] + * debian/patches/80_fix_youtube_regex.patch: + + Added. Update the regexp for parsing parameters from youtube (from + upstream git) + + -- Sjoerd Simons Sat, 07 Nov 2009 15:45:32 +0000 + +totem (2.28.2-2) unstable; urgency=low + + * debian/patches/02_use_gconf_audio_sink.patch, + debian/control.in: + + Updated from upstream Bugzilla, this patch together with + gst-plugins-base 0.10.25-5 and gst-plugins-good 0.10.16-5 + this fixes all volume related issues with totem and pulseaudio. + + -- Sebastian Dröge Fri, 30 Oct 2009 10:47:49 +0100 + +totem (2.28.2-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/control.in: + - Update build dependencies. + + debian/patches/90_autotools.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Mon, 26 Oct 2009 13:19:20 +0100 + +totem (2.28.1-2) unstable; urgency=low + + [ Emilio Pozuelo Monfort ] + * debian/patches/02_use_gconf_audio_sink.patch: + - Don't try to use PulseAudio inconditionally, use the user defined + one from GConf instead. Closes: #548260. + + [ Josselin Mouette ] + * Add missing shlibs:Depends in totem-mozilla. + + -- Josselin Mouette Sat, 24 Oct 2009 12:29:50 +0200 + +totem (2.28.1-1) unstable; urgency=low + + * debian/control.in: + + Clean up inter-package dependencies and remove a completely + useless circular dependency (Closes: #548891). There's no reason + why totem should depend on totem-plugins and the other way around. + * debian/totem.install, + debian/totem-common.install, + debian/control.in: + + Move the desktop file into the same package as the binaries. + * New upstream bugfix release: + + debian/patches/90_autotools.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Tue, 29 Sep 2009 17:16:16 +0200 + +totem (2.28.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastian Dröge Wed, 23 Sep 2009 11:01:01 +0200 + +totem (2.28.0-1) experimental; urgency=low + + * New upstream release: + + debian/patches/90_autotools.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Mon, 21 Sep 2009 16:53:12 +0200 + +totem (2.27.92-1) experimental; urgency=low + + [ Josselin Mouette ] + * totem-plugins depends on python-gconf. Closes: #541352. + * and on python-gobject 2.18. Closes: #528459. + * Remove gmyth plugin. Closes: #542127. + * Drop useless build-dependency on libxml-parser-perl. + * Add missing dependencies for the iplayer plugin. Closes: #530438. + + [ Sebastian Dröge ] + * New upstream development release: + + debian/control.in: + - Update build dependencies. + + debian/patches/03_disable_debug.patch: + - Dropped, fixed upstream. + + debian/patches/90_autotools.patch: + - Regenerated for the new version. + * debian/control.in: + + Update Standards-Version to 3.8.3. + + -- Sebastian Dröge Wed, 09 Sep 2009 07:52:42 +0200 + +totem (2.27.2-3) experimental; urgency=low + + * debiam/totem-mozilla.links: + + Make the links originate from the correct location and update the list + for the current set of plugins. + + -- Sjoerd Simons Sun, 09 Aug 2009 00:00:00 +0100 + +totem (2.27.2-2) experimental; urgency=low + + * debian/control.in: + + Build depend on libgdata-dev (>= 0.4.0) for the youtube plugin. + + -- Sebastian Dröge Sat, 08 Aug 2009 21:16:15 +0200 + +totem (2.27.2-1) experimental; urgency=low + + [ Emilio Pozuelo Monfort ] + * Move totem to the video section, and totem-dbg to debug. + + [ Josselin Mouette ] + * Only suggest gnome-codec-install, it is way too obnoxious with some + packages like rhythmbox. + + [ Sebastian Dröge ] + * New upstream development release: + + debian/control.in: + - Update GStreamer build dependencies. + + debian/patches/90_autotools.patch: + - Updated for the new version. + * debian/control.in: + + Update Standards-Version to 3.8.2. + + -- Sebastian Dröge Fri, 24 Jul 2009 08:13:11 +0200 + +totem (2.27.1-2) experimental; urgency=low + + [ Sebastian Dröge ] + * Some minor changes from the Ubuntu package: + + debian/totem.menu: + - Let the title start with an uppercase T. + + debian/control.in: + - Remove some unneeded build dependencies and update description + to clarify that totem uses GIO nowadays. + + [ Josselin Mouette ] + * Remove gstreamer0.10-gnomevfs from the dependencies and bump + requirement on -good to a version with a working soup plugin. + Closes: #530663. + + [ Sebastian Dröge ] + * debian/patches/20_use_alternatives.patch: + + Dropped, there are no alternatives anymore. + * debian/totem.{pre,post}inst: + + Remove alternatives in preinst, otherwise the totem binary will + be removed (Closes: #531704). Thanks to Martin Pitt for the fix. + + -- Sebastian Dröge Thu, 04 Jun 2009 20:15:57 +0200 + +totem (2.27.1-1) experimental; urgency=low + + * New upstream development release: + + This release drops the Xine backend, this allows a much simplified + packaging. + + The YouTube plugin is not built at the moment until we have a + libgdata package, which is required for the plugin now. + + debian/patches/60_build_libbaconvideowidget_statically.patch: + - Dropped, merged upstream. + + debian/patches/70_bbc_plugin.patch, + debian/patches/90_autotools.patch: + - Updated for the new version. + + debian/control.in, + debian/rules, + debian/*: + - Drop the xine flavor and merge totem-gstreamer into + the totem package. + - Remove alternatives on upgrades. + - Convert packaging to cdbs. + + -- Sebastian Dröge Mon, 18 May 2009 19:40:39 +0200 + +totem (2.26.2-1) UNRELEASED; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Mon, 18 May 2009 17:41:11 +0200 + +totem (2.26.1-1) experimental; urgency=low + + [ Josselin Mouette ] + * totem-plugins depends on python-gdbm. Closes: #523582. + + [ Sjoerd Simons ] + * New upstream release (2.26.1) + * 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 + * debian/patches/90_autotools.patch: Updated + + [ Emilio Pozuelo Monfort ] + * Recommend gnome-codec-install rather than gnome-app-install. + Closes: #523052. + + -- Sjoerd Simons Sun, 19 Apr 2009 17:28:51 +0100 + +totem (2.24.3-3) unstable; urgency=low + + * totem-mozilla.docs: ship README.browser-plugin which explains how to + disable the plugin for some MIME types. + * rules: remove the hack that only let totem-xine support VCDs and + DVDs, now that GStreamer supports them. Closes: #370789. + * 01_fake_keypresses.patch: new patch. Completely disable the broken + XTEST code that generates fake keypresses. Closes: #500330. + * 90_autotools.patch: regenerated. + * Build-depend on nautilus 2.22 to be sure to build the extension for + the correct version. + * totem-xine depends on libxine1-x. + * Standards version is 3.8.1. + * Upload to unstable. + * 04_tracker_build.patch: new patch, stolen upstream. Fix build with + latest tracker version. + + -- Josselin Mouette Tue, 07 Apr 2009 15:21:00 +0200 + +totem (2.24.3-2) experimental; urgency=low + + * Let totem-plugins depends on python-gtk2 instead of python-gtk2-dev. + + -- Sjoerd Simons Sun, 21 Dec 2008 15:57:12 +0000 + +totem (2.24.3-1) experimental; urgency=low + + [ Sam Morris ] + * New upstream release. + * 01_gecko_iceape.patch, 07_autoconf.patch: removed, no longer necessary. + Also remove --with-gecko=iceape from configure arguments. + * 02_flv.patch: refreshed. + * 30_fix_youtube_plugin.patch: merged upstream. + * 60_build_libbaconvideowidget_statically.patch: taken from Ubuntu, from + . Building + libbaconvideowidget statically means that totem-gstreamer and totem-xine can be + co-installable. + * 70_autoconf.patch: disabled, no need for it. + * 90_automake.patch: generated by running 'automake' after applying + 60_build_libbaconvideowidget_statically.patch. + * Drop GnomeVFS dependency. + * Add versioned build-dependency on intltool 0.4. + * Reduce GLib dependency to 2.13. + * Depend on x11proto-core-dev for multimedia keys. + * Depend on libgmythupnp-dev and bump gmyth dependency to 0.7.1. + * Increase GTK+ dependency to 2.13. + * Increase totem-plparser dependency to 2.23.91. + * The browser plugin no longer uses xpt files; remove + totem-mozilla.links and the code in debian/rules that handles them. + * Explicitly enable the complex browser plugin, as it is disabled by + default. + + [ Josselin Mouette ] + * 03_disable_debug.patch: new patch. Drop debugging output in the + browser plugin. Closes: #507491. + + [ Sjoerd Simons ] + * debian/patches/70_bbc_plugin.patch: + - Added. Add BBC content viewer plugin + * debian/patches/90_autotools.patch: + - Added. rerun autogen after adding the bbc plugin + * debian/patches/90_automake.patch: + - Removed. Deprecated by debian/patches/90_autotools.patch + * debian/patches/series: updated + + -- Sjoerd Simons Sun, 07 Dec 2008 16:28:18 +0000 + +totem (2.22.2-5) unstable; urgency=low + + * Don’t build-depend on libbluetooth-dev on kfreebsd. Closes: #499384. + * Remove the conditional build-dep on hal, which now builds on the + said systems. + * 30_fix_youtube_plugin.patch: update youtube plugin to the version in + GNOME 2.24 to match the changes on the server side, excluding + changes in the C code. Closes: #503363. + + -- Josselin Mouette Sat, 25 Oct 2008 12:55:59 +0200 + +totem (2.22.2-4) unstable; urgency=low + + [ Josselin Mouette ] + * Change the recommends on g-c-c to one on g-s-d. Also move it to + totem-plugins, which is the package providing the media keys + functionality. + * Change the depends on dbus to dbus-x11. + + [ Loic Minier ] + * Let totem-gstreamer recommend gnome-app-install for easy codec + installation. + + [ Josselin Mouette ] + * 02_flv.patch: the canonical MIME type for Flash videos is + video/x-flv, not video/flv. Closes: #486468. + + [ Sjoerd Simons ] + * 30_fix_youtube_plugin.patch: Set the server as a keyword argument to be + compatible with both old and new versions of python-gdata. Fixes searching + for youtube videos + * debian/control.in: Fix double Recommend field for totem-gstreamer + + [ Josselin Mouette ] + * rules: rally disable the vala plugin. + + -- Josselin Mouette Wed, 10 Sep 2008 15:38:34 +0200 + +totem (2.22.2-3) unstable; urgency=low + + * debian/control.in, + debian/rules: + + Disable vala support for now. It only builds a sample plugin anyway + and thus is rather useless. Fixes FTBFS with newer valac. + + -- Sebastian Dröge Thu, 22 May 2008 10:01:33 +0200 + +totem (2.22.2-2) unstable; urgency=low + + [ Sam Morris ] + * Only totem-xine can satisfactorily play DVDs and VCds (it can do + de-interlacing and menus), so update its .desktop files to reflect this. + This only affects nautilus 2.22, which has taken over the job of launching + progrems when media are inserted in GNOME 2.22. + + [ Josselin Mouette ] + * Build-depend on iceape-dev 1.1.9-5. + * Use the iceape gecko variant. This way it should work with both + gecko 1.8 and 1.9. Closes: #479344, #480809. + * 01_gecko_iceape.patch: support iceape as a valid gecko variant. + * 70_autoconf.patch: re-run autoconf on top of that. + * Require debhelper 5.0.51 for dh_icons. + * Build-depend on python-support; call dh_pysupport; depend on + ${python:Depends}. Adds correct dependencies for the python scripts + in totem-{gstreamer,xine} and the module in totem-plugins. + + -- Josselin Mouette Mon, 12 May 2008 15:04:36 +0200 + +totem (2.22.2-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Thu, 24 Apr 2008 12:10:38 +0200 + +totem (2.22.1-1) unstable; urgency=low + + * New upstream release. + * Add an update-alternative slave for audio-preview per flavor; LP: #199701; + see also Debian #472370. + + -- Loic Minier Mon, 24 Mar 2008 20:22:26 +0100 + +totem (2.22.0-2) unstable; urgency=high + + [ Emilio Pozuelo Monfort ] + * debian/control: + - Remove duplicated libepc-ui-dev build dependency. + + [ Loic Minier ] + * Merge below changes by Steve Langasek again; these were not applied to the + experimental branch; doh! + + [ Steve Langasek ] + * Auto-generate totem-{xine,gstreamer}.postinst from new + debian/totem-flavor.postinst.in in the install target + * Substitute the pkg-config variable into the generated postinst also, + so that the update-alternatives slave for the nautilus extension is + kept in sync with the ABI. + + -- Emilio Pozuelo Monfort Sun, 23 Mar 2008 20:20:36 +0100 + +totem (2.22.0-1) unstable; urgency=low + + [ Sam Morris ] + * New upstream development release. + - Build-depend on libepc-ui-dev 0.3 for publish plugin. + - Build-depend on libglib2.0-dev 2.15. + - Build-depend on libgnome-keyring-dev. + - Build-depend on libstartup-notification0-dev 0.8 for web browser plugin. + - Build-depend on libtrackerclient-dev for tracker plugin. + - Build-depend on python-gtk2-dev 2.12. + - Build-depend on valac, libvala-dev 0.1.16. + - Build-depend on libgtk2.0-dev 2.12.6. + - Drop build-dependency on libgnome-desktop-dev. + - Drop build-dependency on libgnome-settings-daemon-dev. + * totem-pl-parser library was split into a separate source package. + - Build-depend on libtotem-plparser-dev 2.21.90. + - Drop libtotem-parser7 and libtotem-plparser-dev packages. + - Drop 30_kfreebsd_gnu.patch. + * Drop 25_revert-xine-reqs-bump.patch: a new enough xine is new present in + unstable. Also drop 70_autoconf.patch as we no longer patch configure.in. + * Update totem-plugins description with entries for new plugins. + * Include check-dist.mk in rules file to prevent accidental uploads to + unstable. + + [ Emilio Pozuelo Monfort ] + * Fix Homepage field in debian/control. Thanks to Amaya Rodrigo. + Closes: #464354. + * Build-depend on libepc-ui-dev to build the Publisher plugin. + + [ Josselin Mouette ] + * Fix capitalization of GNOME and GStreamer. + + [ Sebastian Dröge ] + * debian/rules: + + Call dh_icons and dh_shlibdeps. + + Don't ship *.py[co], taken from the Ubuntu package. + + Don't hardcode nautilus-extension directory, taken from the + Ubuntu package. + + Upload to unstable, drop check-dist include. + * debian/control.in: + + Update build dependencies. + + Build depend on libgmyth-dev. + + -- Sebastian Dröge Thu, 13 Mar 2008 15:08:06 +0100 + +totem (2.20.3-1) unstable; urgency=low + + [ Loic Minier ] + * Let totem-common and totem-plugins replace totem-xine and -gstreamer. + + [ Josselin Mouette ] + * Fix totem-dbg's section, see #457534. + * totem-xine recommends libxine1-gnome. + + [ Sebastien Bacher ] + * use change from launchpad bug #177459 to fix bashim in the debian rules + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/70_autoconf.patch: + - Regenerated for the new version. + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + + Use Homepage field. + + -- Sebastian Dröge Mon, 07 Jan 2008 21:49:41 +0100 + +totem (2.20.1-1) unstable; urgency=low + + [ Loic Minier ] + * Cleanup whitespace. + + [ Josselin Mouette ] + * totem depends on totem-plugins. Closes: #445675. + * Conflict against totem-mozilla (<< 2.20.0-3). Closes: #448554. + * debian/bug/control: ship a bug control file in totem to correctly + report dependencies of totem-{gstreamer,xine}. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/control: + - Build depend on Gtk >= 2.12.1 as per configure.in. + + debian/patches/60_gnome-doc-utils.patch: + - Dropped, upstream uses new enough gnome-doc-utils now. + + debian/patches/70_autoconf.patch: + - Regenerated for the new version. + + -- Josselin Mouette Sun, 25 Nov 2007 13:15:19 +0100 + +totem (2.20.0-3) unstable; urgency=low + + * Complete rework of debian/rules. + * Split data files in totem-common. + * Make totem-xine and totem-gstreamer installable together. + Closes: #402549. + * Move debugging symbols to totem-dbg. + * Move plugins to totem-plugins. + * Switch to quilt. + * Refresh patches. + * Fix menu files and ship them in both packages. + * 60_gnome-doc-utils.patch: regenerate help/Makefile.in with a newer + gnome-doc-utils.make that supports out-of-tree builds. + * Build-depend on libbluetooth-dev and libgalago-dev for the + corresponding plugins. + * Remove symbolic links in the firefox directory. + * Improve long package descriptions. + + -- Josselin Mouette Wed, 26 Sep 2007 22:36:06 +0200 + +totem (2.20.0-2) unstable; urgency=low + + [ Sebastian Dröge ] + * Upload to unstable. + * debian/control.in: + + Remove duplicated liblircclient-dev build dependency. + + [ Josselin Mouette ] + * libtotem-plparser7-dbg conflicts with libtotem-plparser1-dbg. + + -- Josselin Mouette Wed, 26 Sep 2007 00:41:46 +0200 + +totem (2.20.0-1) experimental; urgency=low + + * New upstream stable release: + + debian/control.in: + - Bump required versions of Gtk, GLib, GnomeVFS, GStreamer, + shared-mime-info. + - Build depend on vala. + - Build depend on python-gobject-dev and python-gtk2-dev. + - Build depend on libgnome-settings-daemon-dev. + - Build depend on liblircclient-dev. + - Bump soname of libtotem-plparser. + + debian/rules: + - Enable the vala bindings support. + + -- Sebastian Dröge Mon, 17 Sep 2007 07:12:48 +0200 + +totem (2.18.2-2) unstable; urgency=high + + * Depend on iso-codes; thanks Jan Alonzo. + * Recommend libxine1-ffmpeg; closes: #433166. + + -- Loic Minier Sun, 22 Jul 2007 15:06:24 +0200 + +totem (2.18.2-1) unstable; urgency=low + + [ Loic Minier ] + * Honor CFLAGS we set in rules, doh! + + [ Sven Arvidsson ] + * New patch, lirc_freeconfig, from upstream SVN, fix freeze on close + with lirc; thanks Philip Withnall (GNOME bug #427681); + (Closes: #418020) + + [ Loic Minier ] + * Excluse /usr/lib/totem/ and /usr/lib/nautilus/extensions- for + dh_makeshlibs as there are plugins in these dirs. + * Upload to unstable; drop check-dist include. + * New upstream stable release. + - New patch, 25_revert-xine-reqs, reverts the bump in Xine requirements + which was only added to pull a Xine bugfix. + - New patch, 70_autoconf, run autoconf. + - Drop patch 40_lirc_freeconfig, merged upstream. + * Wrap build-deps and deps. + * Fix some ${binary:Version} uses in Arch: all packages. + * Sprinkle some ${misc:Depends}. + * Bump up Debhelper compatibility level to 5. + + -- Loic Minier Fri, 01 Jun 2007 15:36:12 +0200 + +totem (2.18.1-1) experimental; urgency=low + + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * New upstreeam release; no API change. + + -- Loic Minier Wed, 04 Apr 2007 17:26:55 +0200 + +totem (2.18.0-1) experimental; urgency=low + + * New upstream major stable release; with API additions. + - Pass --enable-xine to the Xine configure and drop the --enable-gstreamer + from the gstreamer configure. + - Prefer totem-gstreamer over totem-xine in the dependencies of totem. + - Bump up shlibs to >= 2.17.5. + - Configure with --disable-run-in-source-tree; change --enable-mozilla + --with-browser-plugins=xulrunner into --with-gecko=xulrunner. + - Bump up build-deps and existing deps to libglib2.0-dev >= 2.12.0, + libgtk2.0-dev >= 2.10.0, libgnomevfs2-dev >= 2.9.92, gnome-icon-theme >= + 2.15.90, libdbus-glib-1-dev >= 0.61, dbus >= 0.61, libxine-dev >= 1.1.4, + libgstreamer0.10-dev >= 0.10.6, libgstreamer-plugins-base0.10-dev >= + 0.10.7. + - Add a build-dep on libgnome2-dev >= 2.14.0. + - Add deps on gnome-icon-theme >= 2.15.90. + - Build-depend on gnome-doc-utils. + * Configure with --disable-scrollkeeper. + * Drop INSTALL_PROGRAM, dh_strip handles this. + * Cleanups. + * Let totem-gstreamer recommend gnome-control-center >= 2.15.90 for + gnome-sound-properties; conflict with gnome-control-center << 2.15.90 as + the bundled gnome-sound-properties is not aware of GStreamer profiles. + * Add a totem-gstreamer.README.Debian to document setting the output sink. + * Build-depend on librsvg2-dev and librsvg2-common >= 2.16.0-2 to make the + package autobuildable. + + -- Loic Minier Fri, 23 Mar 2007 11:53:24 +0100 + +totem (2.16.6-1) unstable; urgency=medium + + * New upstream stable release; bug fixes and translations. + - Drop patch 30_dlopen_noremove_dbus_glib, merged upstream. + + -- Loic Minier Mon, 19 Mar 2007 15:33:08 +0100 + +totem (2.16.5-3) unstable; urgency=medium + + [ Sebastien Bacher ] + * debian/patches/30_dlopen_noremove_dbus_glib.dpatch: + - fix "crash because NPPVpluginKeepLibraryInMemory is broken in gecko", + patch from Alexander Sack (GNOME bug #415389) + + [ Loic Minier ] + * Urgency medium. + + -- Loic Minier Thu, 8 Mar 2007 14:51:55 +0100 + +totem (2.16.5-2) unstable; urgency=low + + * Upload to unstable; drop dist-check. + + -- Loic Minier Sat, 3 Feb 2007 14:58:22 +0100 + +totem (2.16.5-1) experimental; urgency=low + + * New upstream stable release; bug fixes and translation updates; no API or + ABI change. + + -- Loic Minier Mon, 29 Jan 2007 17:55:00 +0100 + +totem (2.16.4-3) UNRELEASED; urgency=low + + [ Sven Arvidsson ] + * Add upstream ChangeLog, NEWS and README. (Closes: #404362) + * Remove unnecessary upstream TODO. + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + + -- Loic Minier Sat, 13 Jan 2007 22:51:13 +0100 + +totem (2.16.4-2) unstable; urgency=low + + * Build-depend on libxtst-dev, thanks Sven Arvidsson + (closes: #315926). + + -- Josselin Mouette Thu, 30 Nov 2006 14:16:44 +0100 + +totem (2.16.4-1) unstable; urgency=low + + * New upstream stable release; no API change; fixes for session saving (now + correctly restored, closes: #399983, and with support for the width of the + sidebar), some translation cleanups. + + -- Loic Minier Wed, 29 Nov 2006 21:41:02 +0100 + +totem (2.16.3-3) unstable; urgency=high + + * Add symlinks in the iceweasel plugins directory; symlinks for the firefox + plugins dir are still installed for compatibility with local firefox debs + and backwards-compatibility. + * Update description to mention Iceweasel instead of Firefox. + + -- Loic Minier Tue, 21 Nov 2006 17:31:59 +0100 + +totem (2.16.3-2) unstable; urgency=low + + * Do not build-depend on libhal-dev for kfreebsd-i386 and kfreebsd-amd64; + build-depend on libcam-dev instead; thanks Petr Salinger; closes: #399091. + * Drop useless libnautilus-burn-dev build-dep; thanks Bastien Nocera. + + -- Loic Minier Sat, 18 Nov 2006 10:03:47 +0100 + +totem (2.16.3-1) unstable; urgency=low + + * New upstream release; no API change. + + -- Loic Minier Tue, 14 Nov 2006 17:38:27 +0100 + +totem (2.16.2-4) unstable; urgency=low + + * GNU/kFreeBSD support thanks Aurelien Jarno; closes: #391307. + - New dpatch, 30_kfreebsd_gnu, to use sys/cdio.h and sys/disklabel.h under + FreeBSD and mntent.h under Linux. + * Update 30_kfreebsd_gnu dpatch for totem 2.16.2. + + -- Loic Minier Mon, 6 Nov 2006 18:24:35 +0100 + +totem (2.16.2-3) unstable; urgency=low + + * Fix copyright to mention the LGPL for the Totem Playlist parser library, + "plparser", and the excemption for proprietary GStreamer plugins; thanks + Thadeu Lima de Souza Cascardo; closes: #396549. + + -- Loic Minier Wed, 1 Nov 2006 15:43:30 +0100 + +totem (2.16.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Loic Minier Thu, 19 Oct 2006 11:57:54 +0200 + +totem (2.16.2-1) experimental; urgency=low + + * New upstream release; no API change. + + -- Loic Minier Mon, 2 Oct 2006 15:52:01 +0200 + +totem (2.16.1-1) experimental; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + * debian/watch: updated. + + [ Loic Minier ] + * Add debian/test.html, sample javascript integration of the gecko plugin. + * Re-add Firefox symlinks as these are required after all. + * New upstream release; with API additions. + - Bump libtotem-plaparser1 shlibs to >= 2.16.1. + - Install new plugin flavor, MullY. + + -- Loic Minier Fri, 8 Sep 2006 09:14:19 +0200 + +totem (1.5.92-1) experimental; urgency=low + + * Fix changelog of 1.5.91-1; hal 0.6 is not released yet, but upstream has a + safety check just in case it would break API/ABI. + * New upstream development release. + - Drop 10_dont-clean-totem-schemas-in dpatch, merged upstream. + + -- Loic Minier Fri, 25 Aug 2006 22:04:46 +0200 + +totem (1.5.91-2) experimental; urgency=low + + * Bump shlibs to libtotem-plparser1 >= 1.5.1. + * Pass "-L libtotem-plparser1" and "-l debian/libtotem-plparser1/usr/lib" + to dh_shlibdeps for the other packages to see the lib and use the shlibs. + + -- Loic Minier Sun, 13 Aug 2006 15:19:01 +0200 + +totem (1.5.91-1) experimental; urgency=low + + * New upstream development releases; with API additions. + - Target at experimental. + - Bump up libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev + build-deps to >= 0.10.1. + - Bump up libglib2.0-dev build-dep to >= 2.8.0. + - Bump up libxine-dev build-dep to >= 1.1.2. + - Add a build-dep on libgconf2-dev. + - Rename --with-mozilla configure flag to --with-browser-plugins. + - Add a build-dep on shared-mime-info (>= 0.17). + - Add a build-dep on libhal-dev (>= 0.5). + - Drop 09_maintainer-mode dpatch as upstream now calls + GNOME_MAINTAINER_MODE_DEFINES which requires AM_MAINTAINER_MODE. + - Drop 60_mandatory-relibtoolizing dpatch which isn't required anymore. + - Update symlinks and installation steps for the split in 4 distinct + plugins. + - New dpatch, 10_dont-clean-totem-schemas-in, to workaround an upstream + bug preventing two successive builds. + - Fixes playing of streams with mms:// URL lists. (Closes: #382603) + * Ship the *.xpt files as recommended by upstream. + * Only symlink the plugin in /usr/lib/mozilla as Firefox and XULRunner are + expected to look there too. + + -- Loic Minier Sun, 13 Aug 2006 14:28:00 +0200 + +totem (1.4.5-1) unstable; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Tue, 12 Sep 2006 10:41:57 +0200 + +totem (1.4.4-1) unstable; urgency=low + + [ Josselin Mouette ] + * Make the package binNMU-able by making the arch-all packages depend + only on >= ${Source-Version} arch-any packages. + * Make totem-mozilla depend on dbus. + + [ Loic Minier ] + * Use ${source:Version} and ${binary:Version} because of the totem-mozilla + Recommend; build-depend on dpkg-dev >= 1.13.19. + * Let totem-xine also Recommend totem-mozilla. + * New upstream release. + - Drop the 11_configure-drop-mozilla-link-flags dpatch, merged upstream. + - Update 60_mandatory-relibtoolizing dpatch. + - Fix the moves of the mozilla plugin since upstream now installs in + /usr/lib/mozilla/plugins, whatever the gecko engine. + + -- Loic Minier Tue, 8 Aug 2006 14:13:44 +0200 + +totem (1.4.3-1) unstable; urgency=low + + * Fix bashishm in mv "foo.{x,y}" snippet executed by $SHELL, thanks Julien + Danjou. (Closes: #377367) + * Drop 10_configure-force-xulrunner dpatch as --with-mozilla=xulrunner is + enough to select the appropriate Gecko. + * New upstream release. + - Update 60_mandatory-relibtoolizing dpatch. + + -- Loic Minier Thu, 13 Jul 2006 13:42:08 +0200 + +totem (1.4.2-1) experimental; urgency=low + + * Upload to experimental for now as the package is frozen in unstable due to + a big transition, but some users requested the fixed package. + * Set libtotem-plparser1-dbg Priority to extra. + [debian/control, debian/control.in] + * New dpatch, 09_maintainer-mode, to use AM_MAINTAINER_MODE for safety. + * Update 60_mandatory-relibtoolizing dpatch to also intltoolize as this is + required with intltool 0.35. (Closes: #372529) + * Bump up Standards-Version to 3.7.2. + * New upstream release. + - Lower libgnomevfs2-dev build-dep to >= 2.8.2 + - Bump up gstreamer0.10-plugins-base build-dep to >= 0.10.7. + - Drop 30_totem-mozilla-types dpatch, merged upstream. + - Update 60_mandatory-relibtoolizing dpatch. + * Build-depend on autotools-dev for the config.guess / config.sub update + snippet to work. + + -- Loic Minier Sat, 8 Jul 2006 21:34:16 +0200 + +totem (1.4.1-2) unstable; urgency=low + + * debian/patches/30_totem-mozilla-types.dpatch + - Added. Correct the Bool types used by the totem-mozilla plugin. Fixes the + mozilla plugin on big-endian architectures. + + -- Sjoerd Simons Sun, 4 Jun 2006 22:16:38 +0200 + +totem (1.4.1-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + * debian/patches: + - 00list: updated. + - 06_volume_icons_change.dpatch, 07_no_mms_to_mmsh_change.dpatch, + 08_aspect_ratio_fix.dpatch, + 09_play_protocol_not_listed_by_firefox.dpatch: removed, applied upstream. + + [ Loic Minier ] + * Update the mandatory relibtoolizing patch... + [debian/patches/60_mandatory-relibtoolizing.dpatch] + * Move common configure flags to COMMON_CONFIGURE_FLAGS and add + --disable-maintainer-mode to them. + [debian/rules] + * Recommend totem-mozilla and not totem-gstreamer-xul-plugin. + [debian/control, debian/control.in] + * Promote gstreamer0.10-plugins-ugly and gstreamer0.10-ffmpeg from Suggests + to Recommends. + [debian/control, debian/control.in] + * Remove what looks useless and now bogus deps on xlibs. (Closes: #370089) + [debian/control, debian/control.in] + + -- Loic Minier Thu, 25 May 2006 21:09:34 +0200 + +totem (1.4.0-1) unstable; urgency=low + + [ Gustavo Franco ] + * New upstream release. + * debian/control: + - intltool added in build-depends field + - libnautilus-burn-dev build-depends downgraded + - libtotem-plparser1 added, dropping libtotem-plparser0 (due to + SONAME change) + - gstreamer0.8 related dependencies bumped up to gstreamer0.10 + - Uploaders field sync with gnome-pkg-tools + - Standards-Version bumped up to 3.7.0 + * debian/rules: + - minor changes to fix the build (e.g: libtotem-plparser1 bits) + - fix '*.la' removal from all the binaries + - config.{guess,sub} unneeded copy removed from clean target + * debian/patches/01_totem_playlist_add_fix.dpatch dropped (merged upstream) + * debian/patches/08_firefox-plugin-fix.dpatch dropped (merged upstream) + * Patches merged from Ubuntu: + * debian/patches/06_volume_icons_change.dpatch: + - patch from CVS, don't use the mute icon for non muted volume + * debian/patches/07_no_mms_to_mmsh_change.dpatch: + - patch from CVS, to automatically change mms to mmsh + * debian/patches/08_aspect_ratio_fix.dpatch: + - patch from upstream CVS, work by j^ , fix the aspect + ratio setting usage + * debian/patches/09_play_protocol_not_listed_by_firefox.dpatch: + - patch from upstream, work by Gary Coady , fix the + playing of protocols not listed by firefox + + [ Gustavo Noronha Silva ] + * debian/patches/01_totem_playlist_add_fix.dpatch: + - patch by Thadeu Lima de Souza Cascardo + to fix crash on playlist add (Closes: #349357) + * debian/control.in, debian/rules: + - add xulrunner plugins for totem as new packages (Closes: #321400) + - added libxul-dev, and xulrunner (for xpidl) to Build-Deps + + [ Loic Minier ] + * Trash all *.a and *.la files not only from debian/totem-gstreamer/usr/lib, + but from debian/totem-gstreamer and debian/totem-xine altogether, except + for debian/totem-xine/usr/lib/*.a. + [debian/rules] + * Remove the now useless rm calls on "*a" files. + [debian/rules] + * Remove config.guess and config.sub updating patch as cdbs takes care of + this and hence fix clean target. + [debian/rules] + * Bump libgnomevfs2-dev build-dep to >= 2.9.92 per configure.ac. + [debian/control, debian/control.in] + * Fix config.sub / config.guess copying over, even if it's useless. + [debian/rules] + * Drop useless dh_installdirs calls. + [debian/rules] + * Remove *-xul packages in favor of a new totem-mozilla package, arch: all. + [debian/control, debian/control.in] + * Permit "| www-browser" in totem-mozilla's Recommends too. + [debian/control, debian/control.in] + * Add symlinks in /usr/lib/{firefox,mozilla,xulrunner}/plugins to + the mozilla plugin below /usr/lib/totem. + [debian/totem-mozilla.links] + * Install the mozilla plugin in /usr/lib/totem in totem-xine and + totem-gstreamer, drop anything else from /usr/lib/xulrunner. + [debian/rules] + * Add new patch to force usage of xulrunner, even if mozilla, firefox, or + seamonkey are available; WARNING: requires relibtoolizing. + [debian/patches/00list, + debian/patches/10_configure-force-xulrunner.dpatch] + * Add new patch to stop linling against mozilla libs (-lxpcom -lplds4 -lplc4 + -lnspr4) by splitting the PKG_CHECK_MODULES calls in configure.in; + WARNING: requires relibtoolizing. + [debian/patches/00list, + debian/patches/11_configure-drop-mozilla-link-flags.dpatch] + * Relibtoolize, as required by the preceding patches. + [debian/patches/00list, debian/patches/60_mandatory-relibtoolizing.dpatch] + * Use similar definitions as CDBS for DEB_MAKE_INVOKE and DEB_MAKE_ENVVARS + and use $(DEB_MAKE_INVOKE) instead of $(MAKE) to call make, fixes warnings + on schema installation. + [debian/rules] + + -- Loic Minier Sat, 6 May 2006 18:38:39 +0200 + +totem (1.2.1-4) unstable; urgency=low + + * Simple rebuild to get rid of references to Xcursor.la, and Xrender.la. + + -- Loic Minier Tue, 2 May 2006 16:09:22 +0200 + +totem (1.2.1-3) unstable; urgency=low + + * debian/patches/08_firefox-plugin-fix.dpatch: + - upstream patch to fix the firefox plugin crasher + + -- Sebastien Bacher Fri, 13 Jan 2006 00:12:49 +0100 + +totem (1.2.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Gustavo Noronha Silva Mon, 9 Jan 2006 22:58:02 -0200 + +totem (1.2.1-1) experimental; urgency=low + + [ Loic Minier ] + * Update watch file. [debian/watch] + + [ Sjoerd Simons ] + * New upstream release + * Recommend gstreamer-theora and ffmpeg. + * Depend on llibmusicbrainz4-dev >= 2.1.1-4.1 to get the C++ transitioned + version. + * Build-Depend on libdbus-glib-1-dev so totem can disable gnome-screensaver + via dbus. + + -- Sjoerd Simons Tue, 20 Dec 2005 12:09:07 +0100 + +totem (1.2.0-1) experimental; urgency=low + + * New upstream release. + * Version the libmusicbrainz4-dev build-dep to >= 2.1.1-3.1 to get a + C++ transitionned version. [debian/control, debian/control.in] + * Drop hardcoded libtotem-plparser0 depends in totem-xine and + totem-gstreamer. [debian/control, debian/control.in] + * Menu icon fixes: [debian/totem-gstreamer.install, + debian/totem-gstreamer.menu, debian/totem-xine.install, + debian/totem-xine.menu, debian/totem.xpm] + - Convert the upstream PNG icon to XPM. + - Install totem.xpm in /usr/share/pixmaps for totem-xine and + totem-gstreamer. + - Update totem-gstreamer and totem-xine menu files. + * Only update config.guess and config.sub if we're in a tree with these + files. [debian/rules] + + -- Loic Minier Wed, 14 Sep 2005 13:03:01 +0200 + +totem (1.1.5-1) experimental; urgency=medium + + * Ship missing shlibs. + * New upstream release. + + -- Loic Minier Sun, 11 Sep 2005 11:37:42 +0200 + +totem (1.1.4-1) experimental; urgency=low + + * debian/control.in: + - new packages for libtotem-plparser. + - updated the Build-Depends. + - updated the Standards-Version. + * debian/rules: + - move libtotem-plparser files to the right place. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 13 Aug 2005 14:24:36 +0200 + +totem (1.0.4-1) unstable; urgency=low + + * New upstream version: + - say that we support 3GPP files. + - avoid resizing on startup before we really show the window. + - fix a crash when 'Hide controls' is called while starting up. + - fix crashes when playing back some files with errors (xine-lib). + - fix hand icon not appearing on DVD menus in fullscreen (xine-lib). + - fix detection of still images with newer xine-lib. + + -- Sebastien Bacher Tue, 28 Jun 2005 12:14:31 +0200 + +totem (1.0.3-1) unstable; urgency=low + + * New upstream version. + + -- Sebastien Bacher Fri, 10 Jun 2005 01:08:45 +0200 + +totem (1.0.2-1) experimental; urgency=low + + * New upstream version. + + -- Sebastien Bacher Mon, 2 May 2005 18:38:08 +0200 + +totem (1.0.1-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - updated the requirements. + * debian/patches/02_crashnull.dpatch, + debian/patches/10_vcd_hang.dpatch: + - the new version fixes that. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 9 Apr 2005 17:39:02 +0200 + +totem (0.100-5) unstable; urgency=low + + * Rebuilt for the libhowl transition (Closes: #298872). + * debian/control.in: + - updated the gnome-vfs requirements. + + -- Sebastien Bacher Thu, 10 Mar 2005 19:14:51 +0100 + +totem (0.100-4) unstable; urgency=low + + * debian/patches/00list: + - list the new patch (Closes: #289470). + + -- Sebastien Bacher Wed, 16 Feb 2005 15:09:35 +0100 + +totem (0.100-3) unstable; urgency=low + + * debian/patches/02_crashnull.dpatch: + - updated with the patch from Josselin Mouette . + + -- Sebastien Bacher Sun, 13 Feb 2005 12:40:17 +0100 + +totem (0.100-2) unstable; urgency=low + + * debian/patches/01_gst-plugins-0.8.5.dpatch: + - removed, the new gst-plugins is in the archive now. + * debian/patches/02_crashnull.dpatch: + - added, fix the crash on system without any cdrom drive (Closes: #289470). + + -- Sebastien Bacher Thu, 10 Feb 2005 19:05:00 +0100 + +totem (0.100-1) unstable; urgency=low + + * New upstream release: + - implement session management support, remove automatic save/restore of + the current playlist (Closes: #255320). + - GStreamer DVD support. + - make Ctrl+arrows seek further in streams. + - turn the cursor into a hand when hovering a menu in a DVD (xine-lib). + - zoom in/out support (xine-lib). + - implement buffering (GStreamer). + - enable visualisation effects (GStreamer) (Closes: #269910). + - make the properties page work (GStreamer) and misc. fixes (all) + (Hoary: #1453). + - add Album metadata to the properties windows. + - hide the video properties if a file is an audio-only one. + - work-around a bug in GConf that caused playbacks + to be very dark (xine-lib). + - add 4.1-channel audio support. + - fix parsing of sub-directories, and .pls playlists with relative paths. + * debian/control.in: + - totem-gstreamer and totem-xine Provides totem (Closes: 287981). + - updated the descriptions about the subtitle (Closes: #285153). + * debian/patches/01_gst-plugins-0.8.5.dpatch: + - removed, this fix is in the new version. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 8 Jan 2005 16:45:28 +0100 + +totem (0.99.22-1) unstable; urgency=low + + * New upstream release: + - show the popups in fullscreen (GStreamer). + - fix multiple volume icons appearing in the playlist. + - automatically load text subtitles (xine-lib). + - handle Drag'n'drop from Mozilla/Netscape. + - implement Drag from the Screenshot dialog to the file manager. + - make it possible to play a DVD from the hard-disk (xine-lib). + - fix getting the CD type when the drive doesn't implement it. + - add an error message when the audio device is busy (GStreamer). + - make drag'n'drop work again after double-clicking a playlist entry. + * debian/control.in: + - updated the Build-Depends and Depends. + * debian/patches/01_gst-plugins-0.8.5.dpatch: + - make the new version working well with gst-plugins 0.8.5. + + -- Sebastien Bacher Mon, 22 Nov 2004 15:57:25 +0100 + +totem (0.99.20-2) experimental; urgency=low + + * debian/control.in: + - Build-Depends on libgstreamer-plugins0.8-dev (Closes: #279038). + + -- Sebastien Bacher Sun, 31 Oct 2004 12:38:09 +0100 + +totem (0.99.20-1) experimental; urgency=low + + * New upstream release: + - fix a crash when closing Totem with non-file locations. + - set the current file chooser paths correctly. + - fix "Play Disc..." when the detected device is a symbolic link. + - fix detection of some DVDs, and speed-up disc type detection. + - add bitrate support to the GStreamer backend. + * debian/control.in: + - updated the Build-Depends. + + -- Sebastien Bacher Wed, 27 Oct 2004 19:27:57 +0200 + +totem (0.99.19-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - updated the debhelper Build-Depends to get dh_desktop. + * debian/totem-gstreamer.postinst, debian/totem-xine.postinst: + - dh_desktop handles the mime update now. + * debian/patches/01_automake.dpatch: + - removed. + * debian/rules: + - use dh_desktop. + + -- Sebastien Bacher Sun, 17 Oct 2004 14:51:31 +0200 + +totem (0.99.17-2) experimental; urgency=low + + * debian/control.in: + - updated the Depends on nautilus-cd-burner (Closes: #275886). + + -- Sebastien Bacher Sun, 10 Oct 2004 22:28:12 +0200 + +totem (0.99.17-1) experimental; urgency=low + + * New upstream release: + - great overhaul of the GStreamer backend. + - fix parsing of Real Media and ASF playlists. + - support for writing m3u playlists, including relative paths. + * debian/control.in: + - updated the Build-Depends. + - updated the Standards-Version. + * debian/patches/01_automake.dpatch: + - run automake to fix the broken build for the gstreamer backend. + + -- Sebastien Bacher Thu, 7 Oct 2004 22:13:20 +0200 + +totem (0.99.16-1) unstable; urgency=low + + * New upstream release. + * debian/control.in: + - totem depends on totem-xine | totem-gstreamer (Closes: #270985). + * debian/patches/20_use_alternatives.dpatch: + - patch from Emil Soleyman-Zomalan to convert the + video-thumbnailer to an alternative. (Closes: #270222). + + -- Sebastien Bacher Fri, 17 Sep 2004 12:17:22 +0200 + +totem (0.99.15.1-2) unstable; urgency=low + + * debian/control.in: + - updated the Build-Depends on libgnomeui-dev (Closes: #263661). + + -- Sebastien Bacher Thu, 5 Aug 2004 16:59:26 +0200 + +totem (0.99.15.1-1) unstable; urgency=low + + * New upstream release. + - add a MimeType line to the desktop file (for the new MIME system). + * debian/control.in: + - updated the Build-Depends. + * debian/rules: + - added a call to dh_gconf. + * debian/totem-gstreamer.postinst, debian/totem-xine.postinst: + - removed schemas registration code, dh_gconf handles that. + - run update-desktop-database if available. + + -- Sebastien Bacher Sat, 24 Jul 2004 13:23:10 +0200 + +totem (0.99.13-1) unstable; urgency=low + + * New upstream release + - Handle Ctrl+P to show the playlist even in hidden controls mode + (Closes: #252604). + * debian/control.in + - Updated the totem-gstreamer description to remove references to xine + (Closes: #255420). + + -- Sebastien Bacher Sat, 3 Jul 2004 00:01:52 +0200 + +totem (0.99.12-2) unstable; urgency=low + + * Split the package, now we have: + - totem-xine using the xine backend. + - totem-gstreamer using the gstreamer backend (Closes: #246058). + - totem, dummy package depending on totem-xine (since it seems to be + a better default for the moment). + * debian/control.in: + - updated for the split. + * debian/patches: + - switched to dpatch. + * debian/rules: + - switched back to debhelper since cdbs doesn't support multibuild for + the moment. + * debina/template: + - removed debconf's template for the moment, gstreamer-media is not ready + to be a suitable alternative for thumbnails (Closes: #235857, #252941). + * debian/totem.1: + - removed, the manpage is included in the upstream tarball now. + + -- Sebastien Bacher Tue, 8 Jun 2004 15:16:34 +0200 + +totem (0.99.12-1) unstable; urgency=low + + * New upstream release + + turn off vanity's build. + + -- Sebastien Bacher Sun, 6 Jun 2004 03:12:19 +0200 + +totem (0.99.11-2) unstable; urgency=low + + * Upload in unstable. + + -- Sebastien Bacher Wed, 26 May 2004 23:53:54 +0200 + +totem (0.99.11-1) experimental; urgency=low + + * New upstream release. + * debian/patches/stock-icon.patch, debian/patches/totem-rwcrash-fix.patch: + + removed since included in new version. + * debian/control.in: + + updated Build-Depends. + + -- Sebastien Bacher Sat, 1 May 2004 23:28:02 +0200 + +totem (0.99.10-3) experimental; urgency=low + + * debian/patches/stock-icon.patch: + + patch from Michel Daenzer that makes all installed + icons loadable by totem (Closes: 243334). + + -- Sebastien Bacher Tue, 27 Apr 2004 00:21:22 +0200 + +totem (0.99.10-2) experimental; urgency=low + + * debian/patches/totem-rwcrash-fix.patch: + + new patch to fix a crasher. + + -- Sebastien Bacher Sun, 18 Apr 2004 17:30:38 +0200 + +totem (0.99.10-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + + updated Build-Depends. + * Included Brazilian Portuguese debconf template from Andre Luis Lopes + (Closes: #235384). + * Included new manpage from Andre Lehovich + (Closes: #241814). + + -- Sebastien Bacher Sun, 11 Apr 2004 00:46:20 +0200 + +totem (0.99.9-4) unstable; urgency=low + + * Fixed schemas registration (should fix the problem with colors). + + -- Sebastien Bacher Sun, 22 Feb 2004 19:57:11 +0100 + +totem (0.99.9-3) unstable; urgency=low + + * debian/patches/vcd_hang.patch: + + patch to fix hang on start with VCD plugin. + + -- Sebastien Bacher Tue, 17 Feb 2004 19:36:46 +0100 + +totem (0.99.9-2) unstable; urgency=low + + * GNOME team upload. + * [debian/control.in] Added build dependency on scrollkeeper. + (Closes: #232588) + + -- J.H.M. Dassen (Ray) Sat, 14 Feb 2004 10:10:04 +0100 + +totem (0.99.9-1) unstable; urgency=low + + * New upstream release + + fix bug with directory selection in the file selector (Closes: #225903). + + -- Sebastien Bacher Fri, 13 Feb 2004 19:47:26 +0100 + +totem (0.99.8-3) unstable; urgency=low + + * Rebuilt with xfree 4.2. + + -- Sebastien Bacher Sun, 18 Jan 2004 01:01:37 +0100 + +totem (0.99.8-2) unstable; urgency=low + + * Fixed a typo in the french debconf translation (Closes: #227311). + + -- Sebastien Bacher Sat, 17 Jan 2004 16:58:34 +0100 + +totem (0.99.8-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + updated Build-Depends. + + updated for the GNOME Team. + * debian/rules: + + updated for the GNOME Team. + * Added french template (Closes: #218730). + * Changed the template to remove the "yes" from the description + (Closes: #218117). + + -- Sebastien Bacher Sun, 9 Nov 2003 14:03:46 +0100 + +totem (0.99.7-1) unstable; urgency=low + + * New upstream release. + * Added debconf option to use or not totem as the nautilus video thumbnailer. + (Closes: #212555). + + -- Sebastien Bacher Thu, 16 Oct 2003 01:01:24 +0200 + +totem (0.99.6-1) unstable; urgency=low + + * New upstream release. + + playlist improvements (Closes: #211833). + + fixed crash on eject (Closes: #211968). + + -- Sebastien Bacher Sun, 12 Oct 2003 18:34:48 +0200 + +totem (0.99.5-1) unstable; urgency=low + + * New upstream release + + disable xscreensaver (Closes: #208175). + + -- Sebastien Bacher Mon, 15 Sep 2003 17:55:44 +0200 + +totem (0.99.4-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Thu, 4 Sep 2003 15:41:46 +0200 + +totem (0.99.3-1) unstable; urgency=low + + * New upstream release. + * Switched to cdbs. + * Updated menu icon. + * Updated description (Closes: #207007). + + -- Sebastien Bacher Sun, 31 Aug 2003 19:53:10 +0200 + +totem (0.99.2-1) unstable; urgency=low + + * New upstream release. + - Fixed XFree86 lockup on start bug (Closes: #200101). + + -- Sebastien Bacher Sat, 5 Jul 2003 14:02:13 +0000 + +totem (0.99.1-2) unstable; urgency=low + + * Build with xfree 4.2 instead 4.3. (Closes: #199335). + + -- Sebastien Bacher Tue, 1 Jul 2003 23:49:57 +0200 + +totem (0.99.1-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 23 Jun 2003 11:49:55 +0200 + +totem (0.99.0-2) unstable; urgency=low + + * Added libgnome-desktop-dev to Build-Depends (Closes: #196224). + + -- Sebastien Bacher Thu, 5 Jun 2003 17:11:25 +0200 + +totem (0.99.0-1) unstable; urgency=low + + * New upstream release + - Fixed DVD/CD playing (Closes: #195090). + * Updated to standards version 3.5.10.0. + + -- Sebastien Bacher Sat, 31 May 2003 19:19:39 +0200 + +totem (0.98.0-1) unstable; urgency=low + + * New upstream relase. + + -- Sebastien Bacher Sun, 11 May 2003 21:13:06 +0200 + +totem (0.97.0-1) unstable; urgency=low + + * New upstream release. + - Fixed the thumbnailer (Closes: #188979). + + -- Sebastien Bacher Tue, 29 Apr 2003 22:13:05 +0200 + +totem (0.96.0-1) unstable; urgency=low + + * New upstream release. + * Changed section to gnome. + * Updated to standards version 3.5.9. + * Updated Description to add Author and Homepage. + * Added Depends on ${misc:Depends}. + * Updated Build-Depends. + + -- Sebastien Bacher Thu, 10 Apr 2003 11:17:49 +0200 + +totem (0.95.1-3) unstable; urgency=low + + * This time the schema file should be ok ... + + -- Sebastien Bacher Fri, 28 Mar 2003 21:54:13 +0100 + +totem (0.95.1-2) unstable; urgency=low + + * Fixed schema file (Closes: #185137). + + -- Sebastien Bacher Thu, 27 Mar 2003 17:09:15 +0100 + +totem (0.95.1-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Wed, 26 Feb 2003 23:43:07 +0100 + +totem (0.95.0-1) unstable; urgency=low + + * New upstream release. + * Updated to standards-version 3.5.8. + + -- Sebastien Bacher Wed, 26 Feb 2003 22:01:48 +0100 + +totem (0.90.0-5) unstable; urgency=low + + * Added "liblircclient-dev" and "libirman-dev" to Build-Depends (Closes: #182195). + + -- Sebastien Bacher Sun, 23 Feb 2003 17:47:25 +0100 + +totem (0.90.0-4) unstable; urgency=low + + * Apply patch to support playing straight from amazon (Closes: #181485). + + -- Sebastien Bacher Thu, 20 Feb 2003 17:19:18 +0100 + +totem (0.90.0-3) unstable; urgency=low + + * Register totem-video-thumbnail schemas (Closes: #179343). + + -- Sebastien Bacher Wed, 5 Feb 2003 01:13:54 +0100 + +totem (0.90.0-2) unstable; urgency=low + + * Update README file. + * Update Build-Depends. + * Remove obsolete depend on xine-dvdnav (Closes: #179160). + + -- Sebastien Bacher Fri, 31 Jan 2003 10:59:36 +0100 + +totem (0.90.0-1) unstable; urgency=low + + * New upstream release. + * Should close the FTBFS (Closes: #176530). + * Updated Build-Depends. + + -- Sebastien Bacher Wed, 29 Jan 2003 20:39:02 +0100 + +totem (0.13.1-1) unstable; urgency=low + + * New upstream release + * Updated xine-lib Depends. + * Totem doesn't use xine logo any more (Closes: #160429). + * Updated xpm icon for debian menu. + * Updated to standards-version 3.5.7. + + -- Sebastien Bacher Fri, 3 Jan 2003 12:34:20 +0100 + +totem (0.11.0-1) unstable; urgency=low + + * New upstream release (Closes: #161818). + + -- Sebastien Bacher Mon, 28 Oct 2002 13:02:10 +0100 + +totem (0.10.0-3) unstable; urgency=low + + * Added xine-dvdnav to Depends (and not to Build-Depends ...). + + -- Sebastien Bacher Fri, 25 Oct 2002 01:17:52 +0200 + +totem (0.10.0-2) unstable; urgency=low + + * Added xine-dvdnav to Build-Depends. + + -- Sebastien Bacher Sun, 20 Oct 2002 00:22:30 +0200 + +totem (0.10.0-1) unstable; urgency=low + + * New upstream release + + -- Sebastien Bacher Mon, 2 Sep 2002 19:14:31 +0200 + +totem (0.9.1-1) unstable; urgency=low + + * Initial Release. + + -- Sebastien Bacher Sat, 24 Aug 2002 15:12:51 +0200 + + --- totem-2.30.2.orig/debian/totem-common.install +++ totem-2.30.2/debian/totem-common.install @@ -0,0 +1,9 @@ +debian/totem.xpm usr/share/pixmaps +debian/tmp/usr/share/locale +debian/tmp/usr/share/gnome +debian/tmp/usr/share/man +debian/tmp/usr/share/icons +debian/tmp/usr/share/omf +debian/tmp/usr/share/gtk-doc +debian/tmp/usr/share/totem +debian/tmp/etc/gconf --- totem-2.30.2.orig/debian/totem-coherence.install +++ totem-2.30.2/debian/totem-coherence.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/totem/plugins/coherence_upnp --- totem-2.30.2.orig/debian/totem.xpm +++ totem-2.30.2/debian/totem.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *totem32[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c #0036002D0033", +". c #0CF205BE054F", +"X c #0A69088E07CC", +"o c #0B9D0AF70B7E", +"O c #0ECF0F7C1132", +"+ c #0F9B10BD12FF", +"@ c #1054026800A8", +"# c #11D608FB06F2", +"$ c #14860D040B1D", +"% c #11A211D60E03", +"& c #1843117C0E83", +"* c #14FA13561411", +"= c #192014C41318", +"- c #1C561B2C16E8", +"; c #1E0F1A701A4F", +": c #21711E3C1E37", +"> c #35A80ED1065D", +", c #269A24682344", +"< c #293724DE24F4", +"1 c #2C532A6B2C09", +"2 c #318E2ACC2599", +"3 c #34AC2C292B48", +"4 c #378234762B68", +"5 c #3AF2363B2EC1", +"6 c #3AC3396D2CF3", +"7 c #368E33DA35D6", +"8 c #3C1C30B9351E", +"9 c #3C56394D3A23", +"0 c #411939DC3767", +"q c #5C8F296C24A3", +"w c #64622F0E1EB1", +"e c #6C3D2F022631", +"r c #73AF2EA72E2E", +"t c #79783FA73260", +"y c #49A044363EE0", +"u c #50B84BD33B0E", +"i c #765643D233CC", +"p c #424942484258", +"a c #48BB47A94871", +"s c #4B45494E4A58", +"d c #4CF9443D41CB", +"f c #55E24790468B", +"g c #537C49E545CC", +"h c #5AF05A0A415E", +"j c #597F56BA5301", +"k c #5F735A5558B1", +"l c #5B3F5B40562C", +"z c #661C5D7E5420", +"x c #68805D5956EF", +"c c #6C6B5B825C68", +"v c #7A8A556E4A0F", +"b c #6FBD69DA576D", +"n c #6D206BD46025", +"m c #63E164AA6A7D", +"M c #67DD6BCB7E26", +"N c #774E6BAB64BA", +"B c #7DF96FEB7031", +"V c #771973BF64F9", +"C c #75AA77846F32", +"Z c #7CAB74E2738A", +"A c #7FAD7BA679CB", +"S c #8ADF392725FE", +"D c #86E53C0039C8", +"F c #8CAF39983584", +"G c #86E13D3F376D", +"H c #8F2743CF393A", +"J c #8435508E3E97", +"K c #ABCF52003F09", +"L c #82B260394D6E", +"P c #95075EF74BF6", +"I c #827680605D44", +"U c #9F1E6D7D5C19", +"Y c #842B6AD16418", +"T c #841276DA6CEB", +"R c #81427C5B79D8", +"E c #8E9A785C70AB", +"W c #89947C7970E2", +"Q c #8B477CEA7D44", +"! c #93E070E16588", +"~ c #989178B873FA", +"^ c #ACCE58C547CE", +"/ c #B19F56994769", +"( c #B1A95C2643A8", +") c #B1DB5C9D4944", +"_ c #A3D86F875AA0", +"` c #BD4366315105", +"' c #BDA66B6953CE", +"] c #A17E6D8A614A", +"[ c #A59873C460E0", +"{ c #A53F7AB56C16", +"} c #C266684D584A", +"| c #C34F7E885D15", +" . c #CB4F78755490", +".. c #CB7175415E7A", +"X. c #CC82795C5564", +"o. c #D32C799C5D55", +"O. c #D9D57CE15ED3", +"+. c #C86179CA60A4", +"@. c #D31F7FD761E1", +"#. c #DF128021615F", +"$. c #8D1E89C062AE", +"%. c #8B158240644A", +"&. c #8F698D067CF6", +"*. c #934B8FAB670C", +"=. c #95B8874A7EB6", +"-. c #92ED9185685A", +";. c #95E3940B6B66", +":. c #99A992BF6D31", +">. c #9DA195D27124", +",. c #9E3394B67E10", +"<. c #9DF09A1E73F1", +"1. c #A59183A2729B", +"2. c #A6F890067FBC", +"3. c #A2639E2579B9", +"4. c #A9EB9B967C5F", +"5. c #A8F5A3E57F8F", +"6. c #CF7184796493", +"7. c #C2A18FFE792B", +"8. c #D3EA8190660D", +"9. c #DA358CC06DBD", +"0. c #D8CD8FA2753E", +"q. c #DBA18D4970B5", +"w. c #E3CA8E556F30", +"e. c #E1799BDD7EB5", +"r. c #EDB198647DF7", +"t. c #F1168F777D4F", +"y. c #8681894C815E", +"u. c #882A8EC08BB2", +"i. c #895E84268109", +"p. c #85A88ABB9E6A", +"a. c #8E8990509D2D", +"s. c #90DB8D69877D", +"d. c #869793A4A938", +"f. c #899A97BBAE09", +"g. c #949297FEA2AD", +"h. c #958B9B91A817", +"j. c #927D9B4DB63B", +"k. c #A0C88EC282A1", +"l. c #A73B98778929", +"z. c #AC0B9CC38D04", +"x. c #ADBC9EB89298", +"c. c #B7259CF39ADE", +"v. c #AF2EA82985BE", +"b. c #AE05A0CB9036", +"n. c #AE57A8AD8524", +"m. c #AA8BA8EA9914", +"M. c #B2CFA1348418", +"N. c #B7EEAF828E9C", +"B. c #BD24A6EC8E99", +"V. c #B89BA7AC9772", +"C. c #B8D3A85297EA", +"Z. c #BBAFAA7E99F5", +"A. c #B885B3F49694", +"S. c #ABB4A73DB09D", +"D. c #AA1AB0F1ABE9", +"F. c #B8A0AEEAA9BA", +"G. c #B92AA566AA14", +"H. c #BB66AA23A799", +"J. c #BD45B04FB37E", +"K. c #B841B582AD8F", +"L. c #B636B5D4B2DE", +"P. c #B666BD6FB52B", +"I. c #C03CB3EEB380", +"U. c #BE05BAB8B6A7", +"Y. c #C3879B929C15", +"T. c #DB769C8C82C2", +"R. c #C82BAE189976", +"E. c #C2FAB4279E51", +"W. c #C1ECAC69ABAA", +"Q. c #C526B317A246", +"!. c #C247BEA6A672", +"~. c #CBBBB672A67D", +"^. c #CEE3B14BAF8C", +"/. c #CBFCBC4FA570", +"(. c #CDFCBC71AAC5", +"). c #C647BE76BD02", +"_. c #D42AAD2DAA8C", +"`. c #D845B12BAEBA", +"'. c #D1CBBF6FADA0", +"]. c #DBECBD6FAEC5", +"[. c #D4C2B6A6B341", +"{. c #D6ECB9C6B381", +"}. c #DBAEBEA1B27E", +"|. c #E79C99E18123", +" X c #F692936C80D0", +".X c #ED32A38E89FC", +"XX c #E604AD28978E", +"oX c #FBE9A88088AD", +"OX c #FB8DAC608C1F", +"+X c #F422A9CD96BF", +"@X c #FD4BAE7A933D", +"#X c #F5FEBA729DD4", +"$X c #FFFFB0E6959C", +"%X c #FAB0B38A9C1A", +"&X c #F359B3AC95B4", +"*X c #E1BFB573B114", +"=X c #C5C1C35EADDD", +"-X c #C3BFC664B7A9", +";X c #C482C700BCDD", +":X c #C4F4CA67BF81", +">X c #C959C7C3B44D", +",X c #CCD8CB81BB8B", +" w i L P _ ] ~ M o YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p > S ( ' 8.r.@X$X`.j.+ YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p . e ) ' ` +.q.q.0.G.p.O YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p . H ' 8.o. .6.9.e.S.a.o YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p # H ` w.OX&X#X#X+XI.g.+ YXYXYXYXYXYXYXYXYXYXYX", +"p . F ( 8.oX0XcX%Xt._.g.+ X ; 8 d y 4 = . YXYXYXYXYXYXYXYX", +"p . r F K o.|.XX..` Y.d.1 z k.c.5X1Xz.W z , YXYXYXYXYXYX", +"p . . . $ $ $ @ # ; s F.gX8X[.pX1XZ.Z.'.,.6 o YXYXYXYXYX", +"p @ > w i L P _ L f W.LXPXfX}.5X1XZ.Q. S ) ' @.r.|.! G.bXbXLXSX7X}.{.Z.(.N.;.-.%.2 YXYXYXYX", +"p . e ) ' ` ..9._ s.LXLXbXbXZXgX5X>XE.E.<.-.4.R.E * YXYXYXYX", +"p . H ' 8.8.X.| L E.SXPXPXAXLXIXKXHXjXA.>.B.].sX6Xp YXYXYX", +"< . G ^ 6.e.T.7.Y ~.7X9XgXZXIXuXi.Z K.rXX=X!.V o YXYXYX", +"YXYXYXYXYXYXYXYXYX 0 l.V.Z.Q./.2XeXU.L.kXJXzXlXhXyXwXl o YXYXYX", +"YXYXYXYXYXYXYXYXYX * T E.(.XyXlXgX9Xx.< . YXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYX - h *.M.4XnXiX:X!.eXlXlXx.5 o YXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYX * u k.7XCXuXqX!.,X).Q 3 . YXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYX X 3 N m.P.D.&.n p * X YXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYX o ; - * = O X YXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX YXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" +}; --- totem-2.30.2.orig/debian/totem-mozilla.install +++ totem-2.30.2/debian/totem-mozilla.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/mozilla/plugins --- totem-2.30.2.orig/debian/totem.menu +++ totem-2.30.2/debian/totem.menu @@ -0,0 +1,6 @@ +?package(totem):\ +needs="X11"\ +section="Applications/Video"\ +title="Totem"\ +icon="/usr/share/pixmaps/totem.xpm"\ +command="/usr/bin/totem" --- totem-2.30.2.orig/debian/totem-mozilla.docs +++ totem-2.30.2/debian/totem-mozilla.docs @@ -0,0 +1 @@ +browser-plugin/README.browser-plugin --- totem-2.30.2.orig/debian/compat +++ totem-2.30.2/debian/compat @@ -0,0 +1 @@ +5 --- totem-2.30.2.orig/debian/rules +++ totem-2.30.2/debian/rules @@ -0,0 +1,37 @@ +#!/usr/bin/make -f +#-*- makefile -*- + +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --enable-vala=no \ + --disable-run-in-source-tree \ + --disable-scrollkeeper + +DEB_DH_STRIP_ARGS := --dbg-package=totem-dbg + +DEB_DH_MAKESHLIBS_ARGS += -Xdebian/ + +ifeq ($(DEB_HOST_ARCH_OS),linux) +install/totem-plugins:: + dh_install --autodest -ptotem-plugins --ignore=debian/totem-plugins.install \ + debian/tmp/usr/lib/totem/plugins/bemused +endif + +binary-install/totem-plugins:: + dh_pysupport -ptotem-plugins /usr/lib/totem/plugins +binary-install/totem-coherence:: + dh_pysupport -ptotem-coherence /usr/lib/totem/plugins + +common-binary-predeb-arch:: + find debian -name *.a -exec rm '{}' \; + find debian -name *.la -exec rm '{}' \; + --- totem-2.30.2.orig/debian/bug/control +++ totem-2.30.2/debian/bug/control @@ -0,0 +1 @@ +report-with: totem-gstreamer totem-xine --- totem-2.30.2.orig/debian/patches/01_fake_keypresses.patch +++ totem-2.30.2/debian/patches/01_fake_keypresses.patch @@ -0,0 +1,13 @@ +diff --git a/lib/totem-scrsaver.c b/lib/totem-scrsaver.c +index 089cbb0..526f14c 100644 +--- a/lib/totem-scrsaver.c ++++ b/lib/totem-scrsaver.c +@@ -31,6 +31,8 @@ + #include + #include + ++#undef HAVE_XTEST ++ + #ifdef HAVE_XTEST + #include + #endif /* HAVE_XTEST */ --- totem-2.30.2.orig/debian/patches/series +++ totem-2.30.2/debian/patches/series @@ -0,0 +1,6 @@ +01_fake_keypresses.patch +70_bbc_plugin.patch +80_webm.patch +81_mpegts.patch +82_youtube_api.patch +90_autotools.patch --- totem-2.30.2.orig/debian/patches/90_autotools.patch +++ totem-2.30.2/debian/patches/90_autotools.patch @@ -0,0 +1,4890 @@ +diff -Naur totem-2.30.2.old/aclocal.m4 totem-2.30.2/aclocal.m4 +--- totem-2.30.2.old/aclocal.m4 2010-05-12 17:44:44.000000000 +0200 ++++ totem-2.30.2/aclocal.m4 2010-05-12 18:37:47.789830955 +0200 +@@ -757,6 +757,12 @@ + [ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ ++ dnl check for tools we added during development ++ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) ++ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) ++ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) ++ + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, +@@ -775,16 +781,32 @@ + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, +- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + fi + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + +- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) ++ dnl enable/disable output formats ++ AC_ARG_ENABLE([gtk-doc-html], ++ AS_HELP_STRING([--enable-gtk-doc-html], ++ [build documentation in html format [[default=yes]]]),, ++ [enable_gtk_doc_html=yes]) ++ AC_ARG_ENABLE([gtk-doc-pdf], ++ AS_HELP_STRING([--enable-gtk-doc-pdf], ++ [build documentation in pdf format [[default=no]]]),, ++ [enable_gtk_doc_pdf=no]) ++ ++ if test -z "$GTKDOC_MKPDF"; then ++ enable_gtk_doc_pdf=no ++ fi ++ + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) ++ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) + ]) + + +@@ -938,7 +960,7 @@ + AC_DEFUN([IT_PO_SUBDIR], + [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. + dnl +-dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl The following CONFIG_COMMANDS should be executed at the very end + dnl of config.status. + AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ +@@ -3422,7 +3444,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -3447,13 +3469,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -3465,6 +3484,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -4052,11 +4083,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -4673,7 +4704,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -4737,7 +4768,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -4957,7 +4988,7 @@ + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -5162,6 +5193,9 @@ + cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -5226,6 +5260,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -5247,6 +5284,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -5338,7 +5376,7 @@ + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -5408,7 +5446,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -5583,6 +5621,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -5821,7 +5860,7 @@ + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -6817,7 +6856,7 @@ + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -9030,14 +9069,16 @@ + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -9081,9 +9122,9 @@ + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +diff -Naur totem-2.30.2.old/bindings/Makefile.in totem-2.30.2/bindings/Makefile.in +--- totem-2.30.2.old/bindings/Makefile.in 2010-05-12 17:52:49.000000000 +0200 ++++ totem-2.30.2/bindings/Makefile.in 2010-05-12 18:37:50.513827796 +0200 +@@ -109,6 +109,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -165,6 +167,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/bindings/python/Makefile.in totem-2.30.2/bindings/python/Makefile.in +--- totem-2.30.2.old/bindings/python/Makefile.in 2010-05-12 17:52:49.000000000 +0200 ++++ totem-2.30.2/bindings/python/Makefile.in 2010-05-12 18:37:50.621827976 +0200 +@@ -106,6 +106,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -162,6 +164,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/bindings/vala/Makefile.in totem-2.30.2/bindings/vala/Makefile.in +--- totem-2.30.2.old/bindings/vala/Makefile.in 2010-05-12 17:52:49.000000000 +0200 ++++ totem-2.30.2/bindings/vala/Makefile.in 2010-05-12 18:37:50.685828144 +0200 +@@ -70,6 +70,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -126,6 +128,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/browser-plugin/Makefile.in totem-2.30.2/browser-plugin/Makefile.in +--- totem-2.30.2.old/browser-plugin/Makefile.in 2010-05-12 17:52:50.000000000 +0200 ++++ totem-2.30.2/browser-plugin/Makefile.in 2010-05-12 18:37:50.973828161 +0200 +@@ -304,6 +304,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -360,6 +362,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/configure totem-2.30.2/configure +--- totem-2.30.2.old/configure 2010-05-12 17:44:47.000000000 +0200 ++++ totem-2.30.2/configure 2010-05-12 18:37:49.133828178 +0200 +@@ -753,12 +753,20 @@ + AM_CFLAGS + AM_CPPFLAGS + FULL_LIBEXECDIR ++GTK_DOC_USE_REBASE_FALSE ++GTK_DOC_USE_REBASE_TRUE + GTK_DOC_USE_LIBTOOL_FALSE + GTK_DOC_USE_LIBTOOL_TRUE ++GTK_DOC_BUILD_PDF_FALSE ++GTK_DOC_BUILD_PDF_TRUE ++GTK_DOC_BUILD_HTML_FALSE ++GTK_DOC_BUILD_HTML_TRUE + ENABLE_GTK_DOC_FALSE + ENABLE_GTK_DOC_TRUE +-GTKDOC_CHECK + HTML_DIR ++GTKDOC_MKPDF ++GTKDOC_REBASE ++GTKDOC_CHECK + DISABLE_DEPRECATED + WARN_CXXFLAGS + WARN_CFLAGS +@@ -807,6 +815,8 @@ + LIBEPC_CFLAGS + BEMUSED_LIBS + BEMUSED_CFLAGS ++BBC_LIBS ++BBC_CFLAGS + GMYTH_LIBS + GMYTH_CFLAGS + LIRC_LIBS +@@ -1087,6 +1097,8 @@ + enable_iso_cxx + with_html_dir + enable_gtk_doc ++enable_gtk_doc_html ++enable_gtk_doc_pdf + enable_run_in_source_tree + ' + ac_precious_vars='build_alias +@@ -1132,6 +1144,8 @@ + MEDIA_PLAYER_KEYS_LIBS + GMYTH_CFLAGS + GMYTH_LIBS ++BBC_CFLAGS ++BBC_LIBS + BEMUSED_CFLAGS + BEMUSED_LIBS + LIBEPC_CFLAGS +@@ -1815,6 +1829,8 @@ + + --enable-iso-cxx Try to warn if code is not ISO C++ + --enable-gtk-doc use gtk-doc to build documentation [[default=no]] ++ --enable-gtk-doc-html build documentation in html format [[default=yes]] ++ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] + --disable-run-in-source-tree + disable search for UI files and plugins in local + directory +@@ -1900,6 +1916,8 @@ + GMYTH_CFLAGS + C compiler flags for GMYTH, overriding pkg-config + GMYTH_LIBS linker flags for GMYTH, overriding pkg-config ++ BBC_CFLAGS C compiler flags for BBC, overriding pkg-config ++ BBC_LIBS linker flags for BBC, overriding pkg-config + BEMUSED_CFLAGS + C compiler flags for BEMUSED, overriding pkg-config + BEMUSED_LIBS +@@ -7313,13 +7331,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:7316: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:7334: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:7319: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:7337: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:7322: output\"" >&5) ++ (eval echo "\"\$as_me:7340: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -7774,11 +7792,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -8513,7 +8531,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 8516 "configure"' > conftest.$ac_ext ++ echo '#line 8534 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -10298,11 +10316,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10301: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10319: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10305: \$? = $ac_status" >&5 ++ echo "$as_me:10323: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -10467,7 +10485,7 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -10637,11 +10655,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10640: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10658: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10644: \$? = $ac_status" >&5 ++ echo "$as_me:10662: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -10742,11 +10760,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10745: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10763: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10749: \$? = $ac_status" >&5 ++ echo "$as_me:10767: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10797,11 +10815,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10800: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10818: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10804: \$? = $ac_status" >&5 ++ echo "$as_me:10822: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10916,6 +10934,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -10937,6 +10958,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -11028,7 +11050,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -11098,7 +11120,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -11273,6 +11295,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -11599,7 +11622,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -12489,7 +12512,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -12529,13 +12552,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -12547,6 +12567,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -13167,7 +13199,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 13170 "configure" ++#line 13202 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -13263,7 +13295,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 13266 "configure" ++#line 13298 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14203,7 +14235,7 @@ + inherit_rpath_CXX=yes + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -15031,7 +15063,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -15095,7 +15127,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -15219,11 +15251,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15222: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15254: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15226: \$? = $ac_status" >&5 ++ echo "$as_me:15258: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15318,11 +15350,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15321: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15353: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15325: \$? = $ac_status" >&5 ++ echo "$as_me:15357: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15370,11 +15402,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15373: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15405: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15377: \$? = $ac_status" >&5 ++ echo "$as_me:15409: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15446,6 +15478,9 @@ + cygwin* | mingw* | cegcc*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -15945,7 +15980,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15985,13 +16020,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -16003,6 +16035,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -18162,7 +18206,7 @@ + + + # 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 jamendo opensubtitles screenshot brasero-disc-recorder coherence_upnp dbus-service iplayer" ++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 dbus-service iplayer bbc" + + PLUGINDIR='${libdir}/totem/plugins' + +@@ -18200,10 +18244,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MISSING_PLUGINS" >&5 + $as_echo_n "checking for MISSING_PLUGINS... " >&6; } + +-if test -n "$MISSING_PLUGINS_CFLAGS"; then +- pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MISSING_PLUGINS_CFLAGS"; then ++ pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5 + ac_status=$? +@@ -18213,13 +18258,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$MISSING_PLUGINS_LIBS"; then +- pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MISSING_PLUGINS_LIBS"; then ++ pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5 + ac_status=$? +@@ -18229,8 +18276,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18243,9 +18291,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-plugins-base-0.10" 2>&1` ++ MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10"` + else +- MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-plugins-base-0.10" 2>&1` ++ MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MISSING_PLUGINS_PKG_ERRORS" >&5 +@@ -18294,10 +18342,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 + $as_echo_n "checking for GST... " >&6; } + +-if test -n "$GST_CFLAGS"; then +- pkg_cv_GST_CFLAGS="$GST_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GST_CFLAGS"; then ++ pkg_cv_GST_CFLAGS="$GST_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + ac_status=$? +@@ -18307,13 +18356,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GST_LIBS"; then +- pkg_cv_GST_LIBS="$GST_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GST_LIBS"; then ++ pkg_cv_GST_LIBS="$GST_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + ac_status=$? +@@ -18323,8 +18374,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18337,9 +18389,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1` ++ GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"` + else +- GST_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1` ++ GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GST_PKG_ERRORS" >&5 +@@ -18456,10 +18508,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMCLIENT" >&5 + $as_echo_n "checking for SMCLIENT... " >&6; } + +-if test -n "$SMCLIENT_CFLAGS"; then +- pkg_cv_SMCLIENT_CFLAGS="$SMCLIENT_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SMCLIENT_CFLAGS"; then ++ pkg_cv_SMCLIENT_CFLAGS="$SMCLIENT_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$SMCLIENT_PKGS") 2>&5 + ac_status=$? +@@ -18469,13 +18522,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$SMCLIENT_LIBS"; then +- pkg_cv_SMCLIENT_LIBS="$SMCLIENT_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SMCLIENT_LIBS"; then ++ pkg_cv_SMCLIENT_LIBS="$SMCLIENT_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$SMCLIENT_PKGS") 2>&5 + ac_status=$? +@@ -18485,8 +18540,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18499,9 +18555,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SMCLIENT_PKGS" 2>&1` ++ SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SMCLIENT_PKGS"` + else +- SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SMCLIENT_PKGS" 2>&1` ++ SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SMCLIENT_PKGS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SMCLIENT_PKG_ERRORS" >&5 +@@ -18581,10 +18637,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCY" >&5 + $as_echo_n "checking for DEPENDENCY... " >&6; } + +-if test -n "$DEPENDENCY_CFLAGS"; then +- pkg_cv_DEPENDENCY_CFLAGS="$DEPENDENCY_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DEPENDENCY_CFLAGS"; then ++ pkg_cv_DEPENDENCY_CFLAGS="$DEPENDENCY_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= \$GLIB_REQS + gio-2.0 +@@ -18618,13 +18675,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DEPENDENCY_LIBS"; then +- pkg_cv_DEPENDENCY_LIBS="$DEPENDENCY_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DEPENDENCY_LIBS"; then ++ pkg_cv_DEPENDENCY_LIBS="$DEPENDENCY_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= \$GLIB_REQS + gio-2.0 +@@ -18658,8 +18717,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18672,7 +18732,7 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + glib-2.0 >= $GLIB_REQS + gio-2.0 + gtk+-2.0 >= $GTK_REQS +@@ -18680,9 +18740,9 @@ + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS + gstreamer-tag-0.10 >= 0.10.26 +- cairo" 2>&1` ++ cairo"` + else +- DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + glib-2.0 >= $GLIB_REQS + gio-2.0 + gtk+-2.0 >= $GTK_REQS +@@ -18690,7 +18750,7 @@ + gconf-2.0 + totem-plparser >= $TOTEM_PLPARSER_REQS + gstreamer-tag-0.10 >= 0.10.26 +- cairo" 2>&1` ++ cairo"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DEPENDENCY_PKG_ERRORS" >&5 +@@ -18740,10 +18800,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM" >&5 + $as_echo_n "checking for MM... " >&6; } + +-if test -n "$MM_CFLAGS"; then +- pkg_cv_MM_CFLAGS="$MM_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MM_CFLAGS"; then ++ pkg_cv_MM_CFLAGS="$MM_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + ac_status=$? +@@ -18753,13 +18814,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$MM_LIBS"; then +- pkg_cv_MM_LIBS="$MM_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MM_LIBS"; then ++ pkg_cv_MM_LIBS="$MM_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + ac_status=$? +@@ -18769,8 +18832,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18783,9 +18847,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1` ++ MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"` + else +- MM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1` ++ MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MM_PKG_ERRORS" >&5 +@@ -18827,10 +18891,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 + $as_echo_n "checking for GTK... " >&6; } + +-if test -n "$GTK_CFLAGS"; then +- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GTK_CFLAGS"; then ++ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5 + ac_status=$? +@@ -18840,13 +18905,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GTK_LIBS"; then +- pkg_cv_GTK_LIBS="$GTK_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GTK_LIBS"; then ++ pkg_cv_GTK_LIBS="$GTK_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5 + ac_status=$? +@@ -18856,8 +18923,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18870,9 +18938,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 gthread-2.0" 2>&1` ++ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0"` + else +- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 gthread-2.0" 2>&1` ++ GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 +@@ -18931,10 +18999,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5 + $as_echo_n "checking for UNIQUE... " >&6; } + +-if test -n "$UNIQUE_CFLAGS"; then +- pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$UNIQUE_CFLAGS"; then ++ pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5 + ac_status=$? +@@ -18944,13 +19013,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$UNIQUE_LIBS"; then +- pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$UNIQUE_LIBS"; then ++ pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5 + ac_status=$? +@@ -18960,8 +19031,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18974,9 +19046,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- UNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "unique-1.0" 2>&1` ++ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "unique-1.0"` + else +- UNIQUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "unique-1.0" 2>&1` ++ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "unique-1.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$UNIQUE_PKG_ERRORS" >&5 +@@ -19273,10 +19345,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XVIDMODE" >&5 + $as_echo_n "checking for XVIDMODE... " >&6; } + +-if test -n "$XVIDMODE_CFLAGS"; then +- pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$XVIDMODE_CFLAGS"; then ++ pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5 + ac_status=$? +@@ -19286,13 +19359,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$XVIDMODE_LIBS"; then +- pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$XVIDMODE_LIBS"; then ++ pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5 + ac_status=$? +@@ -19302,8 +19377,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -19316,9 +19392,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>&1` ++ XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1"` + else +- XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>&1` ++ XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XVIDMODE_PKG_ERRORS" >&5 +@@ -19663,10 +19739,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5 + $as_echo_n "checking for PYGTK... " >&6; } + +-if test -n "$PYGTK_CFLAGS"; then +- pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PYGTK_CFLAGS"; then ++ pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + pygtk-2.0 >= \$PYGTK_REQUIRED + totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5 +@@ -19682,13 +19759,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$PYGTK_LIBS"; then +- pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PYGTK_LIBS"; then ++ pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + pygtk-2.0 >= \$PYGTK_REQUIRED + totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5 +@@ -19704,8 +19783,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -19718,13 +19798,13 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + pygtk-2.0 >= $PYGTK_REQUIRED +- totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` ++ totem-plparser >= $TOTEM_PLPARSER_REQS"` + else +- PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + pygtk-2.0 >= $PYGTK_REQUIRED +- totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` ++ totem-plparser >= $TOTEM_PLPARSER_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PYGTK_PKG_ERRORS" >&5 +@@ -19856,10 +19936,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALA" >&5 + $as_echo_n "checking for VALA... " >&6; } + +-if test -n "$VALA_CFLAGS"; then +- pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$VALA_CFLAGS"; then ++ pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5 + ac_status=$? +@@ -19869,13 +19950,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$VALA_LIBS"; then +- pkg_cv_VALA_LIBS="$VALA_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$VALA_LIBS"; then ++ pkg_cv_VALA_LIBS="$VALA_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5 + ac_status=$? +@@ -19885,8 +19968,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -19899,9 +19983,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vala-1.0 >= $VALA_REQS" 2>&1` ++ VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0 >= $VALA_REQS"` + else +- VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors "vala-1.0 >= $VALA_REQS" 2>&1` ++ VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0 >= $VALA_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$VALA_PKG_ERRORS" >&5 +@@ -20000,10 +20084,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCREENSAVER" >&5 + $as_echo_n "checking for SCREENSAVER... " >&6; } + +-if test -n "$SCREENSAVER_CFLAGS"; then +- pkg_cv_SCREENSAVER_CFLAGS="$SCREENSAVER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SCREENSAVER_CFLAGS"; then ++ pkg_cv_SCREENSAVER_CFLAGS="$SCREENSAVER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5 + ac_status=$? +@@ -20013,13 +20098,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$SCREENSAVER_LIBS"; then +- pkg_cv_SCREENSAVER_LIBS="$SCREENSAVER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SCREENSAVER_LIBS"; then ++ pkg_cv_SCREENSAVER_LIBS="$SCREENSAVER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5 + ac_status=$? +@@ -20029,8 +20116,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20043,9 +20131,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0" 2>&1` ++ SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0"` + else +- SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0" 2>&1` ++ SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SCREENSAVER_PKG_ERRORS" >&5 +@@ -20088,10 +20176,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGALAGO" >&5 + $as_echo_n "checking for LIBGALAGO... " >&6; } + +-if test -n "$LIBGALAGO_CFLAGS"; then +- pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGALAGO_CFLAGS"; then ++ pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5 + ac_status=$? +@@ -20101,13 +20190,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBGALAGO_LIBS"; then +- pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGALAGO_LIBS"; then ++ pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5 + ac_status=$? +@@ -20117,8 +20208,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20131,9 +20223,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgalago >= 0.5.2" 2>&1` ++ LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgalago >= 0.5.2"` + else +- LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgalago >= 0.5.2" 2>&1` ++ LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgalago >= 0.5.2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGALAGO_PKG_ERRORS" >&5 +@@ -20167,10 +20259,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEDIA_PLAYER_KEYS" >&5 + $as_echo_n "checking for MEDIA_PLAYER_KEYS... " >&6; } + +-if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then +- pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then ++ pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 + ac_status=$? +@@ -20180,13 +20273,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$MEDIA_PLAYER_KEYS_LIBS"; then +- pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MEDIA_PLAYER_KEYS_LIBS"; then ++ pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 + ac_status=$? +@@ -20196,8 +20291,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20210,9 +20306,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1" 2>&1` ++ MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1"` + else +- MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1" 2>&1` ++ MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MEDIA_PLAYER_KEYS_PKG_ERRORS" >&5 +@@ -20297,10 +20393,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMYTH" >&5 + $as_echo_n "checking for GMYTH... " >&6; } + +-if test -n "$GMYTH_CFLAGS"; then +- pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GMYTH_CFLAGS"; then ++ pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5 + ac_status=$? +@@ -20310,13 +20407,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GMYTH_LIBS"; then +- pkg_cv_GMYTH_LIBS="$GMYTH_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GMYTH_LIBS"; then ++ pkg_cv_GMYTH_LIBS="$GMYTH_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5 + ac_status=$? +@@ -20326,8 +20425,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20340,9 +20440,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1` ++ GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"` + else +- GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1` ++ GMYTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GMYTH_PKG_ERRORS" >&5 +@@ -20364,16 +20464,111 @@ + add_plugin="0" + fi + ;; ++ bbc) ++ # pygobject >= 2.15.3 for gio support ++ # pygtk >= 2.13.0 for gtk_tree_view_get_tooltip_context support ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BBC" >&5 ++$as_echo_n "checking for BBC... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BBC_CFLAGS"; then ++ pkg_cv_BBC_CFLAGS="$BBC_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_BBC_CFLAGS=`$PKG_CONFIG --cflags " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BBC_LIBS"; then ++ pkg_cv_BBC_LIBS="$BBC_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_BBC_LIBS=`$PKG_CONFIG --libs " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ BBC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "` ++ else ++ BBC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$BBC_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ HAVE_BBCSTUFF=no ++elif test $pkg_failed = untried; then ++ HAVE_BBCSTUFF=no ++else ++ BBC_CFLAGS=$pkg_cv_BBC_CFLAGS ++ BBC_LIBS=$pkg_cv_BBC_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ HAVE_BBCSTUFF=yes ++fi ++ if test "x$HAVE_BBCSTUFF" != "xyes"; then ++ plugin_error_or_ignore "you need pygobject-2.0 >= 2.15.3 and gst-python-0.10 >= 0.10.11 and pygtk-2.0 >= 2.13.0 installed for the BBC plugin" ++ add_plugin="0" ++ fi ++ # only require python apt and gdbm where we would actually be using it, ie. on ubuntu ++ bbc_py_pkg_reqs='' ++ if test -f /etc/debian_version ; then ++ bbc_distro_id=`lsb_release -s -i 2>/dev/null` ++ if test x$bbc_distro_id = xUbuntu; then ++ bbc_py_pkg_reqs="apt gdbm" ++ fi ++ fi ++ for pymodule in rdflib.Graph xdg $bbc_py_pkg_reqs ++ do ++ if ! $PYTHON -c "import $pymodule" 2>/dev/null >/dev/null; then ++ plugin_error_or_ignore "you need the python $pymodule module installed for the BBC plugin" ++ add_plugin="0" ++ fi ++ done ++ ;; + bemused) + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BEMUSED" >&5 + $as_echo_n "checking for BEMUSED... " >&6; } + +-if test -n "$BEMUSED_CFLAGS"; then +- pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BEMUSED_CFLAGS"; then ++ pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5 + ($PKG_CONFIG --exists --print-errors "bluez") 2>&5 + ac_status=$? +@@ -20383,13 +20578,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$BEMUSED_LIBS"; then +- pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BEMUSED_LIBS"; then ++ pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5 + ($PKG_CONFIG --exists --print-errors "bluez") 2>&5 + ac_status=$? +@@ -20399,8 +20596,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20413,9 +20611,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- BEMUSED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "bluez" 2>&1` ++ BEMUSED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "bluez"` + else +- BEMUSED_PKG_ERRORS=`$PKG_CONFIG --print-errors "bluez" 2>&1` ++ BEMUSED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "bluez"` + fi + # Put the nasty error message in config.log where it belongs + echo "$BEMUSED_PKG_ERRORS" >&5 +@@ -20443,10 +20641,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEPC" >&5 + $as_echo_n "checking for LIBEPC... " >&6; } + +-if test -n "$LIBEPC_CFLAGS"; then +- pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBEPC_CFLAGS"; then ++ pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5 + ac_status=$? +@@ -20456,13 +20655,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBEPC_LIBS"; then +- pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBEPC_LIBS"; then ++ pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5 + ac_status=$? +@@ -20472,8 +20673,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20486,9 +20688,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1` ++ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"` + else +- LIBEPC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1` ++ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBEPC_PKG_ERRORS" >&5 +@@ -20516,10 +20718,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5 + $as_echo_n "checking for TRACKER... " >&6; } + +-if test -n "$TRACKER_CFLAGS"; then +- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$TRACKER_CFLAGS"; then ++ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= 0.8.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= 0.8.1") 2>&5 + ac_status=$? +@@ -20529,13 +20732,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$TRACKER_LIBS"; then +- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$TRACKER_LIBS"; then ++ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= 0.8.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= 0.8.1") 2>&5 + ac_status=$? +@@ -20545,8 +20750,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20559,9 +20765,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.8 >= 0.8.1" 2>&1` ++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8 >= 0.8.1"` + else +- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.8 >= 0.8.1" 2>&1` ++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8 >= 0.8.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$TRACKER_PKG_ERRORS" >&5 +@@ -20584,10 +20790,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5 + $as_echo_n "checking for TRACKER... " >&6; } + +-if test -n "$TRACKER_CFLAGS"; then +- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$TRACKER_CFLAGS"; then ++ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.9 >= 0.9.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "tracker-client-0.9 >= 0.9.0") 2>&5 + ac_status=$? +@@ -20597,13 +20804,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$TRACKER_LIBS"; then +- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$TRACKER_LIBS"; then ++ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.9 >= 0.9.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "tracker-client-0.9 >= 0.9.0") 2>&5 + ac_status=$? +@@ -20613,8 +20822,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20627,9 +20837,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.9 >= 0.9.0" 2>&1` ++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.9 >= 0.9.0"` + else +- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.9 >= 0.9.0" 2>&1` ++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.9 >= 0.9.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$TRACKER_PKG_ERRORS" >&5 +@@ -20665,10 +20875,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 + $as_echo_n "checking for GLIB... " >&6; } + +-if test -n "$GLIB_CFLAGS"; then +- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_CFLAGS"; then ++ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5 + ac_status=$? +@@ -20678,13 +20889,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GLIB_LIBS"; then +- pkg_cv_GLIB_LIBS="$GLIB_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_LIBS"; then ++ pkg_cv_GLIB_LIBS="$GLIB_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5 + ac_status=$? +@@ -20694,8 +20907,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20708,9 +20922,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.0" 2>&1` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.15.0"` + else +- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.0" 2>&1` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.15.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 +@@ -20738,10 +20952,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DISC_RECORDER" >&5 + $as_echo_n "checking for DISC_RECORDER... " >&6; } + +-if test -n "$DISC_RECORDER_CFLAGS"; then +- pkg_cv_DISC_RECORDER_CFLAGS="$DISC_RECORDER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DISC_RECORDER_CFLAGS"; then ++ pkg_cv_DISC_RECORDER_CFLAGS="$DISC_RECORDER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0") 2>&5 + ac_status=$? +@@ -20751,13 +20966,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DISC_RECORDER_LIBS"; then +- pkg_cv_DISC_RECORDER_LIBS="$DISC_RECORDER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DISC_RECORDER_LIBS"; then ++ pkg_cv_DISC_RECORDER_LIBS="$DISC_RECORDER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0") 2>&5 + ac_status=$? +@@ -20767,8 +20984,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20781,9 +20999,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0" 2>&1` ++ DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0"` + else +- DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0" 2>&1` ++ DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DISC_RECORDER_PKG_ERRORS" >&5 +@@ -20811,10 +21029,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGDATA" >&5 + $as_echo_n "checking for LIBGDATA... " >&6; } + +-if test -n "$LIBGDATA_CFLAGS"; then +- pkg_cv_LIBGDATA_CFLAGS="$LIBGDATA_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGDATA_CFLAGS"; then ++ pkg_cv_LIBGDATA_CFLAGS="$LIBGDATA_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgdata >= 0.4.0") 2>&5 + ac_status=$? +@@ -20824,13 +21043,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBGDATA_LIBS"; then +- pkg_cv_LIBGDATA_LIBS="$LIBGDATA_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGDATA_LIBS"; then ++ pkg_cv_LIBGDATA_LIBS="$LIBGDATA_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgdata >= 0.4.0") 2>&5 + ac_status=$? +@@ -20840,8 +21061,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20854,9 +21076,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGDATA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgdata >= 0.4.0" 2>&1` ++ LIBGDATA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgdata >= 0.4.0"` + else +- LIBGDATA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgdata >= 0.4.0" 2>&1` ++ LIBGDATA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgdata >= 0.4.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGDATA_PKG_ERRORS" >&5 +@@ -20884,10 +21106,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGDATA_0_7" >&5 + $as_echo_n "checking for LIBGDATA_0_7... " >&6; } + +-if test -n "$LIBGDATA_0_7_CFLAGS"; then +- pkg_cv_LIBGDATA_0_7_CFLAGS="$LIBGDATA_0_7_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGDATA_0_7_CFLAGS"; then ++ pkg_cv_LIBGDATA_0_7_CFLAGS="$LIBGDATA_0_7_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.7.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgdata >= 0.7.0") 2>&5 + ac_status=$? +@@ -20897,13 +21120,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBGDATA_0_7_LIBS"; then +- pkg_cv_LIBGDATA_0_7_LIBS="$LIBGDATA_0_7_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGDATA_0_7_LIBS"; then ++ pkg_cv_LIBGDATA_0_7_LIBS="$LIBGDATA_0_7_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.7.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgdata >= 0.7.0") 2>&5 + ac_status=$? +@@ -20913,8 +21138,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -20927,9 +21153,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGDATA_0_7_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgdata >= 0.7.0" 2>&1` ++ LIBGDATA_0_7_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgdata >= 0.7.0"` + else +- LIBGDATA_0_7_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgdata >= 0.7.0" 2>&1` ++ LIBGDATA_0_7_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgdata >= 0.7.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGDATA_0_7_PKG_ERRORS" >&5 +@@ -21013,10 +21239,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BROWSER_PLUGIN" >&5 + $as_echo_n "checking for BROWSER_PLUGIN... " >&6; } + +-if test -n "$BROWSER_PLUGIN_CFLAGS"; then +- pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BROWSER_PLUGIN_CFLAGS"; then ++ pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 + gio-2.0 + x11 +@@ -21035,13 +21262,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$BROWSER_PLUGIN_LIBS"; then +- pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BROWSER_PLUGIN_LIBS"; then ++ pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 + gio-2.0 + x11 +@@ -21060,8 +21289,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -21074,15 +21304,15 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 ++ BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 + gio-2.0 + x11 +- totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1` ++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS"` + else +- BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 ++ BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 + gio-2.0 + x11 +- totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1` ++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$BROWSER_PLUGIN_PKG_ERRORS" >&5 +@@ -21122,10 +21352,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 + $as_echo_n "checking for DBUS... " >&6; } + +-if test -n "$DBUS_CFLAGS"; then +- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_CFLAGS"; then ++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? +@@ -21135,13 +21366,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DBUS_LIBS"; then +- pkg_cv_DBUS_LIBS="$DBUS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_LIBS"; then ++ pkg_cv_DBUS_LIBS="$DBUS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? +@@ -21151,8 +21384,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -21165,9 +21399,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` + else +- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 +@@ -21394,10 +21628,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS" >&5 + $as_echo_n "checking for NAUTILUS... " >&6; } + +-if test -n "$NAUTILUS_CFLAGS"; then +- pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NAUTILUS_CFLAGS"; then ++ pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5 + ac_status=$? +@@ -21407,13 +21642,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$NAUTILUS_LIBS"; then +- pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NAUTILUS_LIBS"; then ++ pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5 + ac_status=$? +@@ -21423,8 +21660,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -21437,9 +21675,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>&1` ++ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension"` + else +- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>&1` ++ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension"` + fi + # Put the nasty error message in config.log where it belongs + echo "$NAUTILUS_PKG_ERRORS" >&5 +@@ -21507,10 +21745,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 + $as_echo_n "checking for DBUS... " >&6; } + +-if test -n "$DBUS_CFLAGS"; then +- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_CFLAGS"; then ++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? +@@ -21520,13 +21759,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DBUS_LIBS"; then +- pkg_cv_DBUS_LIBS="$DBUS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_LIBS"; then ++ pkg_cv_DBUS_LIBS="$DBUS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? +@@ -21536,8 +21777,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -21550,9 +21792,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` + else +- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 +@@ -21886,54 +22128,58 @@ + + + +-# Check whether --with-html-dir was given. +-if test "${with_html_dir+set}" = set; then : +- withval=$with_html_dir; ++ # Extract the first word of "gtkdoc-check", so it can be a program name with args. ++set dummy gtkdoc-check; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- with_html_dir='${datadir}/gtk-doc/html' +-fi +- +- HTML_DIR="$with_html_dir" +- ++ case $GTKDOC_CHECK in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + +- # Check whether --enable-gtk-doc was given. +-if test "${enable_gtk_doc+set}" = set; then : +- enableval=$enable_gtk_doc; +-else +- enable_gtk_doc=no ++ ;; ++esac + fi +- +- +- if test x$enable_gtk_doc = xyes; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- : ++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK ++if test -n "$GTKDOC_CHECK"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 ++$as_echo "$GTKDOC_CHECK" >&6; } + else +- as_fn_error "You need to have gtk-doc >= 1.11 installed to build gtk-doc" "$LINENO" 5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi +- fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +-$as_echo "$enable_gtk_doc" >&6; } + +- for ac_prog in gtkdoc-check ++ for ac_prog in gtkdoc-rebase + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : ++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- case $GTKDOC_CHECK in ++ case $GTKDOC_REBASE in + [\\/]* | ?:[\\/]*) +- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ++ ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -21943,7 +22189,7 @@ + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -21954,18 +22200,116 @@ + ;; + esac + fi +-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +-if test -n "$GTKDOC_CHECK"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +-$as_echo "$GTKDOC_CHECK" >&6; } ++GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE ++if test -n "$GTKDOC_REBASE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 ++$as_echo "$GTKDOC_REBASE" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + +- test -n "$GTKDOC_CHECK" && break ++ test -n "$GTKDOC_REBASE" && break + done ++test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" ++ ++ # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. ++set dummy gtkdoc-mkpdf; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GTKDOC_MKPDF in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF ++if test -n "$GTKDOC_MKPDF"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 ++$as_echo "$GTKDOC_MKPDF" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ ++# Check whether --with-html-dir was given. ++if test "${with_html_dir+set}" = set; then : ++ withval=$with_html_dir; ++else ++ with_html_dir='${datadir}/gtk-doc/html' ++fi ++ ++ HTML_DIR="$with_html_dir" ++ ++ ++ # Check whether --enable-gtk-doc was given. ++if test "${enable_gtk_doc+set}" = set; then : ++ enableval=$enable_gtk_doc; ++else ++ enable_gtk_doc=no ++fi ++ ++ ++ if test x$enable_gtk_doc = xyes; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ : ++else ++ as_fn_error "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5 ++fi ++ fi ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 ++$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 ++$as_echo "$enable_gtk_doc" >&6; } ++ ++ # Check whether --enable-gtk-doc-html was given. ++if test "${enable_gtk_doc_html+set}" = set; then : ++ enableval=$enable_gtk_doc_html; ++else ++ enable_gtk_doc_html=yes ++fi ++ ++ # Check whether --enable-gtk-doc-pdf was given. ++if test "${enable_gtk_doc_pdf+set}" = set; then : ++ enableval=$enable_gtk_doc_pdf; ++else ++ enable_gtk_doc_pdf=no ++fi ++ ++ ++ if test -z "$GTKDOC_MKPDF"; then ++ enable_gtk_doc_pdf=no ++ fi + + + if test x$enable_gtk_doc = xyes; then +@@ -21976,6 +22320,22 @@ + ENABLE_GTK_DOC_FALSE= + fi + ++ if test x$enable_gtk_doc_html = xyes; then ++ GTK_DOC_BUILD_HTML_TRUE= ++ GTK_DOC_BUILD_HTML_FALSE='#' ++else ++ GTK_DOC_BUILD_HTML_TRUE='#' ++ GTK_DOC_BUILD_HTML_FALSE= ++fi ++ ++ if test x$enable_gtk_doc_pdf = xyes; then ++ GTK_DOC_BUILD_PDF_TRUE= ++ GTK_DOC_BUILD_PDF_FALSE='#' ++else ++ GTK_DOC_BUILD_PDF_TRUE='#' ++ GTK_DOC_BUILD_PDF_FALSE= ++fi ++ + if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' +@@ -21984,6 +22344,14 @@ + GTK_DOC_USE_LIBTOOL_FALSE= + fi + ++ if test -n "$GTKDOC_REBASE"; then ++ GTK_DOC_USE_REBASE_TRUE= ++ GTK_DOC_USE_REBASE_FALSE='#' ++else ++ GTK_DOC_USE_REBASE_TRUE='#' ++ GTK_DOC_USE_REBASE_FALSE= ++fi ++ + + + # This macro expands DIR and assigns it to RET. +@@ -22032,7 +22400,7 @@ + + + +-ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bemused/Makefile src/plugins/coherence_upnp/Makefile src/plugins/dbus-service/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/opensubtitles/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/plugins/jamendo/Makefile src/plugins/brasero-disc-recorder/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml" ++ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bbc/Makefile src/plugins/bemused/Makefile src/plugins/coherence_upnp/Makefile src/plugins/dbus-service/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/opensubtitles/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/plugins/jamendo/Makefile src/plugins/brasero-disc-recorder/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -22235,10 +22603,22 @@ + as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then ++ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then ++ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then + as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then ++ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + + : ${CONFIG_STATUS=./config.status} + ac_write_fail=0 +@@ -23198,6 +23578,7 @@ + "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;; ++ "src/plugins/bbc/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bbc/Makefile" ;; + "src/plugins/bemused/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bemused/Makefile" ;; + "src/plugins/coherence_upnp/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/coherence_upnp/Makefile" ;; + "src/plugins/dbus-service/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dbus-service/Makefile" ;; +diff -Naur totem-2.30.2.old/data/icons/16x16/Makefile.in totem-2.30.2/data/icons/16x16/Makefile.in +--- totem-2.30.2.old/data/icons/16x16/Makefile.in 2010-05-12 17:52:50.000000000 +0200 ++++ totem-2.30.2/data/icons/16x16/Makefile.in 2010-05-12 18:37:51.141829264 +0200 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -147,6 +149,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/data/icons/22x22/Makefile.in totem-2.30.2/data/icons/22x22/Makefile.in +--- totem-2.30.2.old/data/icons/22x22/Makefile.in 2010-05-12 17:52:50.000000000 +0200 ++++ totem-2.30.2/data/icons/22x22/Makefile.in 2010-05-12 18:37:51.225828478 +0200 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -147,6 +149,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/data/icons/24x24/Makefile.in totem-2.30.2/data/icons/24x24/Makefile.in +--- totem-2.30.2.old/data/icons/24x24/Makefile.in 2010-05-12 17:52:51.000000000 +0200 ++++ totem-2.30.2/data/icons/24x24/Makefile.in 2010-05-12 18:37:51.305828029 +0200 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -147,6 +149,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/data/icons/32x32/Makefile.in totem-2.30.2/data/icons/32x32/Makefile.in +--- totem-2.30.2.old/data/icons/32x32/Makefile.in 2010-05-12 17:52:51.000000000 +0200 ++++ totem-2.30.2/data/icons/32x32/Makefile.in 2010-05-12 18:37:51.373830878 +0200 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -147,6 +149,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/data/icons/48x48/Makefile.in totem-2.30.2/data/icons/48x48/Makefile.in +--- totem-2.30.2.old/data/icons/48x48/Makefile.in 2010-05-12 17:52:51.000000000 +0200 ++++ totem-2.30.2/data/icons/48x48/Makefile.in 2010-05-12 18:37:51.461828449 +0200 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -147,6 +149,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/data/icons/Makefile.in totem-2.30.2/data/icons/Makefile.in +--- totem-2.30.2.old/data/icons/Makefile.in 2010-05-12 17:52:51.000000000 +0200 ++++ totem-2.30.2/data/icons/Makefile.in 2010-05-12 18:37:51.525828208 +0200 +@@ -107,6 +107,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -163,6 +165,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/data/icons/scalable/Makefile.in totem-2.30.2/data/icons/scalable/Makefile.in +--- totem-2.30.2.old/data/icons/scalable/Makefile.in 2010-05-12 17:52:51.000000000 +0200 ++++ totem-2.30.2/data/icons/scalable/Makefile.in 2010-05-12 18:37:51.593829868 +0200 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -147,6 +149,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/data/Makefile.in totem-2.30.2/data/Makefile.in +--- totem-2.30.2.old/data/Makefile.in 2010-05-12 17:52:50.000000000 +0200 ++++ totem-2.30.2/data/Makefile.in 2010-05-12 18:37:51.065828825 +0200 +@@ -141,6 +141,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -197,6 +199,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/docs/Makefile.in totem-2.30.2/docs/Makefile.in +--- totem-2.30.2.old/docs/Makefile.in 2010-05-12 17:52:51.000000000 +0200 ++++ totem-2.30.2/docs/Makefile.in 2010-05-12 18:37:51.678828235 +0200 +@@ -107,6 +107,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -163,6 +165,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/docs/reference/Makefile.in totem-2.30.2/docs/reference/Makefile.in +--- totem-2.30.2.old/docs/reference/Makefile.in 2010-05-12 17:52:51.000000000 +0200 ++++ totem-2.30.2/docs/reference/Makefile.in 2010-05-12 18:37:51.790828707 +0200 +@@ -76,6 +76,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -132,6 +134,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +@@ -411,10 +415,10 @@ + $(DEPENDENCY_LIBS) + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make +@@ -433,7 +437,9 @@ + $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ + version.xml.in + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ++ pdf-build.stamp \ ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ ++ $(srcdir)/pdf.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -448,6 +454,10 @@ + $(DOC_MODULE)-unused.txt + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) ++@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = ++@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp ++@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = ++@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + @ENABLE_GTK_DOC_TRUE@TESTS_ENVIRONMENT = cd $(srcdir) && + @ENABLE_GTK_DOC_TRUE@TESTS = $(GTKDOC_CHECK) + all: all-am +@@ -738,10 +748,10 @@ + uninstall-local + + +-@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp ++@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + @ENABLE_GTK_DOC_FALSE@all-local: + +-docs: html-build.stamp ++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + + $(REPORT_FILES): sgml-build.stamp + +@@ -750,9 +760,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- cd $(srcdir) && \ ++ @cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -760,7 +770,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- touch scan-build.stamp ++ @touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -770,23 +780,23 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- touch tmpl-build.stamp ++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ @touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-tmpl/*.sgml: ++$(srcdir)/tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- cd $(srcdir) && \ ++ @cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- touch sgml-build.stamp ++ @touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -796,18 +806,37 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- rm -rf $(srcdir)/html +- mkdir $(srcdir)/html +- mkhtml_options=""; \ ++ @rm -rf $(srcdir)/html ++ @mkdir $(srcdir)/html ++ @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi +- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi; \ ++ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- touch html-build.stamp ++ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ @touch html-build.stamp ++ ++#### pdf #### ++ ++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) ++ @echo 'gtk-doc: Building PDF' ++ @-chmod -R u+w $(srcdir) ++ @rm -rf $(srcdir)/$(DOC_MODULE).pdf ++ @mkpdf_imgdirs=""; \ ++ if test "x$(HTML_IMAGES)" != "x"; then \ ++ for img in $(HTML_IMAGES); do \ ++ part=`dirname $$img`; \ ++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ ++ if test $$? != 0; then \ ++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ ++ fi; \ ++ done; \ ++ fi; \ ++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) ++ @touch pdf-build.stamp + + ############## + +@@ -817,14 +846,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) \ ++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- installfiles=`echo $(srcdir)/html/*`; \ ++ @installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -844,12 +873,11 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ ++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + + uninstall-local: +- if test -n "$(DOC_MODULE_VERSION)"; then \ ++ @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -866,16 +894,14 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl +- mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl +- -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html ++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur totem-2.30.2.old/gnome-doc-utils.make totem-2.30.2/gnome-doc-utils.make +--- totem-2.30.2.old/gnome-doc-utils.make 2010-05-12 17:52:42.000000000 +0200 ++++ totem-2.30.2/gnome-doc-utils.make 2010-05-12 18:37:43.665932255 +0200 +@@ -266,6 +266,13 @@ + .PHONY: po + po: $(_DOC_POFILES) + ++## @ _DOC_MOFILES ++## The .mo files used for translating the document ++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) ++ ++.PHONY: mo ++mo: $(_DOC_MOFILES) ++ + ## @ _DOC_LC_MODULES + ## The top-level documentation files in all other locales + _DOC_LC_MODULES = $(if $(DOC_MODULE), \ +@@ -332,16 +339,23 @@ + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ + fi + ++$(_DOC_MOFILES): %.mo: %.po ++ @if ! test -d $(dir $@); then \ ++ echo "mkdir $(dir $@)"; \ ++ mkdir "$(dir $@)"; \ ++ fi ++ msgfmt -o $@ $< ++ + # FIXME: fix the dependancy + # FIXME: hook xml2po up +-$(_DOC_LC_DOCS) : $(_DOC_POFILES) ++$(_DOC_LC_DOCS) : $(_DOC_MOFILES) + $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) + if ! test -d $(dir $@); then mkdir $(dir $@); fi + if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ +- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \ +- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \ ++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ ++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ + (cd $(dir $@) && \ +- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \ ++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ + "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) + +@@ -386,12 +400,14 @@ + clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) + clean-doc-lc: + rm -f $(_DOC_LC_DOCS) ++ rm -f $(_DOC_MOFILES) + @list='$(_DOC_POFILES)'; for po in $$list; do \ + if ! test "$$po" -ef "$(srcdir)/$$po"; then \ + echo "rm -f $$po"; \ + rm -f "$$po"; \ + fi; \ + done ++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x + @for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc/.xml2po.mo"; then \ + echo "rm -f $$lc/.xml2po.mo"; \ +diff -Naur totem-2.30.2.old/gtk-doc.make totem-2.30.2/gtk-doc.make +--- totem-2.30.2.old/gtk-doc.make 2010-05-12 17:52:42.000000000 +0200 ++++ totem-2.30.2/gtk-doc.make 2010-05-12 18:37:43.606303102 +0200 +@@ -5,13 +5,13 @@ + #################################### + + if GTK_DOC_USE_LIBTOOL +-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + GTKDOC_RUN = $(LIBTOOL) --mode=execute + else + GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = sh -c ++GTKDOC_RUN = + endif + + # We set GPATH here; this gives us semantics for GNU make +@@ -31,7 +31,9 @@ + $(DOC_MODULE)-overrides.txt + + DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ++ pdf-build.stamp \ ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ ++ $(srcdir)/pdf.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -48,12 +50,23 @@ + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + + if ENABLE_GTK_DOC +-all-local: html-build.stamp ++if GTK_DOC_BUILD_HTML ++HTML_BUILD_STAMP=html-build.stamp ++else ++HTML_BUILD_STAMP= ++endif ++if GTK_DOC_BUILD_PDF ++PDF_BUILD_STAMP=pdf-build.stamp ++else ++PDF_BUILD_STAMP= ++endif ++ ++all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + else + all-local: + endif + +-docs: html-build.stamp ++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + + $(REPORT_FILES): sgml-build.stamp + +@@ -62,9 +75,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- cd $(srcdir) && \ ++ @cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -72,7 +85,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- touch scan-build.stamp ++ @touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -82,24 +95,23 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- touch tmpl-build.stamp ++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ @touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-tmpl/*.sgml: ++$(srcdir)/tmpl/*.sgml: + @true + +- + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- cd $(srcdir) && \ ++ @cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- touch sgml-build.stamp ++ @touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -109,18 +121,37 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- rm -rf $(srcdir)/html +- mkdir $(srcdir)/html +- mkhtml_options=""; \ ++ @rm -rf $(srcdir)/html ++ @mkdir $(srcdir)/html ++ @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi +- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi; \ ++ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- touch html-build.stamp ++ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ @touch html-build.stamp ++ ++#### pdf #### ++ ++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) ++ @echo 'gtk-doc: Building PDF' ++ @-chmod -R u+w $(srcdir) ++ @rm -rf $(srcdir)/$(DOC_MODULE).pdf ++ @mkpdf_imgdirs=""; \ ++ if test "x$(HTML_IMAGES)" != "x"; then \ ++ for img in $(HTML_IMAGES); do \ ++ part=`dirname $$img`; \ ++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ ++ if test $$? != 0; then \ ++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ ++ fi; \ ++ done; \ ++ fi; \ ++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) ++ @touch pdf-build.stamp + + ############## + +@@ -130,14 +161,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) \ ++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- installfiles=`echo $(srcdir)/html/*`; \ ++ @installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -157,12 +188,11 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ ++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + + uninstall-local: +- if test -n "$(DOC_MODULE_VERSION)"; then \ ++ @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -182,15 +212,13 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl +- mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl +- -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html ++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs +diff -Naur totem-2.30.2.old/help/Makefile.in totem-2.30.2/help/Makefile.in +--- totem-2.30.2.old/help/Makefile.in 2010-05-12 17:52:52.000000000 +0200 ++++ totem-2.30.2/help/Makefile.in 2010-05-12 18:37:51.910828878 +0200 +@@ -92,6 +92,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -148,6 +150,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +@@ -388,6 +392,7 @@ + _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) + ++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) + _DOC_LC_MODULES = $(if $(DOC_MODULE), \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) + +@@ -743,6 +748,9 @@ + .PHONY: po + po: $(_DOC_POFILES) + ++.PHONY: mo ++mo: $(_DOC_MOFILES) ++ + $(_DOC_POFILES): + @if ! test -d $(dir $@); then \ + echo "mkdir $(dir $@)"; \ +@@ -770,16 +778,23 @@ + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ + fi + ++$(_DOC_MOFILES): %.mo: %.po ++ @if ! test -d $(dir $@); then \ ++ echo "mkdir $(dir $@)"; \ ++ mkdir "$(dir $@)"; \ ++ fi ++ msgfmt -o $@ $< ++ + # FIXME: fix the dependancy + # FIXME: hook xml2po up +-$(_DOC_LC_DOCS) : $(_DOC_POFILES) ++$(_DOC_LC_DOCS) : $(_DOC_MOFILES) + $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) + if ! test -d $(dir $@); then mkdir $(dir $@); fi + if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ +- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \ +- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \ ++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ ++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ + (cd $(dir $@) && \ +- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \ ++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ + "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) + .PHONY: pot +@@ -805,12 +820,14 @@ + clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) + clean-doc-lc: + rm -f $(_DOC_LC_DOCS) ++ rm -f $(_DOC_MOFILES) + @list='$(_DOC_POFILES)'; for po in $$list; do \ + if ! test "$$po" -ef "$(srcdir)/$$po"; then \ + echo "rm -f $$po"; \ + rm -f "$$po"; \ + fi; \ + done ++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x + @for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc/.xml2po.mo"; then \ + echo "rm -f $$lc/.xml2po.mo"; \ +diff -Naur totem-2.30.2.old/lib/Makefile.in totem-2.30.2/lib/Makefile.in +--- totem-2.30.2.old/lib/Makefile.in 2010-05-12 17:52:52.000000000 +0200 ++++ totem-2.30.2/lib/Makefile.in 2010-05-12 18:37:52.025829187 +0200 +@@ -104,6 +104,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -160,6 +162,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/ltmain.sh totem-2.30.2/ltmain.sh +--- totem-2.30.2.old/ltmain.sh 2010-05-12 17:52:41.000000000 +0200 ++++ totem-2.30.2/ltmain.sh 2010-05-12 18:37:43.065844049 +0200 +@@ -65,7 +65,7 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.6b ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 + # automake: $automake_version + # autoconf: $autoconf_version + # +@@ -73,7 +73,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=2.2.6b ++VERSION="2.2.6b Debian-2.2.6b-2" + TIMESTAMP="" + package_revision=1.3017 + +@@ -5033,7 +5033,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then +@@ -5344,19 +5347,19 @@ + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi +- tmp_libs= +- for deplib in $dependency_libs; do +- deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done + continue + fi # $pass = conv + +@@ -5893,6 +5896,7 @@ + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do ++ path= + case $deplib in + -L*) path="$deplib" ;; + *.la) +@@ -6206,6 +6210,9 @@ + revision="$number_minor" + lt_irix_increment=no + ;; ++ *) ++ func_fatal_configuration "$modename: unknown library version type \`$version_type'" ++ ;; + esac + ;; + no) +diff -Naur totem-2.30.2.old/Makefile.in totem-2.30.2/Makefile.in +--- totem-2.30.2.old/Makefile.in 2010-05-12 17:52:58.000000000 +0200 ++++ totem-2.30.2/Makefile.in 2010-05-12 18:37:55.393827973 +0200 +@@ -124,6 +124,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -180,6 +182,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/backend/Makefile.in totem-2.30.2/src/backend/Makefile.in +--- totem-2.30.2.old/src/backend/Makefile.in 2010-05-12 17:52:53.000000000 +0200 ++++ totem-2.30.2/src/backend/Makefile.in 2010-05-12 18:37:52.601828999 +0200 +@@ -121,6 +121,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -177,6 +179,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/Makefile.in totem-2.30.2/src/Makefile.in +--- totem-2.30.2.old/src/Makefile.in 2010-05-12 17:52:52.000000000 +0200 ++++ totem-2.30.2/src/Makefile.in 2010-05-12 18:37:52.429831223 +0200 +@@ -343,6 +343,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -399,6 +401,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/bbc/Makefile.in totem-2.30.2/src/plugins/bbc/Makefile.in +--- totem-2.30.2.old/src/plugins/bbc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ totem-2.30.2/src/plugins/bbc/Makefile.in 2010-05-12 18:37:52.869828975 +0200 +@@ -0,0 +1,598 @@ ++# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++subdir = src/plugins/bbc ++DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++AM_V_GEN = $(am__v_GEN_$(V)) ++am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) ++am__v_GEN_0 = @echo " GEN " $@; ++AM_V_at = $(am__v_at_$(V)) ++am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) ++am__v_at_0 = @ ++SOURCES = ++DIST_SOURCES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" ++py_compile = $(top_srcdir)/py-compile ++DATA = $(plugin_DATA) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = @ACLOCAL@ ++ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ++ALL_LINGUAS = @ALL_LINGUAS@ ++ALL_PLUGINS = @ALL_PLUGINS@ ++AMTAR = @AMTAR@ ++AM_CFLAGS = @AM_CFLAGS@ ++AM_CPPFLAGS = @AM_CPPFLAGS@ ++AM_CXXFLAGS = @AM_CXXFLAGS@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++AM_LDFLAGS = @AM_LDFLAGS@ ++AR = @AR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ ++BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ ++BEMUSED_LIBS = @BEMUSED_LIBS@ ++BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ ++BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ ++BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ ++CATALOGS = @CATALOGS@ ++CATOBJEXT = @CATOBJEXT@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DATADIRNAME = @DATADIRNAME@ ++DBUS_BIND = @DBUS_BIND@ ++DBUS_CFLAGS = @DBUS_CFLAGS@ ++DBUS_LIBS = @DBUS_LIBS@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ ++DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ ++DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ ++DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ ++DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ ++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ++DOC_USER_FORMATS = @DOC_USER_FORMATS@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ ++FGREP = @FGREP@ ++FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ ++GCONFTOOL = @GCONFTOOL@ ++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ ++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ ++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ ++GLIB_MKENUMS = @GLIB_MKENUMS@ ++GMOFILES = @GMOFILES@ ++GMSGFMT = @GMSGFMT@ ++GMYTH_CFLAGS = @GMYTH_CFLAGS@ ++GMYTH_LIBS = @GMYTH_LIBS@ ++GREP = @GREP@ ++GST_CFLAGS = @GST_CFLAGS@ ++GST_LIBS = @GST_LIBS@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ ++GTK_CFLAGS = @GTK_CFLAGS@ ++GTK_LIBS = @GTK_LIBS@ ++HELP_DIR = @HELP_DIR@ ++HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++INSTOBJEXT = @INSTOBJEXT@ ++INTLLIBS = @INTLLIBS@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++INTLTOOL_MERGE = @INTLTOOL_MERGE@ ++INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++LD = @LD@ ++LDFLAGS = @LDFLAGS@ ++LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ ++LIBEPC_LIBS = @LIBEPC_LIBS@ ++LIBGALAGO_CFLAGS = @LIBGALAGO_CFLAGS@ ++LIBGALAGO_LIBS = @LIBGALAGO_LIBS@ ++LIBGDATA_0_7_CFLAGS = @LIBGDATA_0_7_CFLAGS@ ++LIBGDATA_0_7_LIBS = @LIBGDATA_0_7_LIBS@ ++LIBGDATA_CFLAGS = @LIBGDATA_CFLAGS@ ++LIBGDATA_LIBS = @LIBGDATA_LIBS@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBTOOL = @LIBTOOL@ ++LIPO = @LIPO@ ++LIRC_LIBS = @LIRC_LIBS@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MEDIA_PLAYER_KEYS_CFLAGS = @MEDIA_PLAYER_KEYS_CFLAGS@ ++MEDIA_PLAYER_KEYS_LIBS = @MEDIA_PLAYER_KEYS_LIBS@ ++MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ ++MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ ++MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ ++MM_CFLAGS = @MM_CFLAGS@ ++MM_LIBS = @MM_LIBS@ ++MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NAUTILUSDIR = @NAUTILUSDIR@ ++NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ ++NAUTILUS_LIBS = @NAUTILUS_LIBS@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ ++NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ ++OBJDUMP = @OBJDUMP@ ++OBJEXT = @OBJEXT@ ++OMF_DIR = @OMF_DIR@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PKG_CONFIG = @PKG_CONFIG@ ++PLUGINDIR = @PLUGINDIR@ ++PLUGINS = @PLUGINS@ ++POFILES = @POFILES@ ++POSUB = @POSUB@ ++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ ++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ ++PYGTK_CFLAGS = @PYGTK_CFLAGS@ ++PYGTK_CODEGEN = @PYGTK_CODEGEN@ ++PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ ++PYGTK_H2DEF = @PYGTK_H2DEF@ ++PYGTK_LIBS = @PYGTK_LIBS@ ++PYTHON = @PYTHON@ ++PYTHON_CFLAGS = @PYTHON_CFLAGS@ ++PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ ++PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ ++PYTHON_LIBS = @PYTHON_LIBS@ ++PYTHON_LIB_LOC = @PYTHON_LIB_LOC@ ++PYTHON_PLATFORM = @PYTHON_PLATFORM@ ++PYTHON_PREFIX = @PYTHON_PREFIX@ ++PYTHON_VERSION = @PYTHON_VERSION@ ++RANLIB = @RANLIB@ ++SCREENSAVER_CFLAGS = @SCREENSAVER_CFLAGS@ ++SCREENSAVER_LIBS = @SCREENSAVER_LIBS@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ ++SMCLIENT_LIBS = @SMCLIENT_LIBS@ ++STRIP = @STRIP@ ++TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ ++TOTEM_VERSION_MICRO = @TOTEM_VERSION_MICRO@ ++TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@ ++TRACKER_CFLAGS = @TRACKER_CFLAGS@ ++TRACKER_LIBS = @TRACKER_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ ++USE_NLS = @USE_NLS@ ++VALAC = @VALAC@ ++VALA_CFLAGS = @VALA_CFLAGS@ ++VALA_LIBS = @VALA_LIBS@ ++VERSION = @VERSION@ ++WARN_CFLAGS = @WARN_CFLAGS@ ++WARN_CXXFLAGS = @WARN_CXXFLAGS@ ++XGETTEXT = @XGETTEXT@ ++XMKMF = @XMKMF@ ++XTEST_LIBS = @XTEST_LIBS@ ++XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@ ++XVIDMODE_LIBS = @XVIDMODE_LIBS@ ++X_LIBS = @X_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++pkgpyexecdir = @pkgpyexecdir@ ++pkgpythondir = @pkgpythondir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++pyexecdir = @pyexecdir@ ++pythondir = @pythondir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++plugindir = $(PLUGINDIR)/bbc ++plugin_PYTHON = bbc.py contentview.py genres.py installablecodecs.py ++plugin_in_files = bbc.totem-plugin.in ++plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin) ++EXTRA_DIST = $(plugin_in_files) bbc.py contentview.py genres.py installablecodecs.py ++CLEANFILES = $(plugin_DATA) ++DISTCLEANFILES = $(plugin_DATA) ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/bbc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/plugins/bbc/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++install-pluginPYTHON: $(plugin_PYTHON) ++ @$(NORMAL_INSTALL) ++ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ @list='$(plugin_PYTHON)'; dlist=; list2=; test -n "$(plugindir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ ++ if test -f $$b$$p; then \ ++ $(am__strip_dir) \ ++ dlist="$$dlist $$f"; \ ++ list2="$$list2 $$b$$p"; \ ++ else :; fi; \ ++ done; \ ++ for file in $$list2; do echo $$file; done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \ ++ done || exit $$?; \ ++ if test -n "$$dlist"; then \ ++ if test -z "$(DESTDIR)"; then \ ++ PYTHON=$(PYTHON) $(py_compile) --basedir "$(plugindir)" $$dlist; \ ++ else \ ++ PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(plugindir)" $$dlist; \ ++ fi; \ ++ else :; fi ++ ++uninstall-pluginPYTHON: ++ @$(NORMAL_UNINSTALL) ++ @list='$(plugin_PYTHON)'; test -n "$(plugindir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ filesc=`echo "$$files" | sed 's|$$|c|'`; \ ++ fileso=`echo "$$files" | sed 's|$$|o|'`; \ ++ echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(plugindir)" && rm -f $$files || exit $$?; \ ++ echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$filesc ")"; \ ++ cd "$(DESTDIR)$(plugindir)" && rm -f $$filesc || exit $$?; \ ++ echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$fileso ")"; \ ++ cd "$(DESTDIR)$(plugindir)" && rm -f $$fileso ++install-pluginDATA: $(plugin_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" ++ @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \ ++ done ++ ++uninstall-pluginDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(plugindir)" && rm -f $$files ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(DATA) ++installdirs: ++ for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++html-am: ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: install-pluginDATA install-pluginPYTHON ++ ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ ++install-exec-am: ++ ++install-html: install-html-am ++ ++install-html-am: ++ ++install-info: install-info-am ++ ++install-info-am: ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-pluginDATA uninstall-pluginPYTHON ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic clean-libtool \ ++ distclean distclean-generic distclean-libtool distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-pluginDATA install-pluginPYTHON \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-pluginDATA uninstall-pluginPYTHON ++ ++ ++%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache ++ ++pychecker: ++ PYTHONPATH=$(top_srcdir)/src/plugins/bbc:$$PYTHONPATH \ ++ pychecker $(wildcard $(top_srcdir)/src/plugins/bbc/*py) ++ ++pyflakes: ++ pyflakes $(wildcard $(top_srcdir)/src/plugins/bbc/*py) ++ ++check: pychecker pyflakes ++ echo ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -Naur totem-2.30.2.old/src/plugins/bemused/Makefile.in totem-2.30.2/src/plugins/bemused/Makefile.in +--- totem-2.30.2.old/src/plugins/bemused/Makefile.in 2010-05-12 17:52:53.000000000 +0200 ++++ totem-2.30.2/src/plugins/bemused/Makefile.in 2010-05-12 18:37:52.977854442 +0200 +@@ -125,6 +125,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -181,6 +183,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/brasero-disc-recorder/Makefile.in totem-2.30.2/src/plugins/brasero-disc-recorder/Makefile.in +--- totem-2.30.2.old/src/plugins/brasero-disc-recorder/Makefile.in 2010-05-12 17:52:53.000000000 +0200 ++++ totem-2.30.2/src/plugins/brasero-disc-recorder/Makefile.in 2010-05-12 18:37:53.085828224 +0200 +@@ -128,6 +128,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -184,6 +186,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/coherence_upnp/Makefile.in totem-2.30.2/src/plugins/coherence_upnp/Makefile.in +--- totem-2.30.2.old/src/plugins/coherence_upnp/Makefile.in 2010-05-12 17:52:53.000000000 +0200 ++++ totem-2.30.2/src/plugins/coherence_upnp/Makefile.in 2010-05-12 18:37:53.170829106 +0200 +@@ -93,6 +93,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -149,6 +151,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/dbus-service/Makefile.in totem-2.30.2/src/plugins/dbus-service/Makefile.in +--- totem-2.30.2.old/src/plugins/dbus-service/Makefile.in 2010-05-12 17:52:54.000000000 +0200 ++++ totem-2.30.2/src/plugins/dbus-service/Makefile.in 2010-05-12 18:37:53.254827972 +0200 +@@ -93,6 +93,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -149,6 +151,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/galago/Makefile.in totem-2.30.2/src/plugins/galago/Makefile.in +--- totem-2.30.2.old/src/plugins/galago/Makefile.in 2010-05-12 17:52:54.000000000 +0200 ++++ totem-2.30.2/src/plugins/galago/Makefile.in 2010-05-12 18:37:53.362829340 +0200 +@@ -125,6 +125,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -181,6 +183,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/gromit/Makefile.in totem-2.30.2/src/plugins/gromit/Makefile.in +--- totem-2.30.2.old/src/plugins/gromit/Makefile.in 2010-05-12 17:52:54.000000000 +0200 ++++ totem-2.30.2/src/plugins/gromit/Makefile.in 2010-05-12 18:37:53.466827968 +0200 +@@ -124,6 +124,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -180,6 +182,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/iplayer/Makefile.in totem-2.30.2/src/plugins/iplayer/Makefile.in +--- totem-2.30.2.old/src/plugins/iplayer/Makefile.in 2010-05-12 17:52:54.000000000 +0200 ++++ totem-2.30.2/src/plugins/iplayer/Makefile.in 2010-05-12 18:37:53.570828761 +0200 +@@ -94,6 +94,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -150,6 +152,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/jamendo/Makefile.in totem-2.30.2/src/plugins/jamendo/Makefile.in +--- totem-2.30.2.old/src/plugins/jamendo/Makefile.in 2010-05-12 17:52:54.000000000 +0200 ++++ totem-2.30.2/src/plugins/jamendo/Makefile.in 2010-05-12 18:37:53.642828551 +0200 +@@ -94,6 +94,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -150,6 +152,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/lirc/Makefile.in totem-2.30.2/src/plugins/lirc/Makefile.in +--- totem-2.30.2.old/src/plugins/lirc/Makefile.in 2010-05-12 17:52:54.000000000 +0200 ++++ totem-2.30.2/src/plugins/lirc/Makefile.in 2010-05-12 18:37:53.734828923 +0200 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -182,6 +184,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/Makefile.in totem-2.30.2/src/plugins/Makefile.in +--- totem-2.30.2.old/src/plugins/Makefile.in 2010-05-12 17:52:53.000000000 +0200 ++++ totem-2.30.2/src/plugins/Makefile.in 2010-05-12 18:37:52.765828044 +0200 +@@ -167,6 +167,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -223,6 +225,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/media-player-keys/Makefile.in totem-2.30.2/src/plugins/media-player-keys/Makefile.in +--- totem-2.30.2.old/src/plugins/media-player-keys/Makefile.in 2010-05-12 17:52:55.000000000 +0200 ++++ totem-2.30.2/src/plugins/media-player-keys/Makefile.in 2010-05-12 18:37:53.826828256 +0200 +@@ -130,6 +130,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -186,6 +188,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/mythtv/Makefile.in totem-2.30.2/src/plugins/mythtv/Makefile.in +--- totem-2.30.2.old/src/plugins/mythtv/Makefile.in 2010-05-12 17:52:55.000000000 +0200 ++++ totem-2.30.2/src/plugins/mythtv/Makefile.in 2010-05-12 18:37:53.921828531 +0200 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -182,6 +184,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/ontop/Makefile.in totem-2.30.2/src/plugins/ontop/Makefile.in +--- totem-2.30.2.old/src/plugins/ontop/Makefile.in 2010-05-12 17:52:55.000000000 +0200 ++++ totem-2.30.2/src/plugins/ontop/Makefile.in 2010-05-12 18:37:54.009828130 +0200 +@@ -124,6 +124,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -180,6 +182,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/opensubtitles/Makefile.in totem-2.30.2/src/plugins/opensubtitles/Makefile.in +--- totem-2.30.2.old/src/plugins/opensubtitles/Makefile.in 2010-05-12 17:52:55.000000000 +0200 ++++ totem-2.30.2/src/plugins/opensubtitles/Makefile.in 2010-05-12 18:37:54.097828492 +0200 +@@ -94,6 +94,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -150,6 +152,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/properties/Makefile.in totem-2.30.2/src/plugins/properties/Makefile.in +--- totem-2.30.2.old/src/plugins/properties/Makefile.in 2010-05-12 17:52:55.000000000 +0200 ++++ totem-2.30.2/src/plugins/properties/Makefile.in 2010-05-12 18:37:54.197828205 +0200 +@@ -137,6 +137,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -193,6 +195,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/publish/Makefile.in totem-2.30.2/src/plugins/publish/Makefile.in +--- totem-2.30.2.old/src/plugins/publish/Makefile.in 2010-05-12 17:52:56.000000000 +0200 ++++ totem-2.30.2/src/plugins/publish/Makefile.in 2010-05-12 18:37:54.285828488 +0200 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -182,6 +184,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/pythonconsole/Makefile.in totem-2.30.2/src/plugins/pythonconsole/Makefile.in +--- totem-2.30.2.old/src/plugins/pythonconsole/Makefile.in 2010-05-12 17:52:56.000000000 +0200 ++++ totem-2.30.2/src/plugins/pythonconsole/Makefile.in 2010-05-12 18:37:54.357828635 +0200 +@@ -93,6 +93,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -149,6 +151,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/sample-python/Makefile.in totem-2.30.2/src/plugins/sample-python/Makefile.in +--- totem-2.30.2.old/src/plugins/sample-python/Makefile.in 2010-05-12 17:52:56.000000000 +0200 ++++ totem-2.30.2/src/plugins/sample-python/Makefile.in 2010-05-12 18:37:54.421827831 +0200 +@@ -67,6 +67,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -123,6 +125,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/sample-vala/Makefile.in totem-2.30.2/src/plugins/sample-vala/Makefile.in +--- totem-2.30.2.old/src/plugins/sample-vala/Makefile.in 2010-05-12 17:52:56.000000000 +0200 ++++ totem-2.30.2/src/plugins/sample-vala/Makefile.in 2010-05-12 18:37:54.525828627 +0200 +@@ -129,6 +129,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -185,6 +187,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/screensaver/Makefile.in totem-2.30.2/src/plugins/screensaver/Makefile.in +--- totem-2.30.2.old/src/plugins/screensaver/Makefile.in 2010-05-12 17:52:56.000000000 +0200 ++++ totem-2.30.2/src/plugins/screensaver/Makefile.in 2010-05-12 18:37:54.621830563 +0200 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -182,6 +184,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/screenshot/Makefile.in totem-2.30.2/src/plugins/screenshot/Makefile.in +--- totem-2.30.2.old/src/plugins/screenshot/Makefile.in 2010-05-12 17:52:56.000000000 +0200 ++++ totem-2.30.2/src/plugins/screenshot/Makefile.in 2010-05-12 18:37:54.737827907 +0200 +@@ -131,6 +131,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -187,6 +189,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/sidebar-test/Makefile.in totem-2.30.2/src/plugins/sidebar-test/Makefile.in +--- totem-2.30.2.old/src/plugins/sidebar-test/Makefile.in 2010-05-12 17:52:57.000000000 +0200 ++++ totem-2.30.2/src/plugins/sidebar-test/Makefile.in 2010-05-12 18:37:54.825827991 +0200 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -182,6 +184,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/skipto/Makefile.in totem-2.30.2/src/plugins/skipto/Makefile.in +--- totem-2.30.2.old/src/plugins/skipto/Makefile.in 2010-05-12 17:52:57.000000000 +0200 ++++ totem-2.30.2/src/plugins/skipto/Makefile.in 2010-05-12 18:37:54.925828062 +0200 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -182,6 +184,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/thumbnail/Makefile.in totem-2.30.2/src/plugins/thumbnail/Makefile.in +--- totem-2.30.2.old/src/plugins/thumbnail/Makefile.in 2010-05-12 17:52:57.000000000 +0200 ++++ totem-2.30.2/src/plugins/thumbnail/Makefile.in 2010-05-12 18:37:55.013828360 +0200 +@@ -125,6 +125,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -181,6 +183,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/totem/Makefile.in totem-2.30.2/src/plugins/totem/Makefile.in +--- totem-2.30.2.old/src/plugins/totem/Makefile.in 2010-05-12 17:52:57.000000000 +0200 ++++ totem-2.30.2/src/plugins/totem/Makefile.in 2010-05-12 18:37:55.081827926 +0200 +@@ -91,6 +91,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -147,6 +149,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/tracker/Makefile.in totem-2.30.2/src/plugins/tracker/Makefile.in +--- totem-2.30.2.old/src/plugins/tracker/Makefile.in 2010-05-12 17:52:57.000000000 +0200 ++++ totem-2.30.2/src/plugins/tracker/Makefile.in 2010-05-12 18:37:55.177828529 +0200 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -182,6 +184,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ +diff -Naur totem-2.30.2.old/src/plugins/youtube/Makefile.in totem-2.30.2/src/plugins/youtube/Makefile.in +--- totem-2.30.2.old/src/plugins/youtube/Makefile.in 2010-05-12 17:52:58.000000000 +0200 ++++ totem-2.30.2/src/plugins/youtube/Makefile.in 2010-05-12 18:37:55.265827902 +0200 +@@ -126,6 +126,8 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ ++BBC_CFLAGS = @BBC_CFLAGS@ ++BBC_LIBS = @BBC_LIBS@ + BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ + BEMUSED_LIBS = @BEMUSED_LIBS@ + BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ +@@ -182,6 +184,8 @@ + GST_CFLAGS = @GST_CFLAGS@ + GST_LIBS = @GST_LIBS@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_MKPDF = @GTKDOC_MKPDF@ ++GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ --- totem-2.30.2.orig/debian/patches/82_youtube_api.patch +++ totem-2.30.2/debian/patches/82_youtube_api.patch @@ -0,0 +1,90 @@ +From b172b8be2cffdf4e9f445e2a44c2e7de04293163 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Fri, 23 Jul 2010 17:32:38 +0000 +Subject: Bug 625013 — Can't play "GUADEC 2010 STATE OF THE UNION Teaser" + +YouTube changed the page format again, necessitating a change in the way +video URIs are scraped from the playback page. Closes: bgo#625013 +--- +diff --git a/src/plugins/youtube/totem-youtube.c b/src/plugins/youtube/totem-youtube.c +index 61199bd..45a2698 100644 +--- a/src/plugins/youtube/totem-youtube.c ++++ b/src/plugins/youtube/totem-youtube.c +@@ -394,14 +394,6 @@ impl_deactivate (TotemPlugin *plugin, TotemObject *totem) + g_regex_unref (self->regex); + } + +-static const gchar * +-get_fmt_param (TotemYouTubePlugin *self) +-{ +- if (bacon_video_widget_get_connection_speed (self->bvw) >= 10) +- return "&fmt=18"; +- return ""; +-} +- + typedef struct { + TotemYouTubePlugin *plugin; + guint tree_view; +@@ -510,29 +502,32 @@ resolve_t_param_cb (GObject *source_object, GAsyncResult *result, TParamData *da + + video_id = gdata_youtube_video_get_video_id (GDATA_YOUTUBE_VIDEO (data->entry)); + +- /* Check for the t parameter, which is now in a JavaScript array on the video page */ ++ /* Check for the fmt_url_map parameter */ + g_regex_match (self->regex, contents, 0, &match_info); + if (g_match_info_matches (match_info) == TRUE) { +- gchar *t_param, *s; +- const gchar *fmt_param; +- GString *video_uri_string; ++ gchar *fmt_url_map_escaped, *fmt_url_map; ++ gchar **mappings, **i; + + /* We have a match */ +- s = g_match_info_fetch (match_info, 1); +- t_param = g_uri_unescape_string (s, NULL); +- if (t_param == NULL) +- t_param = s; +- else +- g_free (s); +- fmt_param = get_fmt_param (self); +- +- video_uri_string = g_string_new ("http://www.youtube.com/get_video?video_id="); +- g_string_append_uri_escaped (video_uri_string, video_id, NULL, TRUE); +- g_string_append (video_uri_string, "&t="); +- g_string_append_uri_escaped (video_uri_string, t_param, NULL, TRUE); +- g_string_append (video_uri_string, fmt_param); +- +- video_uri = g_string_free (video_uri_string, FALSE); ++ fmt_url_map_escaped = g_match_info_fetch (match_info, 1); ++ fmt_url_map = g_uri_unescape_string (fmt_url_map_escaped, NULL); ++ g_free (fmt_url_map_escaped); ++ ++ /* The fmt_url_map parameter is in the following format: ++ * fmt1|uri1,fmt2|uri2,fmt3|uri3,... ++ * where fmtN is an identifier for the audio and video encoding and resolution as described here: ++ * (http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs) and uriN is the playback URI for that format. */ ++ mappings = g_strsplit (fmt_url_map, ",", 0); ++ ++ for (i = mappings; *i != NULL; i++) { ++ /* For the moment we just take the first format we get */ ++ gchar **mapping = g_strsplit (*i, "|", 2); ++ video_uri = g_strdup (mapping[1]); ++ g_strfreev (mapping); ++ break; ++ } ++ ++ g_strfreev (mappings); + } else { + GDataMediaContent *content; + +@@ -854,7 +849,7 @@ search_button_clicked_cb (GtkButton *button, TotemYouTubePlugin *self) + * cycles repeatedly creating new regexes for each video whose t param we resolve. */ + /* We're looking for a line of the form: + * var swfHTML = (isIE) ? "regex = g_regex_new ("swfHTML = .*&t=([^&]+)&", G_REGEX_OPTIMIZE, 0, NULL); ++ self->regex = g_regex_new ("swfHTML = .*&fmt_url_map=([^&]+)&", G_REGEX_OPTIMIZE, 0, NULL); + g_assert (self->regex != NULL); + + /* Set up the GData service (needed for the tree views' queries) */ +-- +cgit v0.8.3.1 --- totem-2.30.2.orig/debian/patches/81_mpegts.patch +++ totem-2.30.2/debian/patches/81_mpegts.patch @@ -0,0 +1,22 @@ +From 046920a4b1a1e4b085e1faded57d47e45492d368 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Sat, 22 May 2010 11:54:18 +0000 +Subject: Add support for video/mp2t + +https://bugzilla.gnome.org/show_bug.cgi?id=614422 +--- +diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt +index a6eab04..8cf04e9 100644 +--- a/data/mime-type-list.txt ++++ b/data/mime-type-list.txt +@@ -72,6 +72,7 @@ video/3gpp + video/dv + video/fli + video/flv ++video/mp2t + video/mp4 + video/mp4v-es + video/mpeg +-- +cgit v0.8.3.1 + --- totem-2.30.2.orig/debian/patches/70_bbc_plugin.patch +++ totem-2.30.2/debian/patches/70_bbc_plugin.patch @@ -0,0 +1,1617 @@ +Index: b/bindings/python/totem.defs +=================================================================== +--- a/bindings/python/totem.defs ++++ b/bindings/python/totem.defs +@@ -216,6 +216,16 @@ + (return-type "none") + ) + ++(define-method action_set_mrl_and_play ++ (of-object "TotemObject") ++ (c-name "totem_action_set_mrl_and_play") ++ (return-type "none") ++ (parameters ++ '("const-char*" "mrl") ++ '("const-char*" "subtitle_mrl" (null-ok) (default "NULL")) ++ ) ++) ++ + (define-method action_stop + (of-object "TotemObject") + (c-name "totem_action_stop") +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -52,7 +52,7 @@ + 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 jamendo opensubtitles screenshot brasero-disc-recorder coherence_upnp dbus-service iplayer" ++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 dbus-service iplayer bbc" + + PLUGINDIR='${libdir}/totem/plugins' + AC_SUBST(PLUGINDIR) +@@ -512,6 +512,32 @@ + add_plugin="0" + fi + ;; ++ bbc) ++ # pygobject >= 2.15.3 for gio support ++ # pygtk >= 2.13.0 for gtk_tree_view_get_tooltip_context support ++ PKG_CHECK_MODULES([BBC], ++ [ pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 ], ++ [ HAVE_BBCSTUFF=yes ], [ HAVE_BBCSTUFF=no ]) ++ if test "x$HAVE_BBCSTUFF" != "xyes"; then ++ plugin_error_or_ignore "you need pygobject-2.0 >= 2.15.3 and gst-python-0.10 >= 0.10.11 and pygtk-2.0 >= 2.13.0 installed for the BBC plugin" ++ add_plugin="0" ++ fi ++ # only require python apt and gdbm where we would actually be using it, ie. on ubuntu ++ bbc_py_pkg_reqs='' ++ if test -f /etc/debian_version ; then ++ bbc_distro_id=`lsb_release -s -i 2>/dev/null` ++ if test x$bbc_distro_id = xUbuntu; then ++ bbc_py_pkg_reqs="apt gdbm" ++ fi ++ fi ++ for pymodule in rdflib.Graph xdg $bbc_py_pkg_reqs ++ do ++ if ! $PYTHON -c "import $pymodule" 2>/dev/null >/dev/null; then ++ plugin_error_or_ignore "you need the python $pymodule module installed for the BBC plugin" ++ add_plugin="0" ++ fi ++ done ++ ;; + bemused) + PKG_CHECK_MODULES(BEMUSED, bluez, [HAVE_BLUEZ=yes], [HAVE_BLUEZ=no]) + if test "${HAVE_BLUEZ}" != "yes" ; then +@@ -814,6 +840,7 @@ + lib/Makefile + src/Makefile + src/plugins/Makefile ++src/plugins/bbc/Makefile + src/plugins/bemused/Makefile + src/plugins/coherence_upnp/Makefile + src/plugins/dbus-service/Makefile +Index: b/src/plugins/bbc/Makefile.am +=================================================================== +--- /dev/null ++++ b/src/plugins/bbc/Makefile.am +@@ -0,0 +1,26 @@ ++plugindir = $(PLUGINDIR)/bbc ++plugin_PYTHON = bbc.py contentview.py genres.py installablecodecs.py ++ ++plugin_in_files = bbc.totem-plugin.in ++ ++%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache ++ ++plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin) ++ ++EXTRA_DIST = $(plugin_in_files) bbc.py contentview.py genres.py installablecodecs.py ++ ++CLEANFILES = $(plugin_DATA) ++DISTCLEANFILES = $(plugin_DATA) ++ ++ ++pychecker: ++ PYTHONPATH=$(top_srcdir)/src/plugins/bbc:$$PYTHONPATH \ ++ pychecker $(wildcard $(top_srcdir)/src/plugins/bbc/*py) ++ ++pyflakes: ++ pyflakes $(wildcard $(top_srcdir)/src/plugins/bbc/*py) ++ ++check: pychecker pyflakes ++ echo ++ ++ +Index: b/src/plugins/bbc/bbc.py +=================================================================== +--- /dev/null ++++ b/src/plugins/bbc/bbc.py +@@ -0,0 +1,95 @@ ++#!/usr/bin/python ++# coding=UTF-8 ++# ++# Copyright (C) 2008 Tim-Philipp Müller ++# Copyright (C) 2008 Canonical Ltd. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# The Totem project hereby grant permission for non-gpl compatible GStreamer ++# plugins to be used and distributed together with GStreamer and Totem. This ++# permission are above and beyond the permissions granted by the GPL license ++# Totem is covered by. ++# ++# See license_change file for details. ++ ++import gobject ++gobject.threads_init() ++import pygst ++pygst.require ("0.10") ++import gst ++ ++import totem ++import gtk ++import gconf ++import time ++import os ++from contentview import ContentView ++ ++class BBCViewer(totem.Plugin): ++ def __init__ (self): ++ totem.Plugin.__init__ (self) ++ self.loaded_content = False ++ ++ def mapped (self, contentview): ++ gst.log('mapped') ++ if not self.loaded_content: ++ self.view.load() ++ self.loaded_content = True ++ ++ def activate (self, totem_object): ++ self.gconf_client = gconf.client_get_default () ++ self.totem = totem_object ++ self.view = ContentView() ++ self.view.connect('play-episode', self.playEpisode) ++ vbox = gtk.VBox() ++ scrollwin = gtk.ScrolledWindow() ++ scrollwin.add(self.view) ++ scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) ++ scrollwin.set_shadow_type(gtk.SHADOW_ETCHED_IN) ++ vbox.pack_start(scrollwin, True, True) ++ vbox.show_all () ++ totem_object.add_sidebar_page ("bbc", _("BBC"), vbox) ++ # connect to 'map' only after adding the sidebar page ++ self.view.connect('map', self.mapped) ++ gst.log('activated') ++ ++ def deactivate (self, totem_object): ++ totem_object.remove_sidebar_page ("bbc") ++ self.loaded_content = False ++ ++ def getConnectionSpeed(self): ++ speed_map = [ 14400, 19200, 28800, 33600, 34400, ++ 56000, 112000, 256000, 384000, 512000, ++ 1536000, 10752000 ] ++ speed_enum = self.gconf_client.get_int("/apps/totem/connection_speed") ++ if speed_enum >= 0 and speed_enum < len(speed_map): ++ speed_kbps = speed_map[speed_enum] / 1000 ++ else: ++ speed_kbps = 0 ++ gst.log('Configured connection speed #%d: %d kbit/s' % (speed_enum, speed_kbps)) ++ return speed_kbps ++ ++ def playEpisode (self, view, episode): ++ gst.info('Playing episode ' + episode.title) ++ mrl = episode.getUri(self.getConnectionSpeed()) ++ if mrl: ++ gst.log('Playing uri ' + mrl) ++ self.totem.action_set_mrl_and_play(mrl, None) ++ #self.totem.action_remote(totem.REMOTE_COMMAND_ENQUEUE, mrl) ++ #self.totem.action_remote(totem.REMOTE_COMMAND_PLAY, mrl) ++ else: ++ gst.error('No uri for episode ' + episode.title) ++ +Index: b/src/plugins/bbc/bbc.totem-plugin.in +=================================================================== +--- /dev/null ++++ b/src/plugins/bbc/bbc.totem-plugin.in +@@ -0,0 +1,9 @@ ++[Totem Plugin] ++Loader=python ++Module=bbc ++IAge=1 ++_Name=BBC content viewer ++_Description=Watch or listen to selected video and audio content made available by the British Broadcasting Corporation (BBC) ++Authors=Tim-Philipp Müller ++Copyright=Copyright © 2008 Tim-Philipp Müller and Canonical Ltd. ++Website=http://www.gnome.org/projects/totem/ +Index: b/src/plugins/bbc/contentview.py +=================================================================== +--- /dev/null ++++ b/src/plugins/bbc/contentview.py +@@ -0,0 +1,1019 @@ ++#!/usr/bin/python ++# coding=UTF-8 ++# ++# Copyright (C) 2008 Tim-Philipp Müller ++# Copyright (C) 2008 Canonical Ltd. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# The Totem project hereby grant permission for non-gpl compatible GStreamer ++# plugins to be used and distributed together with GStreamer and Totem. This ++# permission are above and beyond the permissions granted by the GPL license ++# Totem is covered by. ++# ++# See license_change file for details. ++# ++# TODO: ++# - clean up code: mixed studlyCaps and foo_bar; mixed callbacks and signals ++ ++import gobject ++gobject.threads_init() ++import glib ++import gio ++import pygst ++pygst.require ("0.10") ++import gst ++import gtk ++import pango ++ ++import os ++import dircache ++import errno ++import random ++import time ++import thread ++ ++from rdflib.Graph import ConjunctiveGraph ++from rdflib import Namespace ++from rdflib import RDF ++ ++from xdg import BaseDirectory ++ ++import installablecodecs ++import genres ++ ++''' ++Define namespaces we will be using globally ++''' ++DC = Namespace('http://purl.org/dc/elements/1.1/') ++PO = Namespace('http://purl.org/ontology/po/') ++OWL = Namespace('http://www.w3.org/2002/07/owl#') ++FOAF = Namespace('http://xmlns.com/foaf/0.1/') ++PLAY = Namespace('http://uriplay.org/elements/') ++ ++ ++''' ++Global codec cache singleton ++''' ++codec_cache = None ++ ++''' ++Container/Audio/Video codec mappings - global for readability ++''' ++ ++# FIXME: Real Media formats ++container_map = { 'application/ogg' : 'application/ogg', ++ 'audio/ogg' : 'application/ogg', ++ 'video/ogg' : 'application/ogg', ++ 'video/x-ms-asf' : 'video/x-ms-asf', ++ 'audio/x-ms-asf' : 'video/x-ms-asf', ++ 'audio/mp3' : 'audio/mpeg, mpegversion=(int)1, layer=(int)3', ++ 'audio/mp4' : 'audio/x-m4a', ++ 'audio/mpeg' : 'audio/mpeg, mpegversion=(int)1', ++ 'video/x-flv' : 'video/x-flv', ++ 'video/3gpp' : 'application/x-3gp', ++ 'application/x-3gp' : 'application/x-3gp', ++ 'audio/x-matroska' : 'video/x-matroska', ++ 'video/x-matroska' : 'video/x-matroska', ++ 'video/mp4' : 'video/quicktime', ++ 'video/mpeg' : 'video/mpeg, mpegversion=(int)1, ' + ++ ' systemstream=(boolean)true; ' + ++ 'video/mpeg, mpegversion=(int)2, ' + ++ ' systemstream=(boolean)true', ++ 'video/mpeg2' : 'video/mpeg, mpegversion=(int)2,' + ++ ' systemstream=(boolean)false', ++ 'video/mp2t' : 'video/mpegts', ++ 'video/mpegts' : 'video/mpegts' } ++ ++# FIXME: do we need both parsed=true and parsed=false for mp3? ++audio_map = { 'audio/mp1' : 'audio/mpeg, mpegversion=(int)1, layer=(int)1', ++ 'audio/mp2' : 'audio/mpeg, mpegversion=(int)1, layer=(int)2', ++ 'audio/mp3' : 'audio/mpeg, mpegversion=(int)1, layer=(int)3', ++ 'audio/mp4' : 'audio/mpeg, mpegversion=(int)2; ' + ++ 'audio/mpeg, mpegversion=(int)4', ++ 'audio/mpeg' : 'audio/mpeg, mpegversion=(int)1, layer=(int)3', ++ 'audio/x-wma' : 'audio/x-wma, wmaversion=(int)1; ' + ++ 'audio/x-wma, wmaversion=(int)2', ++ 'audio/x-wmv' : 'audio/x-wma, wmaversion=(int)1; ' + ++ 'audio/x-wma, wmaversion=(int)2', ++ 'audio/x-ms-wma' : 'audio/x-wma, wmaversion=(int)1; ' + ++ 'audio/x-wma, wmaversion=(int)2', ++ 'audio/x-ms-wmv' : 'audio/x-wma, wmaversion=(int)1; ' + ++ 'audio/x-wma, wmaversion=(int)2', ++ 'audio/vorbis' : 'audio/x-vorbis' } ++ ++# FIXME: video/x-ms-wmv: ask if this refers to a particular wmv version or if it can be any version/profile ++# BBC regard video/x-svq as equivalent to video/x-flash-video, so we just ++# treat them all the same here and require all of them in this case ++video_map = { 'video/x-vp6' : 'video/x-vp6', ++ 'video/x-flash-video' : 'video/x-svq, svqversion=(int)1; ' + ++ 'video/x-svq, svqversion=(int)3; ' + ++ 'video/x-flash-video, flvversion=(int)1', ++ 'video/H263-200' : 'video/x-svq, svqversion=(int)1; ' + ++ 'video/x-flash-video, flvversion=(int)1', ++ 'video/x-svq' : 'video/x-svq, svqversion=(int)1; ' + ++ 'video/x-svq, svqversion=(int)3; ' + ++ 'video/x-flash-video, flvversion=(int)1', ++ 'video/H264' : 'video/x-h264', ++ 'video/mpeg' : 'video/mpeg, mpegversion=(int)1, ' + ++ ' systemstream=(boolean)false; ' + ++ 'video/mpeg, mpegversion=(int)2, ' + ++ ' systemstream=(boolean)false', ++ 'video/mpeg1' : 'video/mpeg, mpegversion=(int)1, ' + ++ ' systemstream=(boolean)false', ++ 'video/mpeg2' : 'video/mpeg, mpegversion=(int)2, ' + ++ ' systemstream=(boolean)false', ++ 'video/x-dirac' : 'video/x-dirac', ++ 'video/x-wmv' : 'video/x-wmv, wmvversion=(int)1; ' + ++ 'video/x-wmv, wmvversion=(int)2; ' + ++ 'video/x-wmv, wmvversion=(int)3', ++ 'video/x-ms-wmv' : 'video/x-wmv, wmvversion=(int)1; ' + ++ 'video/x-wmv, wmvversion=(int)2; ' + ++ 'video/x-wmv, wmvversion=(int)3' } ++ ++############################################################################### ++ ++''' ++CodecCache: keeps track of what is currently installed and what we might be ++ able to install; caches things internally in a dict so we don't ++ have to do expensive checks more often than necessary; do not ++ cache results elsewhere and make sure to listen to the 'loaded' ++ signal and refilter any content once the database of installable ++ and installed codecs is loaded (methods may just return False if ++ the database hasn't been loaded yet) ++''' ++class CodecCache(gobject.GObject): ++ __slots__ = [ 'codec_cache', 'installable_codecs' ] ++ ++ __gsignals__ = dict(loaded=(gobject.SIGNAL_RUN_LAST, None, ())) ++ ++ def __init__(self): ++ gobject.GObject.__init__ (self) ++ self.codec_cache = { } ++ self.installable_codecs = None ++ ++ def reload_async(self): ++ gst.log('starting codec cache loading') ++ thread.start_new_thread(self._loading_thread, ()) ++ ++ def _loading_thread(self): ++ ''' idle callback to marshal result back into the main thread ''' ++ def _loading_done_idle_cb(res): ++ gst.log('codec cache loaded (%d elements)' % (len(res))) ++ self.installable_codecs = res ++ self.emit('loaded') ++ return False # don't want to be called again ++ ++ gst.log('in codec cache loading thread') ++ # the following can take quite a few seconds on machines with very ++ # low cpu power (culprit: apt.Cache()), so we do this in a separate ++ # thread and then trigger a refiltering of the treeview when done ++ res = installablecodecs.getInstallableCodecs() ++ gst.log('codec cache loading done, marshalling result into main thread') ++ gobject.idle_add(_loading_done_idle_cb, res) ++ ++ def haveDecoderForCaps(self, decoder_caps): ++ caps_string = decoder_caps.to_string() ++ ++ if caps_string in self.codec_cache: ++ return self.codec_cache[caps_string] ++ ++ registry = gst.registry_get_default() ++ features = registry.get_feature_list(gst.TYPE_ELEMENT_FACTORY) ++ ++ for feature in features: ++ # only take into account elements playbin will use ++ if feature.get_rank() < gst.RANK_MARGINAL: ++ continue ++ klass = feature.get_klass() ++ # ignore Depayloaders for now ++ if klass.find('Demux') >= 0 or \ ++ klass.find('Decoder') >= 0 or \ ++ klass.find('Parse') >= 0: ++ for pad_template in feature.get_static_pad_templates(): ++ if pad_template.direction == gst.PAD_SINK: ++ if not pad_template.get_caps().intersect(decoder_caps).is_empty(): ++ self.codec_cache[caps_string] = True ++ gst.debug('%s can handle %s' % (feature.get_name(), caps_string)) ++ return True ++ self.codec_cache[caps_string] = False ++ gst.debug('no element found that can handle ' + caps_string) ++ return False ++ ++ ''' do not cache the result of this function ''' ++ def isInstalledOrInstallable(self, caps_needed): ++ if not caps_needed or caps_needed.is_empty() or caps_needed.is_any(): ++ return False ++ ++ if self.installable_codecs is None: ++ gst.log('database of installable codecs not loaded yet') ++ return False ++ ++ for s in caps_needed: ++ if not self.haveDecoderForCaps(gst.Caps(s)): ++ gst.debug('no decoder for %s installed' % (s.to_string())) ++ if not s.get_name() in self.installable_codecs: ++ gst.debug('%s not installable either' % (s.to_string())) ++ return False ++ ++ return True ++ ++############################################################################### ++ ++''' ++UriPlayObject: base class for Brand, Episode, Encoding, Location etc. ++''' ++class UriPlayObject(object): ++ __slots__ = [ 'rdf_attribute_mapping' ] ++ ++ def __init__(self): ++ self.rdf_attribute_mapping = [] ++ ++ def parseProperties(self, conjunctive_graph, graph_obj): ++ for rdf_tag, prop_name in self.rdf_attribute_mapping: ++ self.__setattr__(prop_name, None) ++ for rdf_tag, prop_name in self.rdf_attribute_mapping: ++ for match in conjunctive_graph.objects(graph_obj, rdf_tag): ++ self.__setattr__(prop_name, match.encode('utf-8')) ++ break # we can handle only one value for each property name ++ ++############################################################################### ++ ++''' ++Brand: a show/series/group of episodes ++''' ++class Brand(UriPlayObject): ++ __slots__ = [ 'title', 'description', 'episodes', 'genres' ] ++ ++ def __init__(self): ++ self.episodes = [] ++ self.genres = [] ++ self.rdf_attribute_mapping = [ ( DC['title'], 'title' ), ++ ( DC['description'], 'description' ) ] ++ ++ def parseBrand(self, conjunctive_graph, graph_brand): ++ self.parseProperties(conjunctive_graph, graph_brand) ++ ++ self.episodes = [] ++ for e in conjunctive_graph.objects(graph_brand, PO['episode']): ++ episode = Episode() ++ episode.parseEpisode(conjunctive_graph, e) ++ self.episodes.append(episode) ++ ++ self.genres = [] ++ for match in conjunctive_graph.objects(graph_brand, PO['genre']): ++ genre_utf8 = match.encode('utf-8') ++ pos = genre_utf8.find('/genres/') ++ if pos > 0: ++ pos += len('/genres/') ++ genre = genre_utf8[pos:] ++ else: ++ gst.warning('Unexpected genre identifier: ' + genre_utf8) ++ genre = 'other' ++ if genre not in self.genres: ++ self.genres.append(genre) ++ ++ def hasUsableEpisodes(self): ++ for episode in self.episodes: ++ if episode.hasUsableEncodings(): ++ return True ++ return False ++ ++ def getUsableEpisodes(self): ++ usable_episodes = [] ++ for episode in self.episodes: ++ if episode.hasUsableEncodings(): ++ usable_episodes.append(episode) ++ return usable_episodes ++ ++############################################################################### ++ ++''' ++Episode: a single episode of a Brand (even though we parse the different ++ versions, for now we'll just pretend there is only one version and ++ map the encodings attribute to the encodings of the first version ++ we find, to make things easier) ++''' ++class Episode(UriPlayObject): ++ __slots__ = [ 'title', 'description', 'versions', 'encodings' ] ++ ++ def __init__(self): ++ self.encodings = [] ++ self.rdf_attribute_mapping = [ ( DC['title'], 'title' ), ++ ( DC['description'], 'description' ) ] ++ ++ def parseEpisode(self, conjunctive_graph, graph_episode): ++ self.parseProperties(conjunctive_graph, graph_episode) ++ self.versions = [] ++ for v in conjunctive_graph.objects(graph_episode, PO['version']): ++ version = EpisodeVersion() ++ version.parseVersion(conjunctive_graph, v) ++ self.versions.append(version) ++ # encodings of episode = encodings of first version of episode ++ if not self.encodings: ++ self.encodings = version.encodings ++ ++ def hasUsableEncodings(self): ++ for encoding in self.encodings: ++ if encoding.isUsable(): ++ return True ++ return False ++ ++ # TODO: this does not take into account codec quality, highest bitrate wins ++ def getBestEncoding(self, connection_speed=0): ++ gst.log('connection speed: %d kbit/s' % (connection_speed)) ++ best_encoding = None ++ for encoding in self.encodings: ++ if not encoding.isUsable(): ++ continue ++ gst.log('have encoding with bitrate: %d kbit/s' % (encoding.getBitrate())) ++ if best_encoding: ++ if encoding.getBitrate() > best_encoding.getBitrate(): ++ if connection_speed <= 0 or encoding.getBitrate() <= connection_speed: ++ best_encoding = encoding ++ else: ++ best_encoding = encoding ++ if best_encoding: ++ gst.log('best encoding has bitrate of %d kbit/s' % (best_encoding.getBitrate())) ++ return best_encoding ++ ++ def getUri(self, connection_speed=0): ++ encoding = self.getBestEncoding(connection_speed) ++ if encoding: ++ location = encoding.getBestLocation() ++ if location: ++ return location.uri ++ return None ++ ++############################################################################### ++ ++''' ++EpisodeVersion: a version of an Episode (e.g. UK vs. US or pg-13 vs. 18) ++''' ++class EpisodeVersion(UriPlayObject): ++ __slots__ = [ 'encodings' ] ++ ++ def __init__(self): ++ self.encodings = [] ++ self.rdf_attribute_mapping = [] ++ ++ def parseVersion(self, conjunctive_graph, graph_version): ++ self.parseProperties(conjunctive_graph, graph_version) ++ self.encodings = [] ++ for e in conjunctive_graph.objects(graph_version, PLAY['manifestedAs']): ++ encoding = Encoding() ++ encoding.parseEncoding(conjunctive_graph, e) ++ self.encodings.append(encoding) ++ ++############################################################################### ++ ++''' ++Encoding: a specific encoding of an Episode (format/bitrate/size etc.) ++''' ++class Encoding(UriPlayObject): ++ __slots__ = [ 'container_format', 'bitrate', 'size', 'video_codec', ++ 'video_bitrate', 'video_fps', 'video_height', 'video_width', ++ 'audio_codec', 'audio_bitrate', 'audio_channels', ++ 'locations', 'required_caps' ] ++ ++ def __init__(self): ++ self.required_caps = None ++ self.rdf_attribute_mapping = [ ++ ( PLAY['dataContainerFormat'], 'container_format' ), ++ ( PLAY['bitRate'], 'bitrate' ), ++ ( PLAY['dataSize'], 'size' ), ++ ( PLAY['videoCoding'], 'video_codec' ), ++ ( PLAY['videoBitrate'], 'video_bitrate' ), ++ ( PLAY['videoFrameRate'], 'video_fps' ), ++ ( PLAY['videoVerticalSize'], 'video_height' ), ++ ( PLAY['videoHorizontalSize'], 'video_width' ), ++ ( PLAY['audioCoding'], 'audio_codec' ), ++ ( PLAY['audioBitrate'], 'audio_bitrate' ), ++ ( PLAY['audioChannels'], 'audio_channels' )] ++ ++ def parseEncoding(self, conjunctive_graph, graph_encoding): ++ self.parseProperties(conjunctive_graph, graph_encoding) ++ self.locations = [] ++ for l in conjunctive_graph.objects(graph_encoding, PLAY['availableAt']): ++ location = Location() ++ location.parseLocation(conjunctive_graph, l) ++ self.locations.append(location) ++ self.required_caps = self.postProcessCodecs() ++ ++ def postProcessCodecs(self): ++ required_caps = gst.Caps() ++ if self.video_codec: ++ self.video_codec = self.video_codec.lower() ++ if self.video_codec in video_map: ++ required_caps.append(gst.Caps(video_map[self.video_codec])) ++ else: ++ gst.warning('unmapped video codec ' + self.video_codec) ++ return None ++ if self.audio_codec: ++ self.audio_codec = self.audio_codec.lower() ++ if self.audio_codec in audio_map: ++ required_caps.append(gst.Caps(audio_map[self.audio_codec])) ++ else: ++ gst.warning('unmapped audio codec ' + self.audio_codec) ++ return None ++ if self.container_format: ++ self.container_format = self.container_format.lower() ++ if self.container_format in container_map: ++ required_caps.append(gst.Caps(container_map[self.container_format])) ++ else: ++ gst.warning('unmapped container format ' + self.container_format) ++ return None ++ ++ if not required_caps.is_empty(): ++ return required_caps ++ else: ++ return None ++ ++ def isUsable(self): ++ global codec_cache ++ ++ if self.required_caps: ++ return codec_cache.isInstalledOrInstallable(self.required_caps) ++ else: ++ return False ++ ++ def getBitrate(self): ++ if not self.bitrate: ++ return 0 ++ return eval(self.bitrate) ++ ++ def getBestLocation(self): ++ locations = self.locations ++ random.shuffle(locations) ++ for loc in locations: ++ if loc.isUsable(): ++ return loc ++ return None ++ ++############################################################################### ++ ++''' ++Location: location (URI) of a specific encoding ++''' ++class Location(UriPlayObject): ++ __slots__ = [ 'uri', 'type', 'sub_type', 'is_live' ] ++ ++ # Note: type, subType and isLive are more often not available than available ++ def __init__(self): ++ self.rdf_attribute_mapping = [ ++ ( PLAY['uri'], 'uri' ), ++ ( PLAY['transportType'], 'type' ), ++ ( PLAY['transportSubType'], 'sub_type' ), ++ ( PLAY['transportIsLive'], 'is_live' )] ++ ++ def parseLocation(self, conjunctive_graph, graph_location): ++ self.parseProperties(conjunctive_graph, graph_location) ++ ++ def isUsable(self): ++ if self.uri and self.uri.startswith('http'): ++ return True ++ return False ++ ++############################################################################### ++ ++''' ++ContentPool: downloads rdf file with available content and caches it locally, ++ then parses the file and announces new brands and brands where ++ the episode listing has changed. The cached file is saved with ++ the ETag from the server/gio as part of the filename, so we can ++ easily compare the tag to the server's later to check if we have ++ to update the file or not (not that ETag here means what we get ++ from the gio.FileInfo on the remote uri, and never refers to a ++ gio-generated ETag for the local cache file, since those two ++ are not comparable) ++''' ++# TODO: ++# - maybe derive from list store or filtermodel directly? ++# - aggregate codec-cache-loaded and loading-done into loading-done internally, ++# so caller doesn't have to worry about that ++class ContentPool(gobject.GObject): ++ __slots__ = [ 'cache_dir', 'brands' ] ++ ++ __gsignals__ = dict(codec_cache_loaded=(gobject.SIGNAL_RUN_LAST, None, ()), ++ progress_message=(gobject.SIGNAL_RUN_LAST, None, (str, )), ++ loading_error=(gobject.SIGNAL_RUN_LAST, None, (str, )), ++ loading_done=(gobject.SIGNAL_RUN_LAST, None, ())) ++ ++ CACHE_FILE_PREFIX = 'content-' ++ CACHE_FILE_SUFFIX = '.cache' ++ AVAILABLE_CONTENT_URI = 'http://open.bbc.co.uk/rad/uriplay/availablecontent' ++ MAX_CACHE_FILE_AGE = 2*3600 # 2 hours ++ ++ def __init__(self): ++ gobject.GObject.__init__ (self) ++ ++ self.brands = [] ++ self.cache_dir = os.path.join(BaseDirectory.xdg_cache_home, 'totem', ++ 'plugins', 'bbc') ++ try: ++ os.makedirs(self.cache_dir) ++ gst.log('created cache directory ' + self.cache_dir) ++ except OSError, err: ++ if err.errno == errno.EEXIST: ++ gst.log('cache directory ' + self.cache_dir + ' already exists') ++ else: ++ gst.error('failed to create cache directory ' + self.cache_dir + ++ ': ' + err.strerror) ++ self.cache_dir = None ++ ++ def _on_codec_cache_loaded(self, pool): ++ self.emit('codec-cache-loaded') ++ ++ ''' returns True if the given filename refers to one of our cache files ''' ++ def isCacheFileName(self, filename): ++ if not filename.startswith(self.CACHE_FILE_PREFIX): ++ return False ++ if not filename.endswith(self.CACHE_FILE_SUFFIX): ++ return False ++ return True ++ ++ ''' removes all cache files that don't relate to the given etag ''' ++ def deleteStaleCacheFiles(self, except_etag=None): ++ try: ++ for fn in dircache.listdir(self.cache_dir): ++ if self.isCacheFileName(fn): ++ if except_etag == None or fn.find(except_etag) < 0: ++ try: ++ gst.log('deleting stale cache file ' + fn) ++ os.remove(os.path.join(self.cache_dir,fn)) ++ except OSError: ++ pass ++ except OSError: ++ pass ++ ++ ''' finds the most recent cache file and returns its file name or None''' ++ def findMostRecentCacheFile(self): ++ best_mtime = 0 ++ best_name = None ++ try: ++ gst.log('Looking for cache files in ' + self.cache_dir) ++ for fn in dircache.listdir(self.cache_dir): ++ if self.isCacheFileName(fn): ++ mtime = os.stat(os.path.join(self.cache_dir,fn)).st_mtime ++ gst.log('Found cache file %s, mtime %ld' % (fn, long(mtime))) ++ if mtime > best_mtime: ++ best_name = fn ++ best_mtime = mtime ++ except OSError, err: ++ gst.debug("couldn't inspect cache directory %s: %s" % (self.cache_dir, err.strerror)) ++ return None ++ ++ if not best_name: ++ gst.log('No cache file found') ++ return None ++ ++ return best_name ++ ++ ''' gets the ETag for the most recent cache file, or None ''' ++ def getCacheETag(self): ++ etag = self.findMostRecentCacheFile() ++ if not etag: ++ return None ++ prefix_len = len(self.CACHE_FILE_PREFIX) ++ suffix_len = len(self.CACHE_FILE_SUFFIX) ++ etag = etag[prefix_len:-suffix_len] ++ gst.log('ETag: ' + etag) ++ return etag ++ ++ ''' makes a full filename from an ETag ''' ++ def createCacheFileName(self, etag): ++ if not etag: ++ gst.debug('No ETag, using dummy ETag as fallback') ++ etag = '000000-00000-00000000' ++ fn = self.CACHE_FILE_PREFIX + etag + self.CACHE_FILE_SUFFIX ++ return os.path.join(self.cache_dir, fn) ++ ++ def parse_async(self, cache_fn): ++ self.emit('progress-message', 'Parsing available content list ...') ++ thread.start_new_thread(self._parsing_thread, (cache_fn, )) ++ ++ def _parsing_thread(self, cache_fn): ++ def _parse_idle_cb(err_msg, brands): ++ self.brands = brands ++ gst.info('Parsing done: %d brands' % (len(self.brands))) ++ if err_msg: ++ self.emit('loading-error', err_msg) ++ else: ++ self.emit('loading-done') ++ return False ++ ++ err_msg = None ++ brands = [] ++ gst.debug('Loading ' + cache_fn) ++ store = ConjunctiveGraph() ++ try: ++ gst.debug('Reading RDF file ...') ++ store.load(cache_fn) ++ gst.debug('Parsing ' + cache_fn) ++ brands = self.parseBrands(store) ++ except: ++ gst.warning('Problem parsing RDF') ++ err_msg = 'Could not parse available content list' ++ finally: ++ gst.debug('Parsing done, marshalling result into main thread') ++ gobject.idle_add(_parse_idle_cb, err_msg, brands) ++ ++ def _format_size_for_display(self, size): ++ if size < 1024: ++ return '%d bytes' % size ++ if size < 1024*1024: ++ return '%.1f kB' % (size / 1024.0) ++ else: ++ return '%.1f MB' % (size / (1024.0*1024.0)) ++ ++ def load_async(self): ++ def _query_done_cb(remote_file, result): ++ # mutable container so subfunctions can share access ++ # chunks, total_len ++ pdata = [ [], 0 ] ++ ++ def _read_async_cb(instream, result): ++ try: ++ partial_data = instream.read_finish(result) ++ gst.log('Read partial chunk of %d bytes' % (len(partial_data))) ++ chunks = pdata[0] ++ bytes_read = pdata[1] ++ if len(partial_data) == 0: ++ instream.close() ++ outstream = cache_file.create(gio.FILE_CREATE_NONE) ++ for chunk in chunks: ++ outstream.write(chunk) ++ outsize = outstream.query_info('*').get_size() ++ outstream.close() ++ gst.info('Wrote %ld bytes' % (outsize)) ++ self.parse_async(cache_fn) ++ else: ++ chunks.append(partial_data) ++ bytes_read += len(partial_data) ++ pdata[0] = chunks ++ pdata[1] = bytes_read ++ instream.read_async(10240, _read_async_cb, io_priority=glib.PRIORITY_LOW-1) ++ self.emit('progress-message', ++ 'Downloading available content list ... ' + '(' + ++ self._format_size_for_display(bytes_read) + ')') ++ except IOError, e: ++ gst.warning('Error downloading ' + self.AVAILABLE_CONTENT_URI) ++ instream.close() ++ try: ++ cache_file.delete() ++ finally: ++ self.emit('loading-error', 'Error downloading available content list') ++ ++ # _query_done_cb start: ++ gst.log('Query done') ++ try: ++ remote_info = remote_file.query_info_finish(result) ++ except Exception, e: ++ # bail out if we can't query, not much point trying to download ++ gst.warning('Could not query %s: %s' % (self.AVAILABLE_CONTENT_URI, e.message)) ++ self.emit('loading-error', 'Could not connect to server') ++ return ++ ++ gst.log('Got info, querying etag') ++ remote_etag = remote_info.get_etag() ++ if remote_etag: ++ remote_etag = remote_etag.strip('"') ++ gst.log('Remote etag: ' + remote_etag) ++ ++ cache_fn = self.createCacheFileName(remote_etag) ++ cache_file = gio.File(cache_fn) ++ ++ # if file already exists, get size to double-check against server's ++ try: ++ cache_size = cache_file.query_info('standard::size').get_size() ++ except: ++ cache_size = 0 ++ finally: ++ if etag and remote_etag and etag == remote_etag: ++ remote_size = remote_info.get_size() ++ if remote_size <= 0 or cache_size == remote_size: ++ gst.log('Cache file is up-to-date, nothing to do') ++ self.parse_async(cache_fn) ++ return ++ ++ # delete old cache file if it exists ++ try: ++ cache_file.delete() ++ except: ++ pass ++ ++ # FIXME: use gio.File.copy_async() once it's wrapped ++ remote_file.read().read_async(10240, _read_async_cb, io_priority=glib.PRIORITY_LOW-1) ++ gst.info('copying ' + self.AVAILABLE_CONTENT_URI + ' -> ' + cache_fn) ++ self.emit('progress-message', 'Downloading available content list ...') ++ return ++ ++ # load_async start: ++ gst.log('starting loading') ++ ++ # init global singleton variable codec_cache, if needed ++ global codec_cache ++ ++ if not codec_cache: ++ codec_cache = CodecCache() ++ codec_cache.connect('loaded', self._on_codec_cache_loaded) ++ codec_cache.reload_async() ++ ++ etag = self.getCacheETag() ++ if etag: ++ gst.log('Cached etag: ' + etag) ++ self.deleteStaleCacheFiles(etag) ++ existing_cache_fn = self.createCacheFileName(etag) ++ existing_cache_file = gio.File(existing_cache_fn) ++ existing_cache_info = existing_cache_file.query_info('time::modified') ++ existing_cache_mtime = existing_cache_info.get_modification_time() ++ # if the cache file is not older than N minutes/hours/days, then ++ # we'll just go ahead and use it instead of downloading a new one, ++ # even if it's not perfectly up-to-date. ++ # FIXME: UI should have a way to force an update ++ secs_since_update = time.time() - existing_cache_mtime ++ if secs_since_update >= 0 and secs_since_update < self.MAX_CACHE_FILE_AGE: ++ gst.log('Cache file is fairly recent, last updated %f secs ago' % (secs_since_update)) ++ self.parse_async(existing_cache_fn) ++ return ++ else: ++ gst.log('Cached etag: None') ++ ++ # CHECKME: what happens if http is not available as protocol? ++ remote_file = gio.File(self.AVAILABLE_CONTENT_URI) ++ gst.log('Contacting server ' + self.AVAILABLE_CONTENT_URI) ++ self.emit('progress-message', 'Connecting to server ...') ++ remote_file.query_info_async(_query_done_cb, '*') ++ ++ def parseBrands(self, graph): ++ brands = [] ++ for b in graph.subjects(RDF.type, PO['Brand']): ++ brand = Brand() ++ brand.parseBrand(graph, b) ++ brands.append(brand) ++ gst.log('[%3d eps] %s %s' % (len(brand.episodes), brand.title, brand.genres)) ++ return brands ++ ++ ''' returns array of brands which can potentially be played ''' ++ def getUsableBrands(self): ++ usable_brands = [] ++ for brand in self.brands: ++ if brand.hasUsableEpisodes(): ++ usable_brands.append(brand) ++ return usable_brands ++ ++ ++############################################################################### ++ ++class ContentView(gtk.TreeView): ++ __slots__ = [ 'pool', 'content_pool_loaded', 'codec_cache_loaded', 'genre_pool' ] ++ __gsignals__ = dict(play_episode= ++ (gobject.SIGNAL_RUN_LAST, None, ++ (object,))) # Episode ++ ++ SORT_ID_1 = 0 ++ ++ def __init__(self): ++ gtk.TreeView.__init__ (self) ++ self.setupModel() ++ ++ self.set_headers_visible(False) ++ ++ self.connect('row-activated', self.onRowActivated) ++ ++ self.set_property('has-tooltip', True) ++ self.connect('query-tooltip', self.onQueryTooltip) ++ ++ self.set_message('Loading ...') ++ ++ self.pool = ContentPool() ++ self.pool.connect('codec-cache-loaded', self._on_codec_cache_loaded) ++ self.pool.connect('progress-message', self._on_content_pool_message) ++ self.pool.connect('loading-error', self._on_content_pool_error) ++ self.pool.connect('loading-done', self._on_content_pool_loading_done) ++ self.codec_cache_loaded = False ++ self.content_pool_loaded = False ++ self.genre_pool = genres.GenrePool() ++ ++ def load(self): ++ self.pool.load_async() ++ gst.log('started loading') ++ ++ def _on_content_pool_message(self, content_pool, msg): ++ self.set_message(msg) ++ ++ def _on_content_pool_error(self, content_pool, err_msg): ++ gst.warning('Failed to load available content: ' + err_msg) ++ self.set_message(err_msg) ++ ++ def _on_content_pool_loading_done(self, content_pool): ++ gst.log('content pool loaded') ++ self.content_pool_loaded = True ++ if self.codec_cache_loaded: ++ self.populate() ++ ++ def _on_codec_cache_loaded(self, content_pool): ++ gst.log('codec cache loaded, refilter') ++ self.codec_cache_loaded = True ++ #self.filter.refilter() FIXME: we don't filter at the moment ++ if self.content_pool_loaded: ++ self.populate() ++ ++ def populate_add_genre(self, genre, parent_iter): ++ _iter = self.store.append(parent_iter, [None, None, None, genre]) ++ for child_genre in genre.children: ++ self.populate_add_genre(child_genre, _iter) ++ for brand in genre.brands: ++ brand_iter = self.store.append(_iter, [brand, None, None, None]) ++ for ep in brand.episodes: ++ self.store.append(brand_iter, [brand, ep, None, None]) ++ return _iter ++ ++ def populate(self): ++ gst.log('populating treeview') ++ ++ brands = self.pool.getUsableBrands() ++ gst.info('%d brands with usable episodes/encodings' % (len(brands))) ++ ++ # build genre tree in memory and add brands to genre objects ++ self.genre_pool.clear() ++ for brand in brands: ++ for genre_shortref in brand.genres: ++ genre = self.genre_pool.get_genre(genre_shortref) ++ genre.add_brand(brand) ++ ++ # add everything to the list store ++ self.store.clear() ++ toplevel_iters = [] ++ for toplevel_genre in self.genre_pool.get_toplevel_genres(): ++ _iter = self.populate_add_genre(toplevel_genre, None) ++ toplevel_iters.append(_iter) ++ ++ # now make all this visible (view might be showing model with message) ++ self.set_model(self.filter) ++ ++ # expand top-level categories ++ for _iter in toplevel_iters: ++ path = self.store.get_path(_iter) ++ self.expand_row(path, False) ++ ++ def get_brand_tooltip(self, brand): ++ if not brand or not brand.description: ++ return None ++ return '%s\n%s' % (gobject.markup_escape_text(brand.title), ++ gobject.markup_escape_text(brand.description)) ++ ++ def get_episode_tooltip(self, brand, episode): ++ if not episode or not episode.description: ++ return None ++ return '%s\n%s\n%s' % (gobject.markup_escape_text(brand.title), ++ gobject.markup_escape_text(episode.title), ++ gobject.markup_escape_text(episode.description)) ++ ++ def onQueryTooltip(self, view, x, y, keyboard_tip, tip): ++ try: ++ model, path, _iter = self.get_tooltip_context(x, y, keyboard_tip) ++ except: ++ return False # probably no content yet ++ ++ brand, episode, msg, genre = model.get(_iter, 0, 1, 2, 3) ++ if msg or genre: ++ return False ++ if brand and not episode: ++ markup = self.get_brand_tooltip(brand) ++ elif brand and episode: ++ markup = self.get_episode_tooltip(brand, episode) ++ else: ++ markup = None ++ if markup: ++ tip.set_markup(markup) ++ else: ++ tip.set_text('No details available') # FIXME: translate ++ return True ++ ++ def onRowActivated(self, view, path, col): ++ model = self.get_model() ++ if model: ++ _iter = model.get_iter(path) ++ brand, episode = self.get_model().get(_iter, 0, 1) ++ if episode: ++ self.emit('play-episode', episode) ++ ++ def renderGenreCell(self, column, renderer, model, _iter, genre): ++ markup = '%s' % \ ++ (gobject.markup_escape_text(genre.label)) ++ renderer.set_property('markup', markup) ++ ++ def renderBrandCell(self, column, renderer, model, _iter, brand): ++ markup = '%s (%d)' % \ ++ (gobject.markup_escape_text(brand.title), len(brand.episodes)) ++ renderer.set_property('markup', markup) ++ ++ def renderEpisodeCell(self, column, renderer, model, _iter, brand, episode): ++ markup = '%s' % (gobject.markup_escape_text(episode.title)) ++ renderer.set_property('markup', markup) ++ ++ def renderMessageCell(self, column, renderer, model, _iter, msg): ++ markup = '%s' % (gobject.markup_escape_text(msg)) ++ renderer.set_property('markup', markup) ++ ++ def renderCell(self, column, renderer, model, _iter): ++ brand, episode, msg, genre = model.get(_iter, 0, 1, 2, 3) ++ if msg: ++ self.renderMessageCell(column, renderer, model, _iter, msg) ++ elif genre: ++ self.renderGenreCell(column, renderer, model, _iter, genre) ++ elif not episode: ++ self.renderBrandCell(column, renderer, model, _iter, brand) ++ else: ++ self.renderEpisodeCell(column, renderer, model, _iter, brand, episode) ++ ++ # there must be a more elegant way to do this in python ++ def sortFunc(self, model, iter1, iter2): ++ brand1, episode1, genre1 = model.get(iter1, 0, 1, 3) ++ brand2, episode2, genre2 = model.get(iter2, 0, 1, 3) ++ ++ # genres are sorted by genre.sort_rank ++ if genre1 and genre2: ++ if genre1.sort_rank != genre2.sort_rank: ++ return genre1.sort_rank - genre2.sort_rank ++ else: ++ s1 = genre1.label ++ s2 = genre2.label ++ ++ # genre always comes before any other siblings (like brands or episodes) ++ elif genre1: ++ return -1 ++ elif genre2: ++ return 1 ++ ++ # brands and episodes are sorted alphabetically by title ++ elif not episode1 or not episode2: ++ s1 = brand1.title ++ s2 = brand2.title ++ elif episode1 and episode2: ++ s1 = episode1.title ++ s2 = episode2.title ++ else: ++ gst.warning('should not be reached (should be genre label comparison)') ++ ++ # string comparison ++ if s1 == s2: ++ return 0 ++ elif s1 > s2: ++ return 1 ++ else: ++ return -1 ++ ++ def set_message(self, msg): ++ self.msg_store.clear() ++ self.msg_store.append(None, [None, None, msg, None]) ++ self.set_model(self.msg_store) ++ gst.log('set message "' + msg + '"') ++ ++ def setupModel(self): ++ # columns: Brand, Episode, message string, Genre ++ self.msg_store = gtk.TreeStore(object, object, str, object) ++ self.store = gtk.TreeStore(object, object, str, object) ++ self.filter = self.store.filter_new() ++ ++ column = gtk.TreeViewColumn() ++ renderer = gtk.CellRendererText() ++ renderer.set_property('ellipsize', pango.ELLIPSIZE_END) ++ column.pack_start(renderer, expand=True) ++ column.set_cell_data_func(renderer, self.renderCell) ++ self.append_column(column) ++ self.store.set_sort_func(self.SORT_ID_1, self.sortFunc) ++ self.store.set_sort_column_id(self.SORT_ID_1, gtk.SORT_ASCENDING) ++ ++if __name__ == "__main__": ++ # ensure the caps strings in the container/video/audio map are parsable ++ for cs in video_map: ++ caps = gst.Caps(video_map[cs]) ++ for cs in audio_map: ++ caps = gst.Caps(audio_map[cs]) ++ for cs in container_map: ++ caps = gst.Caps(container_map[cs]) ++ # test window ++ window = gtk.Window() ++ scrollwin = gtk.ScrolledWindow() ++ scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) ++ window.add(scrollwin) ++ view = ContentView() ++ view.load() ++ scrollwin.add(view) ++ window.show_all() ++ gtk.main() ++ +Index: b/src/plugins/bbc/genres.py +=================================================================== +--- /dev/null ++++ b/src/plugins/bbc/genres.py +@@ -0,0 +1,251 @@ ++#!/usr/bin/python ++# coding=UTF-8 ++# ++# Copyright (C) 2008 Tim-Philipp Müller ++# Copyright (C) 2008 Canonical Ltd. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# The Totem project hereby grant permission for non-gpl compatible GStreamer ++# plugins to be used and distributed together with GStreamer and Totem. This ++# permission are above and beyond the permissions granted by the GPL license ++# Totem is covered by. ++# ++# See license_change file for details. ++ ++import gobject ++gobject.threads_init() ++import pygst ++pygst.require ("0.10") ++import gst ++ ++shortref_to_label_map = { ++ "childrens": "Children's", ++ "childrens/activities": "Activities", ++ "childrens/drama": "Drama", ++ "childrens/entertainmentandcomedy": "Entertainment & Comedy", ++ "childrens/factual": "Factual", ++ "childrens/music": "Music", ++ "childrens/news": "News", ++ "childrens/sport": "Sport", ++ "drama": "Drama", ++ "drama/actionandadventure": "Action & Adventure", ++ "drama/biographical": "Biographical", ++ "drama/classicandperiod": "Classic & Period", ++ "drama/crime": "Crime", ++ "drama/historical": "Historical", ++ "drama/horrorandsupernatural": "Horror & Supernatural", ++ "drama/legalandcourtroom": "Legal & Courtroom", ++ "drama/medical": "Medical", ++ "drama/musical": "Musical", ++ "drama/political": "Political", ++ "drama/psychological": "Psychological", ++ "drama/relationshipsandromance": "Relationships & Romance", ++ "drama/scifiandfantasy": "SciFi & Fantasy", ++ "drama/soaps": "Soaps", ++ "drama/spiritual": "Spiritual", ++ "drama/thriller": "Thriller", ++ "drama/waranddisaster": "War & Disaster", ++ "drama/western": "Western", ++ "entertainmentandcomedy": "Entertainment & Comedy", ++ "entertainmentandcomedy/impressionists": "Impressionists", ++ "entertainmentandcomedy/satire": "Satire", ++ "entertainmentandcomedy/sitcoms": "Sitcoms", ++ "entertainmentandcomedy/sketch": "Sketch", ++ "entertainmentandcomedy/spoof": "Spoof", ++ "entertainmentandcomedy/standup": "Standup", ++ "entertainmentandcomedy/varietyshows": "Variety Shows", ++ "factual": "Factual", ++ "factual/antiques": "Antiques", ++ "factual/artscultureandthemedia": "Arts, Culture & the Media", ++ "factual/beautyandstyle": "Beauty & Style", ++ "factual/carsandmotors": "Cars & Motors", ++ "factual/cinema": "Cinema", ++ "factual/consumer": "Consumer", ++ "factual/crimeandjustice": "Crime & Justice", ++ "factual/disability": "Disability", ++ "factual/familiesandrelationships": "Families & Relationships", ++ "factual/foodanddrink": "Food & Drink", ++ "factual/healthandwellbeing": "Health & Wellbeing", ++ "factual/history": "History", ++ "factual/homesandgardens": "Homes & Gardens", ++ "factual/lifestories": "Life Stories", ++ "factual/money": "Money", ++ "factual/petsandanimals": "Pets & Animals", ++ "factual/politics": "Politics", ++ "factual/sciencenatureandenvironment": "Science, Nature & Environment", ++ "factual/travel": "Travel", ++ "learning": "Learning", ++ "learning/1119": "Age 11-19", ++ "learning/511": "Age 5-11", ++ "learning/adults": "Adults", ++ "learning/preschool": "Pre-School", ++ "music": "Music", ++ "music/classicpopandrock": "Classic Pop & Rock", ++ "music/classical": "Classical", ++ "music/country": "Country", ++ "music/danceandelectronica": "Dance & Electronica", ++ "music/desi": "Desi", ++ "music/easylisteningsoundtracksandmusicals": "Easy Listening, Soundtracks & Musicals", ++ "music/folk": "Folk", ++ "music/hiphoprnbanddancehall": "Hip Hop, RnB & Dancehall", ++ "music/jazzandblues": "Jazz & Blues", ++ "music/popandchart": "Pop & Chart", ++ "music/rockandindie": "Rock & Indie", ++ "music/soulandreggae": "Soul & Reggae", ++ "music/world": "World", ++ "news": "News", ++ "religionandethics": "Religion & Ethics", ++ "sport": "Sport", ++ "sport/archery": "Archery", ++ "sport/athletics": "Athletics", ++ "sport/badminton": "Badminton", ++ "sport/baseball": "Baseball", ++ "sport/basketball": "Basketball", ++ "sport/bowls": "Bowls", ++ "sport/boxing": "Boxing", ++ "sport/canoeing": "Canoeing", ++ "sport/cricket": "Cricket", ++ "sport/cycling": "Cycling", ++ "sport/darts": "Darts", ++ "sport/disabilitysport": "Disability Sport", ++ "sport/diving": "Diving", ++ "sport/equestrian": "Equestrian", ++ "sport/fencing": "Fencing", ++ "sport/football": "Football", ++ "sport/gaelicgames": "Gaelic Games", ++ "sport/golf": "Golf", ++ "sport/gymnastics": "Gymnastics", ++ "sport/handball": "Handball", ++ "sport/hockey": "Hockey", ++ "sport/horseracing": "Horse Racing", ++ "sport/judo": "Judo", ++ "sport/modernpentathlon": "Modern Pentathlon", ++ "sport/motorsport": "Motorsport", ++ "sport/olympics": "Olympics", ++ "sport/rowing": "Rowing", ++ "sport/rugbyleague": "Rugby League", ++ "sport/rugbyunion": "Rugby Union", ++ "sport/sailing": "Sailing", ++ "sport/shinty": "Shinty", ++ "sport/shooting": "Shooting", ++ "sport/snooker": "Snooker", ++ "sport/softball": "Softball", ++ "sport/swimming": "Swimming", ++ "sport/tabletennis": "Table Tennis", ++ "sport/taekwondo": "Taekwondo", ++ "sport/tennis": "Tennis", ++ "sport/triathlon": "Triathlon", ++ "sport/volleyball": "Volleyball", ++ "sport/waterpolo": "Water Polo", ++ "sport/weightlifting": "Weightlifting", ++ "sport/wintersports": "Winter Sports", ++ "sport/wrestling": "Wrestling", ++ "weather": "Weather" ++} ++ ++# lowest = at the top ++shortref_to_sortrank_map = { ++ "news": 1, ++ "childrens": 2, ++ "drama": 3, ++ "entertainmentandcomedy": 4, ++ "factual": 5, ++ "learning": 6, ++ "music": 7, ++ "religionandethics": 8, ++ "sport": 9, ++ "weather": 10 ++} ++ ++''' ++GenrePool: keeps track of the already-created genres, mainly so we can easily ++ find already-existing parents for to-be-created genres ++''' ++class GenrePool(object): ++ __slots__ = [ 'genres', 'toplevel_genres' ] ++ ++ def __init__(self): ++ self.clear() ++ ++ def clear(self): ++ self.genres = { } # maps short_ref => genre object ++ ++ def get_genre(self, short_ref): ++ # check if genre already exists ++ if short_ref in self.genres: ++ return self.genres[short_ref] ++ ++ # if not, create genre (and any parents which don't exist yet) ++ lastslash_pos = short_ref.rfind('/') ++ if lastslash_pos > 0: ++ parent_ref = short_ref[0:lastslash_pos] ++ gst.log('genre: ' + short_ref + ', parent_genre: ' + parent_ref) ++ parent = self.get_genre(parent_ref) ++ else: ++ parent = None ++ ++ genre = Genre(short_ref, parent) ++ self.genres[short_ref] = genre ++ ++ return genre ++ ++ def get_toplevel_genres(self): ++ toplevel_genres = [] ++ for genre in self.genres.values(): ++ if not genre.parent: ++ toplevel_genres.append(genre) ++ return toplevel_genres ++ ++''' ++Genre: represents a genre ++''' ++class Genre(object): ++ __slots__ = [ 'short_ref', 'label', 'sort_rank', 'parent', 'children', 'brands' ] ++ ++ def __init__(self, short_ref, parent_genre): ++ self.short_ref = short_ref ++ ++ if short_ref in shortref_to_label_map: ++ self.label = shortref_to_label_map[short_ref] ++ else: ++ self.label = 'Unknown: ' + short_ref ++ ++ if short_ref in shortref_to_sortrank_map: ++ self.sort_rank = shortref_to_sortrank_map[short_ref] ++ else: ++ self.sort_rank = 99999 ++ ++ self.parent = parent_genre ++ self.children = [] ++ self.brands = [] ++ ++ if parent_genre is not None: ++ parent_genre.add_child(self) ++ ++ gst.log('created genre ' + short_ref + ' = ' + self.label) ++ ++ def add_child(self, child_genre): ++ if child_genre not in self.children: ++ self.children.append(child_genre) ++ ++ def add_brand(self, brand): ++ if brand not in self.brands: ++ self.brands.append(brand) ++ gst.log(self.short_ref + ': adding show ' + brand.title) ++ ++if __name__ == "__main__": ++ pass ++ +Index: b/src/plugins/bbc/installablecodecs.py +=================================================================== +--- /dev/null ++++ b/src/plugins/bbc/installablecodecs.py +@@ -0,0 +1,112 @@ ++#!/usr/bin/python ++# coding=UTF-8 ++# ++# Copyright (C) 2008 Tim-Philipp Müller ++# Copyright (C) 2008 Canonical Ltd. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# The Totem project hereby grant permission for non-gpl compatible GStreamer ++# plugins to be used and distributed together with GStreamer and Totem. This ++# permission are above and beyond the permissions granted by the GPL license ++# Totem is covered by. ++# ++# See license_change file for details. ++ ++import gobject ++gobject.threads_init() ++import pygst ++pygst.require ("0.10") ++import gst ++ ++import os ++ ++def allPackagesAvailableApt(package_descs, codec_name, apt_cache): ++ toinstall = '' ++ allinstalled = True ++ for pkg_desc in package_descs: ++ (component, pkg_name) = pkg_desc.split('/') ++ if apt_cache.has_key(pkg_name): ++ package = apt_cache[pkg_name] ++ # we only care about installable ones here, not installed, since ++ # the installed ones we can better check via the registry (also ++ # taking into account element factory ranks etc.) ++ gst.log('%s: package %s: installed=%d, downloadable=%d' % (codec_name, pkg_name, ++ package.isInstalled, ++ package.candidateDownloadable)) ++ if not package.isInstalled: ++ allinstalled = False ++ if not package.candidateDownloadable: ++ gst.log('%s: not available (package %s not downloadable)' % (codec_name, pkg_name)) ++ return False ++ elif toinstall.find(pkg_name) < 0: ++ toinstall += pkg_name + ' ' ++ ++ # if all candidat packages are already installed, things should ++ # be checked via the registry and there's nothing to be gained ++ # here, so pretend the codec is not available for installation ++ # in this case ++ if allinstalled: ++ gst.debug('%s: not available (all already installed)' % (codec_name)) ++ return False ++ else: ++ gst.debug('%s: available (install %s)' % (codec_name, toinstall[:-1])) ++ return True ++ ++def getInstallableCodecsUbuntu(): ++ import warnings ++ warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) ++ import apt ++ import gdbm ++ ++ codecs = [] ++ ++ try: ++ apt_cache = apt.Cache() ++ except: ++ gst.warning('Failed to read APT cache') ++ return [] ++ ++ try: ++ codec_map = gdbm.open('/var/cache/app-install/gai-codec-map.gdbm') ++ for key in codec_map.keys(): ++ if not key.startswith('0.10:decoder-'): ++ continue ++ codec_name = key[13:] ++ if allPackagesAvailableApt(codec_map[key].split(), codec_name, apt_cache): ++ codecs.append(codec_name) ++ except gdbm.error: ++ gst.warning('gdbm error') ++ return [] ++ ++ return codecs ++ ++ ++def getInstallableCodecs(): ++ codecs = [] ++ if os.access('/var/cache/app-install/gai-codec-map.gdbm', os.R_OK): ++ codecs = getInstallableCodecsUbuntu() ++ return codecs ++ ++ ++if __name__ == "__main__": ++ codecs = getInstallableCodecs() ++ if len(codecs) > 0: ++ for codec in codecs: ++ print "installable: %s" % (codec) ++ else: ++ print 'No codecs known to be installable' ++ ++ --- totem-2.30.2.orig/debian/patches/80_webm.patch +++ totem-2.30.2/debian/patches/80_webm.patch @@ -0,0 +1,33 @@ +From 2285e792f616f3be400f7eaab51d3a528afe8e68 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 20 May 2010 15:57:42 +0000 +Subject: Add WebM support to Totem and browser plugin + +--- +diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp +index 5382bb2..1c420f3 100644 +--- a/browser-plugin/totemPlugin.cpp ++++ b/browser-plugin/totemPlugin.cpp +@@ -126,6 +126,7 @@ static const totemPluginMimeEntry kMimeTypes[] = { + { "audio/mpeg", "mp3", NULL }, + { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" }, + { "video/flv", "flv", "application/x-flash-video" }, ++ { "video/webm", "webm", NULL }, + { "application/x-totem-plugin", "", "Totem Multimedia plugin" }, + { "audio/midi", "mid, midi", NULL }, + #else +diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt +index 303bb23..a6eab04 100644 +--- a/data/mime-type-list.txt ++++ b/data/mime-type-list.txt +@@ -82,6 +82,7 @@ video/vivo + video/vnd.divx + video/vnd.rn-realvideo + video/vnd.vivo ++video/webm + video/x-anim + video/x-avi + video/x-flc +-- +cgit v0.8.3.1 +