r12848 - in /desktop/unstable/totem/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Sep 25 23:39:05 UTC 2007
Author: joss
Date: Tue Sep 25 23:39:04 2007
New Revision: 12848
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12848
Log:
* 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 file.
* 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.
Added:
desktop/unstable/totem/debian/patches/20_use_alternatives.patch
- copied, changed from r12832, desktop/unstable/totem/debian/patches/20_use_alternatives.dpatch
desktop/unstable/totem/debian/patches/25_revert-xine-reqs-bump.patch
- copied, changed from r12832, desktop/unstable/totem/debian/patches/25_revert-xine-reqs-bump.dpatch
desktop/unstable/totem/debian/patches/30_kfreebsd_gnu.patch
- copied, changed from r12832, desktop/unstable/totem/debian/patches/30_kfreebsd_gnu.dpatch
desktop/unstable/totem/debian/patches/60_gnome-doc-utils.patch
desktop/unstable/totem/debian/patches/70_autoconf.patch
- copied, changed from r12832, desktop/unstable/totem/debian/patches/70_autoconf.dpatch
desktop/unstable/totem/debian/patches/series
desktop/unstable/totem/debian/totem-common.install
- copied unchanged from r12832, desktop/unstable/totem/debian/totem-gstreamer.install
desktop/unstable/totem/debian/totem.menu
- copied, changed from r12832, desktop/unstable/totem/debian/totem-gstreamer.menu
Removed:
desktop/unstable/totem/debian/patches/00list
desktop/unstable/totem/debian/patches/20_use_alternatives.dpatch
desktop/unstable/totem/debian/patches/25_revert-xine-reqs-bump.dpatch
desktop/unstable/totem/debian/patches/30_kfreebsd_gnu.dpatch
desktop/unstable/totem/debian/patches/70_autoconf.dpatch
desktop/unstable/totem/debian/totem-gstreamer.install
desktop/unstable/totem/debian/totem-gstreamer.menu
desktop/unstable/totem/debian/totem-xine.install
desktop/unstable/totem/debian/totem-xine.menu
Modified:
desktop/unstable/totem/debian/changelog
desktop/unstable/totem/debian/control
desktop/unstable/totem/debian/control.in
desktop/unstable/totem/debian/rules
desktop/unstable/totem/debian/totem-gstreamer.postinst
desktop/unstable/totem/debian/totem-gstreamer.prerm
desktop/unstable/totem/debian/totem-mozilla.links
desktop/unstable/totem/debian/totem-xine.postinst
desktop/unstable/totem/debian/totem-xine.prerm
Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Tue Sep 25 23:39:04 2007
@@ -1,3 +1,23 @@
+totem (2.20.0-3) UNRELEASED; 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 file.
+ * 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 <joss at debian.org> Wed, 26 Sep 2007 01:19:31 +0200
+
totem (2.20.0-2) unstable; urgency=low
[ Sebastian Dröge ]
Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control (original)
+++ desktop/unstable/totem/debian/control Tue Sep 25 23:39:04 2007
@@ -2,9 +2,9 @@
Section: gnome
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
- dpatch,
+ quilt,
libgtk2.0-dev (>= 2.11.6),
libglib2.0-dev (>= 2.13.4),
libgnomeui-dev (>= 2.6.1.1-4),
@@ -49,7 +49,9 @@
valac (>= 0.0.8),
python-dev (>= 2.3),
python-gobject-dev,
- python-gtk2-dev (>= 2.8)
+ python-gtk2-dev (>= 2.8),
+ libbluetooth-dev,
+ libgalago-dev (>= 0.5.2)
Standards-Version: 3.7.2
Package: totem
@@ -57,87 +59,46 @@
Depends: ${misc:Depends},
totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version})
Description: A simple media player for the Gnome desktop (dummy package)
- Its features :
- .
- * Play any xine supported file
- * LIRC support
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This dummy package installs Totem with the GStreamer backend by
+ default.
+
+Package: totem-xine
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ gnome-icon-theme (>= 2.15.90),
+ iso-codes,
+ totem-common (>= ${gnome:Version}),
+ totem-common (<< ${gnome:NextVersion})
+Recommends: totem-mozilla (= ${source:Version}),
+ totem-plugins,
+ libxine1-ffmpeg
+Conflicts: totem (<< 0.99.12-2)
+Description: A simple media player for the Gnome desktop based on xine
+ 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
- * Gnome-vfs input plugin (this was moved to xine-lib)
* Full-screen mode (move your mouse and you get nice controls) with
Xinerama, dual-head and RandR support
- * Remote operation mode to control a running Totem
- * Seek and Volume controls
- * Aspect ratio toggling, Scaling based on the video's original size
+ * Aspect ratio toggling, scaling based on the video's original size
* Full keyboard control
- * Simple playlist with Repeat mode, with saving feature
- * Gnome and Nautilus integration (Totem registers the file-types,
- adds a menu item, and uses the proxy configuration)
- * Nice default logo
- * Properties window (information about the current movie)
- * Drag'n'drop and mousewheel actions
- * Screenshot feature
+ * Simple playlist with repeat mode and saving feature
+ * Gnome and Nautilus integration
+ * Screenshot of the current movie
* Brightness and Contrast control
* Visualisation plugin when playing audio-only files
- * Video thumbnailer (Requires nautilus from the GNOME 2.2 release)
+ * Video thumbnailer for nautilus
* Nautilus properties page
* Works on remote displays
- * External subtitle support (xine).
- * DVD, VCD and OGG/OGM subtitles and languages support
- * Automatic download of the Windows DLL plugins
- * Dialog for more accurate seeking
- * Authentication dialogs when location requires it
- .
- Author: Bastien Nocera <hadess at hadess.net>
- Homepage: http://www.hadess.net/totem.php3
- .
- This package is a dummy package depending on totem-xine for the moment.
-
-Package: totem-xine
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- gnome-icon-theme (>= 2.15.90),
- iso-codes
-Recommends: totem-mozilla (= ${source:Version}),
- libxine1-ffmpeg
-Conflicts: totem (<< 0.99.12-2),
- totem-gstreamer
-Description: A simple media player for the Gnome desktop based on xine
- Its features :
- .
- * Play any xine supported file
- * LIRC support
- * 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
- * Gnome-vfs input plugin (this was moved to xine-lib)
- * Full-screen mode (move your mouse and you get nice controls) with
- Xinerama, dual-head and RandR support
- * Remote operation mode to control a running Totem
- * Seek and Volume controls
- * Aspect ratio toggling, Scaling based on the video's original size
- * Full keyboard control
- * Simple playlist with Repeat mode, with saving feature
- * Gnome and Nautilus integration (Totem registers the file-types,
- adds a menu item, and uses the proxy configuration)
- * Nice default logo
- * Properties window (information about the current movie)
- * Drag'n'drop and mousewheel actions
- * Screenshot feature
- * Brightness and Contrast control
- * Visualisation plugin when playing audio-only files
- * Video thumbnailer (Requires nautilus from the GNOME 2.2 release)
- * Nautilus properties page
- * Works on remote displays
- * External subtitle support
- * DVD, VCD and OGG/OGM subtitles and languages support
- * Automatic download of the Windows DLL plugins
- * Dialog for more accurate seeking
- * Authentication dialogs when location requires it
+ * DVD, VCD and OGG/OGM subtitles with automatic language selection
+ * Extensible with plugins
.
Author: Bastien Nocera <hadess at hadess.net>
Homepage: http://www.hadess.net/totem.php3
@@ -152,46 +113,38 @@
gstreamer0.10-plugins-good,
gstreamer0.10-x,
gnome-icon-theme (>= 2.15.90),
- iso-codes
+ iso-codes,
+ totem-common (>= ${gnome:Version}),
+ totem-common (<< ${gnome:NextVersion})
Conflicts: totem (<< 0.99.12-2),
- totem-xine,
gnome-control-center (<< 2.15.90)
Recommends: totem-mozilla (= ${source:Version}),
+ totem-plugins,
gstreamer0.10-plugins-ugly,
gstreamer0.10-ffmpeg,
gnome-control-center (>= 2.15.90)
Description: A simple media player for the Gnome desktop based on gstreamer
- Its features :
- .
- * Play any gstreamer supported file
- * LIRC support
+ 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
- * Gnome-vfs input plugin
* Full-screen mode (move your mouse and you get nice controls) with
Xinerama, dual-head and RandR support
- * Remote operation mode to control a running Totem
- * Seek and Volume controls
- * Aspect ratio toggling, Scaling based on the video's original size
+ * Aspect ratio toggling, scaling based on the video's original size
* Full keyboard control
- * Simple playlist with Repeat mode, with saving feature
- * Gnome and Nautilus integration (Totem registers the file-types,
- adds a menu item, and uses the proxy configuration)
- * Nice default logo
- * Properties window (information about the current movie)
- * Drag'n'drop and mousewheel actions
- * Screenshot feature
+ * Simple playlist with repeat mode and saving feature
+ * Gnome, Nautilus and Gnome-vfs integration
+ * Screenshot of the current movie
* Brightness and Contrast control
* Visualisation plugin when playing audio-only files
- * Video thumbnailer (Requires nautilus from the GNOME 2.2 release)
+ * Video thumbnailer for nautilus
* Nautilus properties page
* Works on remote displays
- * DVD, VCD and OGG/OGM subtitles and languages support
- * Automatic download of the Windows DLL plugins
- * Dialog for more accurate seeking
- * Authentication dialogs when location requires it
+ * DVD, VCD and OGG/OGM subtitles with automatic language selection
+ * Extensible with plugins
.
Author: Bastien Nocera <hadess at hadess.net>
Homepage: http://www.hadess.net/totem.php3
@@ -200,7 +153,7 @@
Architecture: all
Section: web
Depends: ${misc:Depends},
- totem-xine (>= ${source:Version}) | totem-gstreamer (>= ${source:Version}),
+ totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version}),
dbus (>= 0.61)
Recommends: epiphany-browser | www-browser
Description: Totem Mozilla plugin
@@ -215,8 +168,6 @@
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: totem-gstreamer (<< 1.1.2-0ubuntu5),
- totem-xine (<< 1.1.2-0ubuntu5)
Description: Totem Playlist Parser library - runtime version
A library to parse playlists.
.
@@ -236,14 +187,50 @@
.
This package contains the development headers.
-Package: libtotem-plparser7-dbg
+Package: totem-common
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: 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: libs
Priority: extra
-Depends: libtotem-plparser7 (= ${binary:Version}),
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
${misc:Depends}
-Conflicts: libtotem-plparser1-dbg
-Description: Totem Playlist Parser library - debugging version
- A library to parse playlists.
- .
- This package contains unstripped shared libraries.
+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-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+ ${misc:Depends}, ${shlibs:Depends}
+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
+ .
+ Additional plugins can be written in C, Python or Vala.
Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in (original)
+++ desktop/unstable/totem/debian/control.in Tue Sep 25 23:39:04 2007
@@ -4,7 +4,7 @@
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
- dpatch,
+ quilt,
libgtk2.0-dev (>= 2.11.6),
libglib2.0-dev (>= 2.13.4),
libgnomeui-dev (>= 2.6.1.1-4),
@@ -49,7 +49,9 @@
valac (>= 0.0.8),
python-dev (>= 2.3),
python-gobject-dev,
- python-gtk2-dev (>= 2.8)
+ python-gtk2-dev (>= 2.8),
+ libbluetooth-dev,
+ libgalago-dev (>= 0.5.2)
Standards-Version: 3.7.2
Package: totem
@@ -57,87 +59,46 @@
Depends: ${misc:Depends},
totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version})
Description: A simple media player for the Gnome desktop (dummy package)
- Its features :
- .
- * Play any xine supported file
- * LIRC support
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This dummy package installs Totem with the GStreamer backend by
+ default.
+
+Package: totem-xine
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ gnome-icon-theme (>= 2.15.90),
+ iso-codes,
+ totem-common (>= ${gnome:Version}),
+ totem-common (<< ${gnome:NextVersion})
+Recommends: totem-mozilla (= ${source:Version}),
+ totem-plugins,
+ libxine1-ffmpeg
+Conflicts: totem (<< 0.99.12-2)
+Description: A simple media player for the Gnome desktop based on xine
+ 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
- * Gnome-vfs input plugin (this was moved to xine-lib)
* Full-screen mode (move your mouse and you get nice controls) with
Xinerama, dual-head and RandR support
- * Remote operation mode to control a running Totem
- * Seek and Volume controls
- * Aspect ratio toggling, Scaling based on the video's original size
+ * Aspect ratio toggling, scaling based on the video's original size
* Full keyboard control
- * Simple playlist with Repeat mode, with saving feature
- * Gnome and Nautilus integration (Totem registers the file-types,
- adds a menu item, and uses the proxy configuration)
- * Nice default logo
- * Properties window (information about the current movie)
- * Drag'n'drop and mousewheel actions
- * Screenshot feature
+ * Simple playlist with repeat mode and saving feature
+ * Gnome and Nautilus integration
+ * Screenshot of the current movie
* Brightness and Contrast control
* Visualisation plugin when playing audio-only files
- * Video thumbnailer (Requires nautilus from the GNOME 2.2 release)
+ * Video thumbnailer for nautilus
* Nautilus properties page
* Works on remote displays
- * External subtitle support (xine).
- * DVD, VCD and OGG/OGM subtitles and languages support
- * Automatic download of the Windows DLL plugins
- * Dialog for more accurate seeking
- * Authentication dialogs when location requires it
- .
- Author: Bastien Nocera <hadess at hadess.net>
- Homepage: http://www.hadess.net/totem.php3
- .
- This package is a dummy package depending on totem-xine for the moment.
-
-Package: totem-xine
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- gnome-icon-theme (>= 2.15.90),
- iso-codes
-Recommends: totem-mozilla (= ${source:Version}),
- libxine1-ffmpeg
-Conflicts: totem (<< 0.99.12-2),
- totem-gstreamer
-Description: A simple media player for the Gnome desktop based on xine
- Its features :
- .
- * Play any xine supported file
- * LIRC support
- * 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
- * Gnome-vfs input plugin (this was moved to xine-lib)
- * Full-screen mode (move your mouse and you get nice controls) with
- Xinerama, dual-head and RandR support
- * Remote operation mode to control a running Totem
- * Seek and Volume controls
- * Aspect ratio toggling, Scaling based on the video's original size
- * Full keyboard control
- * Simple playlist with Repeat mode, with saving feature
- * Gnome and Nautilus integration (Totem registers the file-types,
- adds a menu item, and uses the proxy configuration)
- * Nice default logo
- * Properties window (information about the current movie)
- * Drag'n'drop and mousewheel actions
- * Screenshot feature
- * Brightness and Contrast control
- * Visualisation plugin when playing audio-only files
- * Video thumbnailer (Requires nautilus from the GNOME 2.2 release)
- * Nautilus properties page
- * Works on remote displays
- * External subtitle support
- * DVD, VCD and OGG/OGM subtitles and languages support
- * Automatic download of the Windows DLL plugins
- * Dialog for more accurate seeking
- * Authentication dialogs when location requires it
+ * DVD, VCD and OGG/OGM subtitles with automatic language selection
+ * Extensible with plugins
.
Author: Bastien Nocera <hadess at hadess.net>
Homepage: http://www.hadess.net/totem.php3
@@ -152,46 +113,38 @@
gstreamer0.10-plugins-good,
gstreamer0.10-x,
gnome-icon-theme (>= 2.15.90),
- iso-codes
+ iso-codes,
+ totem-common (>= ${gnome:Version}),
+ totem-common (<< ${gnome:NextVersion})
Conflicts: totem (<< 0.99.12-2),
- totem-xine,
gnome-control-center (<< 2.15.90)
Recommends: totem-mozilla (= ${source:Version}),
+ totem-plugins,
gstreamer0.10-plugins-ugly,
gstreamer0.10-ffmpeg,
gnome-control-center (>= 2.15.90)
Description: A simple media player for the Gnome desktop based on gstreamer
- Its features :
- .
- * Play any gstreamer supported file
- * LIRC support
+ 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
- * Gnome-vfs input plugin
* Full-screen mode (move your mouse and you get nice controls) with
Xinerama, dual-head and RandR support
- * Remote operation mode to control a running Totem
- * Seek and Volume controls
- * Aspect ratio toggling, Scaling based on the video's original size
+ * Aspect ratio toggling, scaling based on the video's original size
* Full keyboard control
- * Simple playlist with Repeat mode, with saving feature
- * Gnome and Nautilus integration (Totem registers the file-types,
- adds a menu item, and uses the proxy configuration)
- * Nice default logo
- * Properties window (information about the current movie)
- * Drag'n'drop and mousewheel actions
- * Screenshot feature
+ * Simple playlist with repeat mode and saving feature
+ * Gnome, Nautilus and Gnome-vfs integration
+ * Screenshot of the current movie
* Brightness and Contrast control
* Visualisation plugin when playing audio-only files
- * Video thumbnailer (Requires nautilus from the GNOME 2.2 release)
+ * Video thumbnailer for nautilus
* Nautilus properties page
* Works on remote displays
- * DVD, VCD and OGG/OGM subtitles and languages support
- * Automatic download of the Windows DLL plugins
- * Dialog for more accurate seeking
- * Authentication dialogs when location requires it
+ * DVD, VCD and OGG/OGM subtitles with automatic language selection
+ * Extensible with plugins
.
Author: Bastien Nocera <hadess at hadess.net>
Homepage: http://www.hadess.net/totem.php3
@@ -200,7 +153,7 @@
Architecture: all
Section: web
Depends: ${misc:Depends},
- totem-xine (>= ${source:Version}) | totem-gstreamer (>= ${source:Version}),
+ totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version}),
dbus (>= 0.61)
Recommends: epiphany-browser | www-browser
Description: Totem Mozilla plugin
@@ -215,8 +168,6 @@
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: totem-gstreamer (<< 1.1.2-0ubuntu5),
- totem-xine (<< 1.1.2-0ubuntu5)
Description: Totem Playlist Parser library - runtime version
A library to parse playlists.
.
@@ -236,14 +187,50 @@
.
This package contains the development headers.
-Package: libtotem-plparser7-dbg
+Package: totem-common
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: 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: libs
Priority: extra
-Depends: libtotem-plparser7 (= ${binary:Version}),
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
${misc:Depends}
-Conflicts: libtotem-plparser1-dbg
-Description: Totem Playlist Parser library - debugging version
- A library to parse playlists.
- .
- This package contains unstripped shared libraries.
+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-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+ ${misc:Depends}, ${shlibs:Depends}
+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
+ .
+ Additional plugins can be written in C, Python or Vala.
Copied: desktop/unstable/totem/debian/patches/20_use_alternatives.patch (from r12832, desktop/unstable/totem/debian/patches/20_use_alternatives.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/20_use_alternatives.patch?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/20_use_alternatives.dpatch (original)
+++ desktop/unstable/totem/debian/patches/20_use_alternatives.patch Tue Sep 25 23:39:04 2007
@@ -1,31 +1,7 @@
-#! /bin/sh -e
-## 20_use_alternatives.dpatch by Sebastien Bacher <seb128 at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /tmp/totem-0.99.15.1.orig/data/schemas.sh /tmp/totem-0.99.15.1/data/schemas.sh
---- /tmp/totem-0.99.15.1.orig/data/schemas.sh 2004-07-08 10:13:39 -0700
-+++ totem-0.99.15.1/data/schemas.sh 2004-08-16 09:19:20 -0700
+Index: totem-2.20.0/data/schemas.sh
+===================================================================
+--- totem-2.20.0.orig/data/schemas.sh 2007-08-26 01:05:12.000000000 +0200
++++ totem-2.20.0/data/schemas.sh 2007-09-25 14:54:52.714252335 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
@@ -33,5 +9,5 @@
-COMMAND="$2/totem-video-thumbnailer -s %s %u %o"
+COMMAND="$2/gnome-video-thumbnailer -s %s %u %o"
- upd_schema()
- {
+ . `dirname $0`/mime-functions.sh
+
Copied: desktop/unstable/totem/debian/patches/25_revert-xine-reqs-bump.patch (from r12832, desktop/unstable/totem/debian/patches/25_revert-xine-reqs-bump.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/25_revert-xine-reqs-bump.patch?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/25_revert-xine-reqs-bump.dpatch (original)
+++ desktop/unstable/totem/debian/patches/25_revert-xine-reqs-bump.patch Tue Sep 25 23:39:04 2007
@@ -1,19 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25_revert-xine-reqs-bump.dpatch by Loic Minier <lool at dooz.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad totem-2.18.2~/configure.in totem-2.18.2/configure.in
---- totem-2.18.2~/configure.in 2007-05-16 17:33:09.000000000 +0200
-+++ totem-2.18.2/configure.in 2007-06-01 12:36:37.000000000 +0200
-@@ -78,7 +78,7 @@
+Index: totem-2.20.0/configure.in
+===================================================================
+--- totem-2.20.0.orig/configure.in 2007-09-16 23:41:25.000000000 +0200
++++ totem-2.20.0/configure.in 2007-09-25 14:55:02.550812889 +0200
+@@ -82,7 +82,7 @@
dnl the two versions here implicate the gstreamer core and gst-plugins
dnl release versions.
-XINE_REQS=1.1.7
+XINE_REQS=1.1.4
GST_MAJORMINOR=0.10
- GST_REQS=0.10.6
- GSTPLUG_REQS=0.10.7
+ GST_REQS=0.10.12
+ GSTPLUG_REQS=0.10.12
Copied: desktop/unstable/totem/debian/patches/30_kfreebsd_gnu.patch (from r12832, desktop/unstable/totem/debian/patches/30_kfreebsd_gnu.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/30_kfreebsd_gnu.patch?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/30_kfreebsd_gnu.dpatch (original)
+++ desktop/unstable/totem/debian/patches/30_kfreebsd_gnu.patch Tue Sep 25 23:39:04 2007
@@ -1,33 +1,8 @@
-#! /bin/sh -e
-## 30_kfreebsd_gnu.dpatch by Joe Marcus Clarke <marcus at marcuscom.com>
-## and Aurelien Jarno <aurel32 at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad totem-2.16.2~/src/plparse/totem-disc.c totem-2.16.2/src/plparse/totem-disc.c
---- totem-2.16.2~/src/plparse/totem-disc.c 2006-08-16 20:28:18.000000000 +0200
-+++ totem-2.16.2/src/plparse/totem-disc.c 2006-11-06 18:24:13.000000000 +0100
-@@ -42,6 +42,35 @@
+Index: totem-2.20.0/src/plparse/totem-disc.c
+===================================================================
+--- totem-2.20.0.orig/src/plparse/totem-disc.c 2007-09-25 14:55:27.344225785 +0200
++++ totem-2.20.0/src/plparse/totem-disc.c 2007-09-25 14:56:04.242328488 +0200
+@@ -43,6 +43,35 @@
#include <glib/gi18n.h>
#include <libgnomevfs/gnome-vfs.h>
@@ -63,49 +38,3 @@
#ifdef HAVE_HAL
#include <libhal.h>
#include <dbus/dbus.h>
-diff -urNad totem-2.16.2~/src/plparse/totem-disc.c.rej totem-2.16.2/src/plparse/totem-disc.c.rej
---- totem-2.16.2~/src/plparse/totem-disc.c.rej 1970-01-01 01:00:00.000000000 +0100
-+++ totem-2.16.2/src/plparse/totem-disc.c.rej 2006-11-06 18:22:34.000000000 +0100
-@@ -0,0 +1,42 @@
-+***************
-+*** 43,49 ****
-+ #include <glib/gi18n.h>
-+ #include <libgnomevfs/gnome-vfs.h>
-+
-+ #include <linux/cdrom.h>
-+
-+ #include "totem-disc.h"
-+
-+--- 43,74 ----
-+ #include <glib/gi18n.h>
-+ #include <libgnomevfs/gnome-vfs.h>
-+
-++ #if defined (__linux__)
-++ #include <mntent.h>
-+ #include <linux/cdrom.h>
-++ #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
-++ #include <sys/cdio.h>
-++ #include <sys/disklabel.h>
-++
-++ #define CDROM_DRIVE_STATUS 0x5326
-++ #define CDROM_DISC_STATUS 0x5327
-++ #define CDS_AUDIO 100
-++ #define CDS_MIXED 105
-++ #define CDS_DATA_1 101
-++ #define CDS_DATA_2 102
-++ #define CDS_NO_INFO 0 /* if not implemented */
-++ #define CDS_NO_DISC 1
-++ #define CDS_TRAY_OPEN 2
-++ #define CDS_DRIVE_NOT_READY 3
-++ #define CDS_DISC_OK 4
-++ #define CDS_XA_2_1 103
-++ #define CDS_XA_2_2 104
-++ #define CDC_DVD 0x8000
-++ #define ENOMEDIUM ENODEV
-++ #define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
-++ #else
-++ # error "Unknown system"
-++ #endif
-+
-+ #include "totem-disc.h"
-+
Added: desktop/unstable/totem/debian/patches/60_gnome-doc-utils.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/60_gnome-doc-utils.patch?rev=12848&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/60_gnome-doc-utils.patch (added)
+++ desktop/unstable/totem/debian/patches/60_gnome-doc-utils.patch Tue Sep 25 23:39:04 2007
@@ -1,0 +1,803 @@
+Index: totem-2.20.0/help/Makefile.in
+===================================================================
+--- totem-2.20.0.orig/help/Makefile.in 2007-09-16 23:55:38.000000000 +0200
++++ totem-2.20.0/help/Makefile.in 2007-09-26 00:32:42.613977324 +0200
+@@ -131,8 +131,6 @@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+-GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@
+-GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_MKENUMS = @GLIB_MKENUMS@
+@@ -157,14 +155,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -176,7 +172,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
+@@ -338,33 +333,8 @@
+ $(filter $(LINGUAS),$(DOC_LINGUAS)), \
+ $(DOC_LINGUAS))
+
+-
+-################################################################################
+-rngdoc_args = \
+- --stringparam rngdoc.id \
+- $(shell echo $(basename $(notdir $(1))) | sed -e 's/[^A-Za-z0-9_-]/_/g')\
+- $(_rngdoc) $(filter %/$(basename $(notdir $(1))).rng,$(_RNGDOC_RNGS))
+-
+-_RNGDOC_RNGS = $(sort $(patsubst ./%, %, $(foreach dir,$(RNGDOC_DIRS), \
+- $(wildcard $(dir)/*.rng) $(wildcard $(srcdir)/$(dir)/*.rng))))
+-
+-_RNGDOC_C_DOCS = $(foreach rng,$(_RNGDOC_RNGS), C/$(basename $(notdir $(rng))).xml)
+-
+-################################################################################
+-
+-# FIXME: _XSLDOC_XSLS is getting dupes with relative/absolute in some
+-# cases. Right now, I'm just taking the first, but that's just a bad
+-# work-around. Fix the real problem.
+-xsldoc_args = \
+- --stringparam xsldoc.id \
+- $(shell echo $(basename $(notdir $(1))) | sed -e 's/[^A-Za-z0-9_-]/_/g')\
+- $(_xsldoc) \
+- $(word 1,$(filter %/$(basename $(notdir $(1))).xsl,$(_XSLDOC_XSLS)))
+-
+-_XSLDOC_XSLS = $(sort $(patsubst ./%, %, $(foreach dir,$(XSLDOC_DIRS), \
+- $(wildcard $(dir)/*.xsl) $(wildcard $(srcdir)/$(dir)/*.xsl))))
+-
+-_XSLDOC_C_DOCS = $(foreach xsl,$(_XSLDOC_XSLS), C/$(basename $(notdir $(xsl))).xml)
++_DOC_ABS_SRCDIR = @abs_srcdir@
++ at ENABLE_SK_TRUE@_ENABLE_SK = true
+
+ ################################################################################
+ db2omf_args = \
+@@ -376,10 +346,12 @@
+ --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \
+ --stringparam db2omf.omf_dir "$(OMF_DIR)" \
+ --stringparam db2omf.help_dir "$(HELP_DIR)" \
+- --stringparam db2omf.omf_in "`pwd`/$(_DOC_OMF_IN)" \
++ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \
++ $(if $(_ENABLE_SK), \
++ --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \
+ $(_db2omf) $(2)
+
+-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(srcdir)/$(DOC_MODULE).omf.in))
++_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
+ _DOC_OMF_DB = $(if $(_DOC_OMF_IN), \
+ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
+
+@@ -394,25 +366,15 @@
+
+
+ ################################################################################
+-_CVSIGNORE_TOP = $(if $(DOC_MODULE), .cvsignore)
+-_CVSIGNORE_C = $(if $(DOC_MODULE), C/.cvsignore)
+-_CVSIGNORE_LC = $(if $(DOC_MODULE),$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/.cvsignore))
+-_CVSIGNORE_TOP_FILES = $(_DOC_OMF_ALL) $(_DOC_DSK_ALL)
+-_CVSIGNORE_C_FILES = $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS)
+-_CVSIGNORE_LC_FILES = $(_DOC_LC_DOCS)
+-
+-################################################################################
+ _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
+ _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
+ _DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
+ _DOC_C_DOCS = \
+ $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
+- $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS) \
+ $(_DOC_C_MODULE)
+
+ _DOC_C_DOCS_NOENT = \
+- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
+- $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS)
++ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
+
+ _DOC_C_FIGURES = $(if $(DOC_FIGURES), \
+ $(foreach fig,$(DOC_FIGURES),C/$(fig)), \
+@@ -438,14 +400,6 @@
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
+ $(lc)/$(notdir $(inc)) ))
+
+-_RNGDOC_LC_DOCS = \
+- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_RNGDOC_C_DOCS), \
+- $(lc)/$(notdir $(doc)) ))
+-
+-_XSLDOC_LC_DOCS = \
+- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_XSLDOC_C_DOCS), \
+- $(lc)/$(notdir $(doc)) ))
+-
+
+ # FIXME: probably have to shell escape to determine the file names
+ _DOC_LC_HTML = \
+@@ -454,7 +408,6 @@
+
+ _DOC_LC_DOCS = \
+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
+- $(_RNGDOC_LC_DOCS) $(_XSLDOC_LC_DOCS) \
+ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
+
+ _DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
+@@ -471,12 +424,6 @@
+ $(_DOC_C_HTML) $(_DOC_LC_HTML))
+
+ _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
+- at ENABLE_SK_FALSE@_ENABLE_SK = false
+-
+-################################################################################
+- at ENABLE_SK_TRUE@_ENABLE_SK = true
+-_clean_rngdoc = $(if $(RNGDOC_DIRS),clean-doc-rngdoc)
+-_clean_xsldoc = $(if $(XSLDOC_DIRS),clean-doc-xsldoc)
+ _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
+ _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
+ _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
+@@ -849,13 +796,17 @@
+ done;
+ cp $@.tmp $@ && rm -f $@.tmp
+
++dist-check-gdu:
++ at HAVE_GNOME_DOC_UTILS_FALSE@ @echo "*** GNOME Doc Utils must be installed in order to make dist"
++ at HAVE_GNOME_DOC_UTILS_FALSE@ @false
++
+ .PHONY: dist-doc-header
+ dist-doc-header: $(DOC_H_FILE)
+ @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
+ $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
+
+-doc-dist-hook: $(if $(DOC_H_FILE),dist-doc-header)
++doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
+
+ .PHONY: clean-doc-header
+ clean-local: $(_clean_doc_header)
+@@ -881,84 +832,38 @@
+
+ DOC_LINGUAS ?=
+
+-RNGDOC_DIRS ?=
+-
+-XSLDOC_DIRS ?=
+-
+ ################################################################################
+
+ _xml2po ?= `which xml2po`
+
+ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+ _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_rngdoc ?= `$(PKG_CONFIG) --variable rngdoc gnome-doc-utils`
+-_xsldoc ?= `$(PKG_CONFIG) --variable xsldoc gnome-doc-utils`
+ _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+ _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+ _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+-
+-_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+-
+-# FIXME: Fix the dependancies
+-$(_RNGDOC_C_DOCS) : $(_RNGDOC_RNGS)
+- if ! test -d $(dir $@); then mkdir $(dir $@); fi;
+- xsltproc $(call rngdoc_args,$@,$<) | xmllint --c14n - > $@.tmp && \
+- cp $@.tmp $@ && rm -f $@.tmp
+-
+-.PHONY: rngdoc
+-rngdoc: $(_RNGDOC_C_DOCS)
+-
+-# FIXME: Fix the dependancies
+-$(_XSLDOC_C_DOCS) : $(_XSLDOC_XSLS)
+- if ! test -d $(dir $@); then mkdir $(dir $@); fi;
+- xsltproc $(call xsldoc_args,$@,$<) | xmllint --c14n - > $@.tmp && \
+- cp $@.tmp $@ && rm -f $@.tmp
+-
+-.PHONY: xsldoc
+-xsldoc: $(_XSLDOC_C_DOCS)
++ at ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
++ at ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
++ at ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+
+ $(_DOC_OMF_DB) : $(_DOC_OMF_IN)
+ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
+- xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook')
++ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
++ echo "The file '$(_skcontentslist)' does not exist." >&2; \
++ echo "Please check your ScrollKeeper installation." >&2; \
++ exit 1; }
++ xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
+
+ $(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
+ $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
+- xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml')
++ at ENABLE_SK_TRUE@ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
++ at ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \
++ at ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \
++ at ENABLE_SK_TRUE@ exit 1; }
++ xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
+
+ .PHONY: omf
+ omf: $(_DOC_OMF_ALL)
+
+-$(_CVSIGNORE_TOP) : $(_CVSIGNORE_TOP_FILES)
+- if ! test -f $@; then touch $@; fi
+- cat $@ > $@.tmp
+- list='$^'; for file in $$list; do \
+- echo $$file >> $@.tmp; \
+- done
+- cat $@.tmp | sort | uniq > $@
+- rm $@.tmp
+-
+-$(_CVSIGNORE_C) : $(_CVSIGNORE_C_FILES)
+- if ! test -f $@; then touch $@; fi
+- cat $@ > $@.tmp
+- list='$^'; for file in $$list; do \
+- echo $$file | sed -e 's/.*\///' >> $@.tmp; \
+- done
+- cat $@.tmp | sort | uniq > $@
+- rm $@.tmp
+-
+-$(_CVSIGNORE_LC) : $(_CVSIGNORE_LC_FILES)
+- if ! test -f $@; then touch $@; fi
+- cat $@ > $@.tmp
+- list='$(wildcard $(_CVSIGNORE_LC_FILES),$(dir $@)/*)'; \
+- for file in $$list; do \
+- echo $$file | sed -e 's/.*\///' >> $@.tmp; \
+- done
+- cat $@.tmp | sort | uniq > $@
+- rm $@.tmp
+-
+-.PHONY: cvsignore
+-cvsignore: $(_CVSIGNORE_TOP) $(_CVSIGNROE_C) $(_CVSIGNORE_LC)
+-
+ .PHONY: po
+ po: $(_DOC_POFILES)
+
+@@ -973,11 +878,7 @@
+ fi;
+ @docs=; \
+ list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
+- if test -f $$doc; then \
+- docs="$$docs ../$$doc"; \
+- else \
+- docs="$$docs ../$(srcdir)/$$doc"; \
+- fi; \
++ docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
+ done; \
+ if ! test -f $@; then \
+ echo "(cd $(dir $@) && \
+@@ -998,8 +899,7 @@
+ $(_DOC_LC_DOCS) : $(_DOC_POFILES)
+ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+ if ! test -d $(dir $@); then mkdir $(dir $@); fi
+- case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";; esac; \
+- if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \
++ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+ (cd $(dir $@) && \
+ $(_xml2po) -e -p \
+ "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
+@@ -1013,15 +913,15 @@
+ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
+ xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
+
++################################################################################
++
+ all: \
+ $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
+ $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
+ $(_DOC_HTML_ALL) $(_DOC_POFILES)
+
+-.PHONY: clean-doc-rngdoc clean-doc-xsldoc clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
++.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
+
+-clean-doc-rngdoc: ; rm -f $(_RNGDOC_C_DOCS) $(_RNGDOC_LC_DOCS)
+-clean-doc-xsldoc: ; rm -f $(_XSLDOC_C_DOCS) $(_XSLDOC_LC_DOCS)
+ clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
+ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
+ clean-doc-lc:
+@@ -1049,19 +949,15 @@
+ done
+
+ clean-local: \
+- $(_clean_rngdoc) $(_clean_xsldoc) \
+ $(_clean_omf) $(_clean_dsk) \
+ $(_clean_lc) $(_clean_dir)
+ distclean-local: \
+- $(_clean_rngdoc) $(_clean_xsldoc) \
+ $(_clean_omf) $(_clean_dsk) \
+ $(_clean_lc) $(_clean_dir)
+ mostlyclean-local: \
+- $(_clean_rngdoc) $(_clean_xsldoc) \
+ $(_clean_omf) $(_clean_dsk) \
+ $(_clean_lc) $(_clean_dir)
+ maintainer-clean-local: \
+- $(_clean_rngdoc) $(_clean_xsldoc) \
+ $(_clean_omf) $(_clean_dsk) \
+ $(_clean_lc) $(_clean_dir)
+
+@@ -1080,6 +976,11 @@
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
+ for doc in $$list; do \
+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
++ if ! test -d "$(distdir)/$$docdir"; then \
++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
++ $(mkinstalldirs) "$(distdir)/$$docdir"; \
++ fi; \
+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
+ done
+@@ -1148,6 +1049,12 @@
+ done
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
++ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
++ if ! test -d "$$docdir"; then \
++ echo "$(mkinstalldirs) $$docdir"; \
++ $(mkinstalldirs) "$$docdir"; \
++ fi; \
+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
+ done
+@@ -1215,7 +1122,7 @@
+
+ uninstall-doc-omf:
+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
+- if test "x$(_ENABLE_SK)" == "xtrue"; then \
++ if test "x$(_ENABLE_SK)" = "xtrue"; then \
+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+ fi; \
+Index: totem-2.20.0/gnome-doc-utils.make
+===================================================================
+--- totem-2.20.0.orig/gnome-doc-utils.make 2007-08-31 13:41:58.000000000 +0200
++++ totem-2.20.0/gnome-doc-utils.make 2007-09-26 00:32:42.613977324 +0200
+@@ -59,13 +59,19 @@
+ done;
+ cp $@.tmp $@ && rm -f $@.tmp
+
++dist-check-gdu:
++if !HAVE_GNOME_DOC_UTILS
++ @echo "*** GNOME Doc Utils must be installed in order to make dist"
++ @false
++endif
++
+ .PHONY: dist-doc-header
+ dist-doc-header: $(DOC_H_FILE)
+ @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
+ $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
+
+-doc-dist-hook: $(if $(DOC_H_FILE),dist-doc-header)
++doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
+
+ .PHONY: clean-doc-header
+ _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
+@@ -110,13 +116,7 @@
+ $(filter $(LINGUAS),$(DOC_LINGUAS)), \
+ $(DOC_LINGUAS))
+
+-## @ RNGDOC_DIRS
+-## The directories containing RNG files to be documented with rngdoc
+-RNGDOC_DIRS ?=
+-
+-## @ XSLDOC_DIRS
+-## The directories containing XSLT files to be documented with xsldoc
+-XSLDOC_DIRS ?=
++_DOC_ABS_SRCDIR = @abs_srcdir@
+
+
+ ################################################################################
+@@ -126,71 +126,16 @@
+
+ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+ _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_rngdoc ?= `$(PKG_CONFIG) --variable rngdoc gnome-doc-utils`
+-_xsldoc ?= `$(PKG_CONFIG) --variable xsldoc gnome-doc-utils`
+ _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+ _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+ _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+
++if ENABLE_SK
++_ENABLE_SK = true
++_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ _sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+-
+-
+-################################################################################
+-## @@ Rules for rngdoc
+-
+-rngdoc_args = \
+- --stringparam rngdoc.id \
+- $(shell echo $(basename $(notdir $(1))) | sed -e 's/[^A-Za-z0-9_-]/_/g')\
+- $(_rngdoc) $(filter %/$(basename $(notdir $(1))).rng,$(_RNGDOC_RNGS))
+-
+-## @ _RNGDOC_RNGS
+-## The actual RNG files for which to generate documentation with rngdoc
+-_RNGDOC_RNGS = $(sort $(patsubst ./%, %, $(foreach dir,$(RNGDOC_DIRS), \
+- $(wildcard $(dir)/*.rng) $(wildcard $(srcdir)/$(dir)/*.rng))))
+-
+-## @ _RNGDOC_C_DOCS
+-## The generated rngdoc documentation in the C locale
+-_RNGDOC_C_DOCS = $(foreach rng,$(_RNGDOC_RNGS), C/$(basename $(notdir $(rng))).xml)
+-
+-# FIXME: Fix the dependancies
+-$(_RNGDOC_C_DOCS) : $(_RNGDOC_RNGS)
+- if ! test -d $(dir $@); then mkdir $(dir $@); fi;
+- xsltproc $(call rngdoc_args,$@,$<) | xmllint --c14n - > $@.tmp && \
+- cp $@.tmp $@ && rm -f $@.tmp
+-
+-.PHONY: rngdoc
+-rngdoc: $(_RNGDOC_C_DOCS)
+-
+-
+-################################################################################
+-## @@ Rules for xsldoc
+-
+-# FIXME: _XSLDOC_XSLS is getting dupes with relative/absolute in some
+-# cases. Right now, I'm just taking the first, but that's just a bad
+-# work-around. Fix the real problem.
+-xsldoc_args = \
+- --stringparam xsldoc.id \
+- $(shell echo $(basename $(notdir $(1))) | sed -e 's/[^A-Za-z0-9_-]/_/g')\
+- $(_xsldoc) \
+- $(word 1,$(filter %/$(basename $(notdir $(1))).xsl,$(_XSLDOC_XSLS)))
+-
+-## @ _XSLDOC_XSLS
+-## The actual XSLT files for which to generate documentation with xsldoc
+-_XSLDOC_XSLS = $(sort $(patsubst ./%, %, $(foreach dir,$(XSLDOC_DIRS), \
+- $(wildcard $(dir)/*.xsl) $(wildcard $(srcdir)/$(dir)/*.xsl))))
+-
+-## @ _XSLDOC_C_DOCS
+-## The generated xsldoc documentation in the C locale
+-_XSLDOC_C_DOCS = $(foreach xsl,$(_XSLDOC_XSLS), C/$(basename $(notdir $(xsl))).xml)
+-
+-# FIXME: Fix the dependancies
+-$(_XSLDOC_C_DOCS) : $(_XSLDOC_XSLS)
+- if ! test -d $(dir $@); then mkdir $(dir $@); fi;
+- xsltproc $(call xsldoc_args,$@,$<) | xmllint --c14n - > $@.tmp && \
+- cp $@.tmp $@ && rm -f $@.tmp
+-
+-.PHONY: xsldoc
+-xsldoc: $(_XSLDOC_C_DOCS)
++_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
++endif
+
+
+ ################################################################################
+@@ -205,12 +150,14 @@
+ --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \
+ --stringparam db2omf.omf_dir "$(OMF_DIR)" \
+ --stringparam db2omf.help_dir "$(HELP_DIR)" \
+- --stringparam db2omf.omf_in "`pwd`/$(_DOC_OMF_IN)" \
++ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \
++ $(if $(_ENABLE_SK), \
++ --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \
+ $(_db2omf) $(2)
+
+ ## @ _DOC_OMF_IN
+ ## The OMF input file
+-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(srcdir)/$(DOC_MODULE).omf.in))
++_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
+
+ ## @ _DOC_OMF_DB
+ ## The OMF files for DocBook output
+@@ -219,7 +166,11 @@
+
+ $(_DOC_OMF_DB) : $(_DOC_OMF_IN)
+ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
+- xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook')
++ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
++ echo "The file '$(_skcontentslist)' does not exist." >&2; \
++ echo "Please check your ScrollKeeper installation." >&2; \
++ exit 1; }
++ xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
+
+ ## @ _DOC_OMF_HTML
+ ## The OMF files for HTML output
+@@ -228,7 +179,13 @@
+
+ $(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
+ $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
+- xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml')
++if ENABLE_SK
++ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
++ echo "The file '$(_skcontentslist)' does not exist" >&2; \
++ echo "Please check your ScrollKeeper installation." >&2; \
++ exit 1; }
++endif
++ xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
+
+ ## @ _DOC_OMF_ALL
+ ## All OMF output files to be built
+@@ -242,66 +199,6 @@
+
+
+ ################################################################################
+-## @@ Rules for .cvsignore Files
+-
+-## @ _CVSIGNORE_TOP
+-## The .cvsignore file in the top directory
+-_CVSIGNORE_TOP = $(if $(DOC_MODULE), .cvsignore)
+-
+-## @ _CVSIGNORE_C
+-## The .cvsignore file in the C directory
+-_CVSIGNORE_C = $(if $(DOC_MODULE), C/.cvsignore)
+-
+-## @ _CVSIGNORE_LC
+-## The .cvsignore files in other locale directories
+-_CVSIGNORE_LC = $(if $(DOC_MODULE),$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/.cvsignore))
+-
+-## @ _CVSIGNORE_TOP_FILES
+-## The list of files to be listed in the top-level .cvsignore file
+-_CVSIGNORE_TOP_FILES = $(_DOC_OMF_ALL) $(_DOC_DSK_ALL)
+-
+-## @ _CVSIGNORE_C_FILES
+-## The list of files to be listed in the .cvsignore file in the C directory
+-_CVSIGNORE_C_FILES = $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS)
+-
+-## @ _CVSIGNORE_C_FILES
+-## The list of files to be listed in the .cvsignore files in other
+-## locale directories
+-_CVSIGNORE_LC_FILES = $(_DOC_LC_DOCS)
+-
+-$(_CVSIGNORE_TOP) : $(_CVSIGNORE_TOP_FILES)
+- if ! test -f $@; then touch $@; fi
+- cat $@ > $@.tmp
+- list='$^'; for file in $$list; do \
+- echo $$file >> $@.tmp; \
+- done
+- cat $@.tmp | sort | uniq > $@
+- rm $@.tmp
+-
+-$(_CVSIGNORE_C) : $(_CVSIGNORE_C_FILES)
+- if ! test -f $@; then touch $@; fi
+- cat $@ > $@.tmp
+- list='$^'; for file in $$list; do \
+- echo $$file | sed -e 's/.*\///' >> $@.tmp; \
+- done
+- cat $@.tmp | sort | uniq > $@
+- rm $@.tmp
+-
+-$(_CVSIGNORE_LC) : $(_CVSIGNORE_LC_FILES)
+- if ! test -f $@; then touch $@; fi
+- cat $@ > $@.tmp
+- list='$(wildcard $(_CVSIGNORE_LC_FILES),$(dir $@)/*)'; \
+- for file in $$list; do \
+- echo $$file | sed -e 's/.*\///' >> $@.tmp; \
+- done
+- cat $@.tmp | sort | uniq > $@
+- rm $@.tmp
+-
+-.PHONY: cvsignore
+-cvsignore: $(_CVSIGNORE_TOP) $(_CVSIGNROE_C) $(_CVSIGNORE_LC)
+-
+-
+-################################################################################
+ ## @@ C Locale Documents
+
+ ## @ _DOC_C_MODULE
+@@ -320,15 +217,13 @@
+ ## All documentation files in the C locale
+ _DOC_C_DOCS = \
+ $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
+- $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS) \
+ $(_DOC_C_MODULE)
+
+ ## @ _DOC_C_DOCS_NOENT
+ ## All documentation files in the C locale,
+ ## except files included with a SYSTEM entity
+ _DOC_C_DOCS_NOENT = \
+- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
+- $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS)
++ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
+
+ ## @ _DOC_C_FIGURES
+ ## All figures and other external data in the C locale
+@@ -367,18 +262,6 @@
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
+ $(lc)/$(notdir $(inc)) ))
+
+-## @ _RNGDOC_LC_DOCS
+-## The generated rngdoc documentation in all other locales
+-_RNGDOC_LC_DOCS = \
+- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_RNGDOC_C_DOCS), \
+- $(lc)/$(notdir $(doc)) ))
+-
+-## @ _XSLDOC_LC_DOCS
+-## The generated xsldoc documentation in all other locales
+-_XSLDOC_LC_DOCS = \
+- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_XSLDOC_C_DOCS), \
+- $(lc)/$(notdir $(doc)) ))
+-
+ ## @ _DOC_LC_HTML
+ ## All HTML documentation in all other locales
+ # FIXME: probably have to shell escape to determine the file names
+@@ -390,7 +273,6 @@
+ ## All documentation files in all other locales
+ _DOC_LC_DOCS = \
+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
+- $(_RNGDOC_LC_DOCS) $(_XSLDOC_LC_DOCS) \
+ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
+
+ ## @ _DOC_LC_FIGURES
+@@ -413,11 +295,7 @@
+ fi;
+ @docs=; \
+ list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
+- if test -f $$doc; then \
+- docs="$$docs ../$$doc"; \
+- else \
+- docs="$$docs ../$(srcdir)/$$doc"; \
+- fi; \
++ docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
+ done; \
+ if ! test -f $@; then \
+ echo "(cd $(dir $@) && \
+@@ -438,8 +316,7 @@
+ $(_DOC_LC_DOCS) : $(_DOC_POFILES)
+ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+ if ! test -d $(dir $@); then mkdir $(dir $@); fi
+- case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";; esac; \
+- if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \
++ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+ (cd $(dir $@) && \
+ $(_xml2po) -e -p \
+ "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
+@@ -471,22 +348,14 @@
+
+ ################################################################################
+
+-if ENABLE_SK
+-_ENABLE_SK = true
+-else
+-_ENABLE_SK = false
+-endif
+-
+ all: \
+ $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
+ $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
+ $(_DOC_HTML_ALL) $(_DOC_POFILES)
+
+
+-.PHONY: clean-doc-rngdoc clean-doc-xsldoc clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
++.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
+
+-clean-doc-rngdoc: ; rm -f $(_RNGDOC_C_DOCS) $(_RNGDOC_LC_DOCS)
+-clean-doc-xsldoc: ; rm -f $(_XSLDOC_C_DOCS) $(_XSLDOC_LC_DOCS)
+ clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
+ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
+ clean-doc-lc:
+@@ -513,27 +382,21 @@
+ done; \
+ done
+
+-_clean_rngdoc = $(if $(RNGDOC_DIRS),clean-doc-rngdoc)
+-_clean_xsldoc = $(if $(XSLDOC_DIRS),clean-doc-xsldoc)
+ _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
+ _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
+ _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
+ _clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
+
+ clean-local: \
+- $(_clean_rngdoc) $(_clean_xsldoc) \
+ $(_clean_omf) $(_clean_dsk) \
+ $(_clean_lc) $(_clean_dir)
+ distclean-local: \
+- $(_clean_rngdoc) $(_clean_xsldoc) \
+ $(_clean_omf) $(_clean_dsk) \
+ $(_clean_lc) $(_clean_dir)
+ mostlyclean-local: \
+- $(_clean_rngdoc) $(_clean_xsldoc) \
+ $(_clean_omf) $(_clean_dsk) \
+ $(_clean_lc) $(_clean_dir)
+ maintainer-clean-local: \
+- $(_clean_rngdoc) $(_clean_xsldoc) \
+ $(_clean_omf) $(_clean_dsk) \
+ $(_clean_lc) $(_clean_dir)
+
+@@ -553,6 +416,11 @@
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
+ for doc in $$list; do \
+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
++ if ! test -d "$(distdir)/$$docdir"; then \
++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
++ $(mkinstalldirs) "$(distdir)/$$docdir"; \
++ fi; \
+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
+ done
+@@ -623,6 +491,12 @@
+ done
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
++ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
++ if ! test -d "$$docdir"; then \
++ echo "$(mkinstalldirs) $$docdir"; \
++ $(mkinstalldirs) "$$docdir"; \
++ fi; \
+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
+ done
+@@ -691,7 +565,7 @@
+
+ uninstall-doc-omf:
+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
+- if test "x$(_ENABLE_SK)" == "xtrue"; then \
++ if test "x$(_ENABLE_SK)" = "xtrue"; then \
+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+ fi; \
+Index: totem-2.20.0/aclocal.m4
+===================================================================
+--- totem-2.20.0.orig/aclocal.m4 2007-09-26 00:33:27.460532984 +0200
++++ totem-2.20.0/aclocal.m4 2007-09-26 00:34:54.137472421 +0200
+@@ -680,20 +680,10 @@
+ AC_SUBST(WARN_CXXFLAGS)
+ ])
+
+-dnl GNOME_DOC_INIT([MINIMUM-VERSION])
+-
+-AC_DEFUN([GNOME_DOC_INIT],
++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
++AC_DEFUN([GNOME_DOC_DEFINES],
+ [
+-dnl Only apply the version check if we're not configuring ourselves!
+-if test "x$PACKAGE" != "xgnome-doc-utils"; then
+- GDU_REQUIRED_VERSION=0.3.2
+- if test -n "$1"; then
+- GDU_REQUIRED_VERSION=$1
+- fi
+-
+- PKG_CHECK_MODULES([GDU_MODULE_VERSION_CHECK],[gnome-doc-utils >= $GDU_REQUIRED_VERSION])
+-fi
+-
+ AC_ARG_WITH([help-dir],
+ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
+ [with_help_dir='${datadir}/gnome/help'])
+@@ -716,8 +706,27 @@
+ [AC_HELP_STRING([--disable-scrollkeeper],
+ [do not make updates to the scrollkeeper database])],,
+ enable_scrollkeeper=yes)
+-AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
++
++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
++])
++
++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
++#
++AC_DEFUN([GNOME_DOC_INIT],
++[
++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
++
++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
++
++if test "$gdu_cv_have_gdu" = "yes"; then
++ ifelse([$2],,[:],[$2])
++else
++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
++fi
+
++GNOME_DOC_DEFINES
+ ])
+
+
Copied: desktop/unstable/totem/debian/patches/70_autoconf.patch (from r12832, desktop/unstable/totem/debian/patches/70_autoconf.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/70_autoconf.patch?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/70_autoconf.dpatch (original)
+++ desktop/unstable/totem/debian/patches/70_autoconf.patch Tue Sep 25 23:39:04 2007
@@ -1,19 +1,446 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_autoconf.dpatch by Loic Minier <lool at dooz.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad totem-2.18.2~/configure totem-2.18.2/configure
---- totem-2.18.2~/configure 2007-05-16 17:39:53.000000000 +0200
-+++ totem-2.18.2/configure 2007-06-01 12:46:34.000000000 +0200
-@@ -21993,7 +21993,7 @@
+Index: totem-2.20.0/configure
+===================================================================
+--- totem-2.20.0.orig/configure 2007-09-16 23:55:44.000000000 +0200
++++ totem-2.20.0/configure 2007-09-26 00:35:04.290050983 +0200
+@@ -900,13 +900,13 @@
+ INTLTOOL_XGETTEXT
+ ALL_LINGUAS
+ PKG_CONFIG
+-GDU_MODULE_VERSION_CHECK_CFLAGS
+-GDU_MODULE_VERSION_CHECK_LIBS
+ HELP_DIR
+ OMF_DIR
+ DOC_USER_FORMATS
+ ENABLE_SK_TRUE
+ ENABLE_SK_FALSE
++HAVE_GNOME_DOC_UTILS_TRUE
++HAVE_GNOME_DOC_UTILS_FALSE
+ CXX
+ CXXFLAGS
+ ac_ct_CXX
+@@ -1064,8 +1064,6 @@
+ CPPFLAGS
+ CPP
+ PKG_CONFIG
+-GDU_MODULE_VERSION_CHECK_CFLAGS
+-GDU_MODULE_VERSION_CHECK_LIBS
+ CXX
+ CXXFLAGS
+ CCC
+@@ -1771,11 +1769,6 @@
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+- GDU_MODULE_VERSION_CHECK_CFLAGS
+- C compiler flags for GDU_MODULE_VERSION_CHECK, overriding
+- pkg-config
+- GDU_MODULE_VERSION_CHECK_LIBS
+- linker flags for GDU_MODULE_VERSION_CHECK, overriding pkg-config
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
+ CXXCPP C++ preprocessor
+@@ -6541,126 +6534,29 @@
+
+ fi
+
+-if test "x$PACKAGE" != "xgnome-doc-utils"; then
+- GDU_REQUIRED_VERSION=0.3.2
+- if test -n ""; then
+- GDU_REQUIRED_VERSION=
+- fi
+-
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for GDU_MODULE_VERSION_CHECK" >&5
+-echo $ECHO_N "checking for GDU_MODULE_VERSION_CHECK... $ECHO_C" >&6; }
++gdu_cv_version_required=0.3.2
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GDU_MODULE_VERSION_CHECK_CFLAGS"; then
+- pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS="$GDU_MODULE_VERSION_CHECK_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GDU_MODULE_VERSION_CHECK_LIBS"; then
+- pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS="$GDU_MODULE_VERSION_CHECK_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
++if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
++ gdu_cv_have_gdu=yes
+ else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
++ gdu_cv_have_gdu=no
+ fi
+
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
++if test "$gdu_cv_have_gdu" = "yes"; then
++ :
+ else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
+- else
+- GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GDU_MODULE_VERSION_CHECK_PKG_ERRORS" >&5
+-
+- { { echo "$as_me:$LINENO: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
+-
+-$GDU_MODULE_VERSION_CHECK_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
+-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-echo "$as_me: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
+-
+-$GDU_MODULE_VERSION_CHECK_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
+-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-elif test $pkg_failed = untried; then
+- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
+-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
+-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+-See \`config.log' for more details." >&2;}
++ { { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
++echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
+ { (exit 1); exit 1; }; }
+-else
+- GDU_MODULE_VERSION_CHECK_CFLAGS=$pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS
+- GDU_MODULE_VERSION_CHECK_LIBS=$pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+ fi
+
+
++
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then
+ withval=$with_help_dir;
+@@ -6700,7 +6596,7 @@
+ enable_scrollkeeper=yes
+ fi
+
+- if test "x$enable_scrollkeeper" = "xyes"; then
++ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+ ENABLE_SK_TRUE=
+ ENABLE_SK_FALSE='#'
+ else
+@@ -6709,6 +6605,15 @@
+ fi
+
+
++ if test "$gdu_cv_have_gdu" = "yes"; then
++ HAVE_GNOME_DOC_UTILS_TRUE=
++ HAVE_GNOME_DOC_UTILS_FALSE='#'
++else
++ HAVE_GNOME_DOC_UTILS_TRUE='#'
++ HAVE_GNOME_DOC_UTILS_FALSE=
++fi
++
++
+
+
+ ac_ext=cpp
+@@ -7861,7 +7766,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7864 "configure"' > conftest.$ac_ext
++ echo '#line 7769 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9646,11 +9551,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:9649: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9554: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9653: \$? = $ac_status" >&5
++ echo "$as_me:9558: \$? = $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.
+@@ -9914,11 +9819,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:9917: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9822: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9921: \$? = $ac_status" >&5
++ echo "$as_me:9826: \$? = $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.
+@@ -10018,11 +9923,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:10021: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9926: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10025: \$? = $ac_status" >&5
++ echo "$as_me:9930: \$? = $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
+@@ -11483,7 +11388,7 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+- echo '#line 11486 "configure"' > conftest.$ac_ext
++ echo '#line 11391 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -12347,7 +12252,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12350 "configure"
++#line 12255 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12447,7 +12352,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12450 "configure"
++#line 12355 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14786,11 +14691,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:14789: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14694: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14793: \$? = $ac_status" >&5
++ echo "$as_me:14698: \$? = $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.
+@@ -14890,11 +14795,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:14893: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14798: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14897: \$? = $ac_status" >&5
++ echo "$as_me:14802: \$? = $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
+@@ -15426,7 +15331,7 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+- echo '#line 15429 "configure"' > conftest.$ac_ext
++ echo '#line 15334 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -16484,11 +16389,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:16487: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16392: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16491: \$? = $ac_status" >&5
++ echo "$as_me:16396: \$? = $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.
+@@ -16588,11 +16493,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:16591: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16496: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16595: \$? = $ac_status" >&5
++ echo "$as_me:16500: \$? = $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
+@@ -18033,7 +17938,7 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+- echo '#line 18036 "configure"' > conftest.$ac_ext
++ echo '#line 17941 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -18810,11 +18715,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:18813: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18718: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18817: \$? = $ac_status" >&5
++ echo "$as_me:18722: \$? = $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.
+@@ -19078,11 +18983,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:19081: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18986: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:19085: \$? = $ac_status" >&5
++ echo "$as_me:18990: \$? = $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.
+@@ -19182,11 +19087,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:19185: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19090: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:19189: \$? = $ac_status" >&5
++ echo "$as_me:19094: \$? = $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
+@@ -20647,7 +20552,7 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+- echo '#line 20650 "configure"' > conftest.$ac_ext
++ echo '#line 20555 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -22202,7 +22107,7 @@
fi
-XINE_REQS=1.1.7
+XINE_REQS=1.1.4
GST_MAJORMINOR=0.10
- GST_REQS=0.10.6
- GSTPLUG_REQS=0.10.7
+ GST_REQS=0.10.12
+ GSTPLUG_REQS=0.10.12
+@@ -26724,6 +26629,13 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -27593,13 +27505,13 @@
+ INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
+ ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+ PKG_CONFIG!$PKG_CONFIG$ac_delim
+-GDU_MODULE_VERSION_CHECK_CFLAGS!$GDU_MODULE_VERSION_CHECK_CFLAGS$ac_delim
+-GDU_MODULE_VERSION_CHECK_LIBS!$GDU_MODULE_VERSION_CHECK_LIBS$ac_delim
+ HELP_DIR!$HELP_DIR$ac_delim
+ OMF_DIR!$OMF_DIR$ac_delim
+ DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
+ ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
+ ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
++HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
++HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
+ CXX!$CXX$ac_delim
+ CXXFLAGS!$CXXFLAGS$ac_delim
+ ac_ct_CXX!$ac_ct_CXX$ac_delim
Added: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=12848&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/series (added)
+++ desktop/unstable/totem/debian/patches/series Tue Sep 25 23:39:04 2007
@@ -1,0 +1,5 @@
+20_use_alternatives.patch
+25_revert-xine-reqs-bump.patch
+30_kfreebsd_gnu.patch
+60_gnome-doc-utils.patch
+70_autoconf.patch
Modified: desktop/unstable/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/rules?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/rules (original)
+++ desktop/unstable/totem/debian/rules Tue Sep 25 23:39:04 2007
@@ -4,22 +4,24 @@
#export DH_VERBOSE=1
export DH_OPTIONS
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-# how to call configure and make, similar to CDBS
-DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="$(CFLAGS)"
-DEB_CONFIGURE_INVOKE = $(DEB_CONFIGURE_SCRIPT_ENV) ./configure
-DEB_MAKE_ENVVARS += GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE)
+STAMP_DIR := debian/stamp
+BUILD_DIR := debian/build
+PATCH_DIR := debian/patches
-p_xine := totem-xine
-p_gstreamer := totem-gstreamer
-build_xine := debian/totem-xine
-build_gstreamer := debian/totem-gstreamer
+LIBPKG := libtotem-plparser7
+DEVPKG := libtotem-plparser-dev
+COMPKG := totem-common
+PLUGPKG := totem-plugins
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+FLAVORS := xine gstreamer
CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
@@ -27,97 +29,116 @@
--prefix=/usr \
--sysconfdir=/etc \
--mandir=\$${prefix}/share/man \
- --libexecdir=\$${prefix}/lib/totem \
--disable-maintainer-mode \
--with-gecko=xulrunner \
--disable-run-in-source-tree \
--disable-scrollkeeper \
--enable-vala
-build: build-xine build-gstreamer
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ COMMON_CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE)
+else
+ COMMON_CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
-build-xine: build-xine-stamp
-build-xine-stamp: patch
+xine_CONFIGURE_FLAGS := $(COMMON_CONFIGURE_FLAGS) \
+ --libexecdir=\$${prefix}/lib/totem/xine \
+ --enable-xine
+
+gstreamer_CONFIGURE_FLAGS := $(COMMON_CONFIGURE_FLAGS) \
+ --libexecdir=\$${prefix}/lib/totem/gstreamer
+
+patch: $(STAMP_DIR)/patch-stamp
+$(STAMP_DIR)/patch-stamp:
dh_testdir
- if test -f build-gstreamer-stamp; then \
- $(DEB_MAKE_INVOKE) distclean; \
- rm -f build-gstreamer-stamp; \
- fi
- $(DEB_CONFIGURE_INVOKE) $(COMMON_CONFIGURE_FLAGS) --enable-xine
- $(DEB_MAKE_INVOKE)
+ mkdir -p $(STAMP_DIR)
+ QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
touch $@
-build-gstreamer: build-gstreamer-stamp
-build-gstreamer-stamp: patch
+builddir = $(BUILD_DIR)/$*
+
+configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS))
+$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp
dh_testdir
- if test -f build-xine-stamp; then \
- $(DEB_MAKE_INVOKE) distclean; \
- rm -f build-xine-stamp; \
- fi
- $(DEB_CONFIGURE_INVOKE) $(COMMON_CONFIGURE_FLAGS)
- $(DEB_MAKE_INVOKE)
+ mkdir -p $(builddir)
+ cd $(builddir) && \
+ CFLAGS="$(CFLAGS)" $(CURDIR)/configure $($*_CONFIGURE_FLAGS)
touch $@
-clean:: unpatch
+build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
+$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-%
+ dh_testdir
+ $(MAKE) -C $(builddir)
+ touch $@
+
+installdir = $(CURDIR)/debian/totem-$*
+
+install-clean:
dh_testdir
dh_testroot
- -$(DEB_MAKE_INVOKE) distclean
- -rm -f $(stamps_to_clean)
- -rm -f $(files_to_clean)
- -rm -rf $(dirs_to_clean)
+ dh_clean -k
+
+install-%: $(STAMP_DIR)/build-stamp-%
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+ $(MAKE) -C $(builddir) install DESTDIR=$(installdir)
+ cd $(installdir)/usr/bin && for i in totem*; do \
+ mv $$i totem-$*$${i#totem} ; done
+ cd $(installdir)/usr/lib/nautilus/extensions-1.0 && \
+ mv libtotem-properties-page.so libtotem-properties-page.so.$*
+ # hide the mozilla plugin in a specific directory
+ cd $(installdir)/usr/lib/mozilla/plugins && \
+ mv *.so *.xpt $(installdir)/usr/lib/totem/$*/
+ # drop anything else
+ rm -rf $(installdir)/usr/lib/xulrunner
+ # drop *.a and *.la files
+ find debian/totem-$*/usr/lib -mindepth 2 -name '*.a' -exec rm {} \;
+ find debian/totem-$*/usr/lib -name '*.la' -exec rm {} \;
+ echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/totem-$*.substvars
+ echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/totem-$*.substvars
+
+install: install-clean $(addprefix install-, $(FLAVORS))
+ dh_installdirs
+ mkdir -p debian/$(DEVPKG)/usr/lib
+ mv debian/totem-gstreamer/usr/include debian/$(DEVPKG)/usr/
+ mv debian/totem-gstreamer/usr/lib/pkgconfig debian/$(DEVPKG)/usr/lib/
+ mv debian/totem-gstreamer/usr/lib/*.so debian/$(DEVPKG)/usr/lib/
+ mv debian/totem-gstreamer/usr/lib/*.a debian/$(DEVPKG)/usr/lib/
+ mkdir -p debian/$(LIBPKG)/usr/lib
+ mv debian/totem-gstreamer/usr/lib/*.so.* debian/$(LIBPKG)/usr/lib/
+ mkdir -p debian/$(COMPKG)/usr
+ mv debian/totem-gstreamer/etc debian/$(COMPKG)/
+ mv debian/totem-gstreamer/usr/share debian/$(COMPKG)/usr/
+ mkdir -p debian/$(PLUGPKG)/usr/lib/totem
+ mv debian/totem-gstreamer/usr/lib/totem/plugins debian/$(PLUGPKG)/usr/lib/totem/
+ cd debian/totem-xine && rm -rf etc usr/share usr/lib/pkgconfig \
+ usr/include usr/lib/*.so* usr/lib/*.a usr/lib/totem/plugins
+# Make both totems installable together
+ for f in $(FLAVORS); do \
+ F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \
+ mkdir -p debian/totem-$$f/usr/share/applications ; \
+ ( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \
+ debian/$(COMPKG)/usr/share/applications/totem.desktop \
+ | sed -r "s,^(Exec=.*totem),\1-$$f," \
+ | grep -v ^MimeType ; \
+ echo NoDisplay=true ) \
+ > debian/totem-$$f/usr/share/applications/totem-$$f.desktop ; \
+ done
+ echo -e "\nTryExec=/usr/bin/totem" >> debian/$(COMPKG)/usr/share/applications/totem.desktop
+ dh_install
+
+clean::
+ dh_testdir
+ dh_testroot
+ QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+ rm -rf .pc
+ rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR)
-test -r /usr/share/misc/config.sub && test -r config.sub && \
cp -f /usr/share/misc/config.sub config.sub
-test -r /usr/share/misc/config.guess && test -r config.guess && \
cp -f /usr/share/misc/config.guess config.guess
dh_clean
-install:
- dh_testdir
- dh_testroot
- dh_clean -k
- $(DEB_MAKE_INVOKE) -f debian/rules install-xine
- $(DEB_MAKE_INVOKE) -f debian/rules install-gstreamer
- cd po; intltool-update -p
-
-install-xine: DH_OPTIONS=-p$(p_xine)
-install-xine: build-xine
- $(DEB_MAKE_INVOKE) install DESTDIR=$(CURDIR)/$(build_xine)
- # install the plugin in /usr/lib/totem
- mkdir -p $(build_xine)/usr/lib/totem
- mv $(build_xine)/usr/lib/mozilla/plugins/*.so $(build_xine)/usr/lib/totem/
- # the .xpt files are recommended for the javascript interface
- mv $(build_xine)/usr/lib/mozilla/plugins/*.xpt $(build_xine)/usr/lib/totem/
- # drop anything else
- rm -rf $(build_xine)/usr/lib/xulrunner
- # drop *.a and *.la files
- find debian/totem-xine -name '*.a' -not -regex 'debian/totem-xine/usr/lib/[^/]*' -exec rm {} \;
- find debian/totem-xine -name '*.la' -exec rm {} \;
- dh_install
- # libtotem-plparser package
- mkdir -p debian/libtotem-plparser7/usr/lib
- mv debian/totem-xine/usr/lib/libtotem-plparser.so.* debian/libtotem-plparser7/usr/lib
- mkdir -p debian/libtotem-plparser-dev/usr/lib
- mv debian/totem-xine/usr/include debian/libtotem-plparser-dev/usr
- mv debian/totem-xine/usr/lib/pkgconfig debian/libtotem-plparser-dev/usr/lib/
- mv debian/totem-xine/usr/lib/libtotem-plparser.a debian/libtotem-plparser-dev/usr/lib
- mv debian/totem-xine/usr/lib/libtotem-plparser.so debian/libtotem-plparser-dev/usr/lib
-
-install-gstreamer: DH_OPTIONS=-p$(p_gstreamer)
-install-gstreamer: build-gstreamer
- $(DEB_MAKE_INVOKE) install DESTDIR=$(CURDIR)/$(build_gstreamer)
- # install the plugin in /usr/lib/totem
- mkdir -p $(build_gstreamer)/usr/lib/totem
- mv $(build_gstreamer)/usr/lib/mozilla/plugins/*.so $(build_gstreamer)/usr/lib/totem/
- # the .xpt files are recommended for the javascript interface
- mv $(build_gstreamer)/usr/lib/mozilla/plugins/*.xpt $(build_gstreamer)/usr/lib/totem/
- # drop anything else
- rm -rf $(build_gstreamer)/usr/lib/xulrunner
- dh_install
- # drop *.a and *.la files
- find debian/totem-gstreamer -name '*.a' -exec rm {} \;
- find debian/totem-gstreamer -name '*.la' -exec rm {} \;
- rm -f debian/totem-gstreamer/usr/lib/libtotem-plparser.so*
- rm -rf debian/totem-gstreamer/usr/include/ debian/totem-gstreamer/usr/lib/pkgconfig/
+binary: binary-arch binary-indep
# Build architecture-independent files here.
binary-indep: DH_OPTIONS=-i
@@ -126,11 +147,13 @@
dh_testroot
dh_installdocs -A NEWS README
dh_installchangelogs ChangeLog
+ dh_installman
dh_scrollkeeper
+ dh_gconf
+ dh_desktop
dh_compress
dh_link
dh_fixperms
- dh_strip
dh_installdeb
dh_gencontrol
dh_md5sums
@@ -144,19 +167,17 @@
dh_installdocs -A NEWS README
dh_installmenu
dh_installchangelogs ChangeLog
- dh_gconf
dh_desktop
dh_compress
dh_link
dh_fixperms
dh_makeshlibs -V 'libtotem-plparser7 (>= 2.20.0)' -X/usr/lib/totem/ -X/usr/lib/nautilus/extensions-
- dh_strip --dbg-package=libtotem-plparser7-dbg
+ dh_strip --dbg-package=totem-dbg
dh_perl
dh_installdeb
- dh_shlibdeps -L libtotem-plparser7 -l debian/libtotem-plparser7/usr/lib
+ dh_shlibdeps -L $(LIBPKG) -l debian/$(LIBPKG)/usr/lib
dh_gencontrol
dh_md5sums
dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build build-xine build-gstreamer clean binary-indep binary-arch binary
+.PHONY: patch configure build install clean install-clean binary-indep binary-arch binary
Modified: desktop/unstable/totem/debian/totem-gstreamer.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/totem-gstreamer.postinst?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/totem-gstreamer.postinst (original)
+++ desktop/unstable/totem/debian/totem-gstreamer.postinst Tue Sep 25 23:39:04 2007
@@ -1,25 +1,22 @@
#! /bin/sh
-
set -e
-case "$1" in
- configure)
- # Install a link to 'gnome-video-thumbnailer' via alternatives.
- update-alternatives --quiet --install /usr/bin/gnome-video-thumbnailer gnome-video-thumbnailer /usr/bin/totem-video-thumbnailer 40
-
- ;;
+FLAVOUR=gstreamer
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
+if [ "$1" = configure ]; then
+ update-alternatives --quiet --install \
+ /usr/bin/gnome-video-thumbnailer gnome-video-thumbnailer \
+ /usr/bin/totem-${FLAVOUR}-video-thumbnailer 40
+ update-alternatives --quiet --install \
+ /usr/bin/totem totem /usr/bin/totem-${FLAVOUR} 40 \
+ --slave /usr/bin/totem-video-indexer totem-video-indexer \
+ /usr/bin/totem-${FLAVOUR}-video-indexer \
+ --slave /usr/lib/nautilus/extensions-1.0/libtotem-properties-page.so \
+ libtotem-properties-page.so \
+ /usr/lib/nautilus/extensions-1.0/libtotem-properties-page.so.${FLAVOUR} \
+ --slave /usr/lib/totem/default totem-default.dir /usr/lib/totem/${FLAVOUR}
+fi
#DEBHELPER#
exit 0
-
Modified: desktop/unstable/totem/debian/totem-gstreamer.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/totem-gstreamer.prerm?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/totem-gstreamer.prerm (original)
+++ desktop/unstable/totem/debian/totem-gstreamer.prerm Tue Sep 25 23:39:04 2007
@@ -1,23 +1,13 @@
#! /bin/sh
-# prerm script for totem-gstreamer
-#
-# see: dh_installdeb(1)
-
set -e
-case "$1" in
- remove|upgrade|deconfigure)
- update-alternatives --quiet --remove gnome-video-thumbnailer /usr/bin/totem-video-thumbnailer
- ;;
- failed-upgrade)
- ;;
+FLAVOUR=gstreamer
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+ update-alternatives --quiet --remove gnome-video-thumbnailer \
+ /usr/bin/totem-${FLAVOUR}-video-thumbnailer
+ update-alternatives --quiet --remove totem /usr/bin/totem-${FLAVOUR}
+fi
#DEBHELPER#
Modified: desktop/unstable/totem/debian/totem-mozilla.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/totem-mozilla.links?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/totem-mozilla.links (original)
+++ desktop/unstable/totem/debian/totem-mozilla.links Tue Sep 25 23:39:04 2007
@@ -1,30 +1,20 @@
-/usr/lib/totem/libtotem-basic-plugin.so /usr/lib/mozilla/plugins/libtotem-basic-plugin.so
-/usr/lib/totem/libtotem-basic-plugin.xpt /usr/lib/mozilla/plugins/libtotem-basic-plugin.xpt
-/usr/lib/totem/libtotem-gmp-plugin.so /usr/lib/mozilla/plugins/libtotem-gmp-plugin.so
-/usr/lib/totem/libtotem-gmp-plugin.xpt /usr/lib/mozilla/plugins/libtotem-gmp-plugin.xpt
-/usr/lib/totem/libtotem-complex-plugin.so /usr/lib/mozilla/plugins/libtotem-complex-plugin.so
-/usr/lib/totem/libtotem-complex-plugin.xpt /usr/lib/mozilla/plugins/libtotem-complex-plugin.xpt
-/usr/lib/totem/libtotem-mully-plugin.so /usr/lib/mozilla/plugins/libtotem-mully-plugin.so
-/usr/lib/totem/libtotem-mully-plugin.xpt /usr/lib/mozilla/plugins/libtotem-mully-plugin.xpt
-/usr/lib/totem/libtotem-narrowspace-plugin.so /usr/lib/mozilla/plugins/libtotem-narrowspace-plugin.so
-/usr/lib/totem/libtotem-narrowspace-plugin.xpt /usr/lib/mozilla/plugins/libtotem-narrowspace-plugin.xpt
-/usr/lib/totem/libtotem-basic-plugin.so /usr/lib/firefox/plugins/libtotem-basic-plugin.so
-/usr/lib/totem/libtotem-basic-plugin.xpt /usr/lib/firefox/plugins/libtotem-basic-plugin.xpt
-/usr/lib/totem/libtotem-gmp-plugin.so /usr/lib/firefox/plugins/libtotem-gmp-plugin.so
-/usr/lib/totem/libtotem-gmp-plugin.xpt /usr/lib/firefox/plugins/libtotem-gmp-plugin.xpt
-/usr/lib/totem/libtotem-complex-plugin.so /usr/lib/firefox/plugins/libtotem-complex-plugin.so
-/usr/lib/totem/libtotem-complex-plugin.xpt /usr/lib/firefox/plugins/libtotem-complex-plugin.xpt
-/usr/lib/totem/libtotem-mully-plugin.so /usr/lib/firefox/plugins/libtotem-mully-plugin.so
-/usr/lib/totem/libtotem-mully-plugin.xpt /usr/lib/firefox/plugins/libtotem-mully-plugin.xpt
-/usr/lib/totem/libtotem-narrowspace-plugin.so /usr/lib/firefox/plugins/libtotem-narrowspace-plugin.so
-/usr/lib/totem/libtotem-narrowspace-plugin.xpt /usr/lib/firefox/plugins/libtotem-narrowspace-plugin.xpt
-/usr/lib/totem/libtotem-basic-plugin.so /usr/lib/iceweasel/plugins/libtotem-basic-plugin.so
-/usr/lib/totem/libtotem-basic-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-basic-plugin.xpt
-/usr/lib/totem/libtotem-gmp-plugin.so /usr/lib/iceweasel/plugins/libtotem-gmp-plugin.so
-/usr/lib/totem/libtotem-gmp-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-gmp-plugin.xpt
-/usr/lib/totem/libtotem-complex-plugin.so /usr/lib/iceweasel/plugins/libtotem-complex-plugin.so
-/usr/lib/totem/libtotem-complex-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-complex-plugin.xpt
-/usr/lib/totem/libtotem-mully-plugin.so /usr/lib/iceweasel/plugins/libtotem-mully-plugin.so
-/usr/lib/totem/libtotem-mully-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-mully-plugin.xpt
-/usr/lib/totem/libtotem-narrowspace-plugin.so /usr/lib/iceweasel/plugins/libtotem-narrowspace-plugin.so
-/usr/lib/totem/libtotem-narrowspace-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-narrowspace-plugin.xpt
+/usr/lib/totem/default/libtotem-basic-plugin.so /usr/lib/mozilla/plugins/libtotem-basic-plugin.so
+/usr/lib/totem/default/libtotem-basic-plugin.xpt /usr/lib/mozilla/plugins/libtotem-basic-plugin.xpt
+/usr/lib/totem/default/libtotem-gmp-plugin.so /usr/lib/mozilla/plugins/libtotem-gmp-plugin.so
+/usr/lib/totem/default/libtotem-gmp-plugin.xpt /usr/lib/mozilla/plugins/libtotem-gmp-plugin.xpt
+/usr/lib/totem/default/libtotem-complex-plugin.so /usr/lib/mozilla/plugins/libtotem-complex-plugin.so
+/usr/lib/totem/default/libtotem-complex-plugin.xpt /usr/lib/mozilla/plugins/libtotem-complex-plugin.xpt
+/usr/lib/totem/default/libtotem-mully-plugin.so /usr/lib/mozilla/plugins/libtotem-mully-plugin.so
+/usr/lib/totem/default/libtotem-mully-plugin.xpt /usr/lib/mozilla/plugins/libtotem-mully-plugin.xpt
+/usr/lib/totem/default/libtotem-narrowspace-plugin.so /usr/lib/mozilla/plugins/libtotem-narrowspace-plugin.so
+/usr/lib/totem/default/libtotem-narrowspace-plugin.xpt /usr/lib/mozilla/plugins/libtotem-narrowspace-plugin.xpt
+/usr/lib/totem/default/libtotem-basic-plugin.so /usr/lib/iceweasel/plugins/libtotem-basic-plugin.so
+/usr/lib/totem/default/libtotem-basic-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-basic-plugin.xpt
+/usr/lib/totem/default/libtotem-gmp-plugin.so /usr/lib/iceweasel/plugins/libtotem-gmp-plugin.so
+/usr/lib/totem/default/libtotem-gmp-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-gmp-plugin.xpt
+/usr/lib/totem/default/libtotem-complex-plugin.so /usr/lib/iceweasel/plugins/libtotem-complex-plugin.so
+/usr/lib/totem/default/libtotem-complex-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-complex-plugin.xpt
+/usr/lib/totem/default/libtotem-mully-plugin.so /usr/lib/iceweasel/plugins/libtotem-mully-plugin.so
+/usr/lib/totem/default/libtotem-mully-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-mully-plugin.xpt
+/usr/lib/totem/default/libtotem-narrowspace-plugin.so /usr/lib/iceweasel/plugins/libtotem-narrowspace-plugin.so
+/usr/lib/totem/default/libtotem-narrowspace-plugin.xpt /usr/lib/iceweasel/plugins/libtotem-narrowspace-plugin.xpt
Modified: desktop/unstable/totem/debian/totem-xine.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/totem-xine.postinst?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/totem-xine.postinst (original)
+++ desktop/unstable/totem/debian/totem-xine.postinst Tue Sep 25 23:39:04 2007
@@ -1,26 +1,22 @@
#! /bin/sh
-
set -e
-case "$1" in
- configure)
+FLAVOUR=xine
- # Install a link to 'gnome-video-thumbnailer' via alternatives.
- update-alternatives --quiet --install /usr/bin/gnome-video-thumbnailer gnome-video-thumbnailer /usr/bin/totem-video-thumbnailer 40
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
+if [ "$1" = configure ]; then
+ update-alternatives --quiet --install \
+ /usr/bin/gnome-video-thumbnailer gnome-video-thumbnailer \
+ /usr/bin/totem-${FLAVOUR}-video-thumbnailer 35
+ update-alternatives --quiet --install \
+ /usr/bin/totem totem /usr/bin/totem-${FLAVOUR} 35 \
+ --slave /usr/bin/totem-video-indexer totem-video-indexer \
+ /usr/bin/totem-${FLAVOUR}-video-indexer \
+ --slave /usr/lib/nautilus/extensions-1.0/libtotem-properties-page.so \
+ libtotem-properties-page.so \
+ /usr/lib/nautilus/extensions-1.0/libtotem-properties-page.so.${FLAVOUR} \
+ --slave /usr/lib/totem/default totem-default.dir /usr/lib/totem/${FLAVOUR}
+fi
#DEBHELPER#
exit 0
-
Modified: desktop/unstable/totem/debian/totem-xine.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/totem-xine.prerm?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/totem-xine.prerm (original)
+++ desktop/unstable/totem/debian/totem-xine.prerm Tue Sep 25 23:39:04 2007
@@ -1,23 +1,13 @@
#! /bin/sh
-# prerm script for totem-xine
-#
-# see: dh_installdeb(1)
-
set -e
-case "$1" in
- remove|upgrade|deconfigure)
- update-alternatives --quiet --remove gnome-video-thumbnailer /usr/bin/totem-video-thumbnailer
- ;;
- failed-upgrade)
- ;;
+FLAVOUR=xine
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+ update-alternatives --quiet --remove gnome-video-thumbnailer \
+ /usr/bin/totem-${FLAVOUR}-video-thumbnailer
+ update-alternatives --quiet --remove totem /usr/bin/totem-${FLAVOUR}
+fi
#DEBHELPER#
Copied: desktop/unstable/totem/debian/totem.menu (from r12832, desktop/unstable/totem/debian/totem-gstreamer.menu)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/totem.menu?rev=12848&op=diff
==============================================================================
--- desktop/unstable/totem/debian/totem-gstreamer.menu (original)
+++ desktop/unstable/totem/debian/totem.menu Tue Sep 25 23:39:04 2007
@@ -1,7 +1,6 @@
-?package(totem-gstreamer):\
+?package(totem):\
needs="X11"\
-section="Apps/Viewers"\
+section="Applications/Video"\
title="totem"\
-hints="Video"\
icon="/usr/share/pixmaps/totem.xpm"\
-command="/usr/bin/totem"
+command="/usr/bin/totem-gstreamer"
More information about the pkg-gnome-commits
mailing list