r10397 - in /desktop/unstable: gnome-games/ totem/debian/
totem/debian/patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Wed Apr 25 09:52:42 UTC 2007
Author: slomo
Date: Wed Apr 25 09:52:41 2007
New Revision: 10397
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10397
Log:
* drop gnome-games from unstable
Added:
desktop/unstable/totem/debian/patches/40_lirc_freeconfig.dpatch (with props)
desktop/unstable/totem/debian/patches/90_from_svn_fix_stop_key.dpatch
desktop/unstable/totem/debian/totem-gstreamer.README.Debian
Removed:
desktop/unstable/gnome-games/
Modified:
desktop/unstable/totem/debian/changelog
desktop/unstable/totem/debian/control
desktop/unstable/totem/debian/control.in
desktop/unstable/totem/debian/patches/00list
desktop/unstable/totem/debian/rules
Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=10397&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Wed Apr 25 09:52:41 2007
@@ -1,3 +1,57 @@
+totem (2.18.1-2) unstable; urgency=low
+
+ [ Loic Minier ]
+ * Honor CFLAGS we set in rules, doh!
+
+ [ Sven Arvidsson ]
+ * New patch, lirc_freeconfig, from upstream SVN, fix freeze on close
+ with lirc; thanks Philip Withnall (GNOME bug #427681);
+ (Closes: #418020)
+
+ [ Sebastian Dröge ]
+ * Upload to unstable, drop check-dist include.
+ * 90_from_svn_fix_stop_key.dpatch: Patch taken from Ubuntu. Fix handling of
+ the stop button. See Gnome #422956.
+
+ -- Sebastian Dröge <slomo at debian.org> Wed, 25 Apr 2007 01:18:46 +0200
+
+totem (2.18.1-1) experimental; urgency=low
+
+ * Include the new check-dist Makefile to prevent accidental uploads to
+ unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+ * New upstreeam release; no API change.
+
+ -- Loic Minier <lool at dooz.org> Wed, 04 Apr 2007 17:26:55 +0200
+
+totem (2.18.0-1) experimental; urgency=low
+
+ * New upstream major stable release; with API additions.
+ - Pass --enable-xine to the Xine configure and drop the --enable-gstreamer
+ from the gstreamer configure.
+ - Prefer totem-gstreamer over totem-xine in the dependencies of totem.
+ - Bump up shlibs to >= 2.17.5.
+ - Configure with --disable-run-in-source-tree; change --enable-mozilla
+ --with-browser-plugins=xulrunner into --with-gecko=xulrunner.
+ - Bump up build-deps and existing deps to libglib2.0-dev >= 2.12.0,
+ libgtk2.0-dev >= 2.10.0, libgnomevfs2-dev >= 2.9.92, gnome-icon-theme >=
+ 2.15.90, libdbus-glib-1-dev >= 0.61, dbus >= 0.61, libxine-dev >= 1.1.4,
+ libgstreamer0.10-dev >= 0.10.6, libgstreamer-plugins-base0.10-dev >=
+ 0.10.7.
+ - Add a build-dep on libgnome2-dev >= 2.14.0.
+ - Add deps on gnome-icon-theme >= 2.15.90.
+ - Build-depend on gnome-doc-utils.
+ * Configure with --disable-scrollkeeper.
+ * Drop INSTALL_PROGRAM, dh_strip handles this.
+ * Cleanups.
+ * Let totem-gstreamer recommend gnome-control-center >= 2.15.90 for
+ gnome-sound-properties; conflict with gnome-control-center << 2.15.90 as
+ the bundled gnome-sound-properties is not aware of GStreamer profiles.
+ * Add a totem-gstreamer.README.Debian to document setting the output sink.
+ * Build-depend on librsvg2-dev and librsvg2-common >= 2.16.0-2 to make the
+ package autobuildable.
+
+ -- Loic Minier <lool at dooz.org> Fri, 23 Mar 2007 11:53:24 +0100
+
totem (2.16.6-1) unstable; urgency=medium
* New upstream stable release; bug fixes and translations.
Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=10397&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control (original)
+++ desktop/unstable/totem/debian/control Wed Apr 25 09:52:41 2007
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 4.2.21), dpatch, libgtk2.0-dev (>= 2.8.17-1), libglib2.0-dev (>= 2.8.0), libgnomeui-dev (>= 2.6.1.1-4), libglade2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.8.2), libxine-dev (>= 1.1.2), liblircclient-dev (>= 0.6.6), libirman-dev (>= 0.4.2), libgnome-desktop-dev (>= 2.6.1-2), gnome-pkg-tools (>= 0.10), scrollkeeper (>= 0.3.14-5), libxml-parser-perl, libgstreamer0.10-dev (>= 0.10.1), libgstreamer-plugins-base0.10-dev (>= 0.10.1), gstreamer0.10-tools, gstreamer0.10-plugins-base (>= 0.10.7), gstreamer0.10-plugins-good, libnautilus-extension-dev, iso-codes, libmusicbrainz4-dev (>= 2.1.1-4.1), gnome-icon-theme, libdbus-glib-1-dev (>= 0.60), libxul-dev, xulrunner, intltool, autotools-dev, dpkg-dev (>= 1.13.19), libgconf2-dev, shared-mime-info (>= 0.17), libhal-dev (>= 0.5) [!kfreebsd-i386 !kfreebsd-amd64], libcam-dev [kfreebsd-i386 kfreebsd-amd64], libxtst-dev
+Build-Depends: debhelper (>= 4.2.21), dpatch, libgtk2.0-dev (>= 2.10.0), libglib2.0-dev (>= 2.12.0), libgnomeui-dev (>= 2.6.1.1-4), libglade2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.9.92), libxine-dev (>= 1.1.4), liblircclient-dev (>= 0.6.6), libirman-dev (>= 0.4.2), libgnome-desktop-dev (>= 2.6.1-2), gnome-pkg-tools (>= 0.10), scrollkeeper (>= 0.3.14-5), libxml-parser-perl, libgstreamer0.10-dev (>= 0.10.6), libgstreamer-plugins-base0.10-dev (>= 0.10.7), gstreamer0.10-tools (>= 0.10.6), gstreamer0.10-plugins-base (>= 0.10.7), gstreamer0.10-plugins-good, librsvg2-dev (>= 2.16.0-2), librsvg2-common (>= 2.16.0-2), libnautilus-extension-dev, iso-codes, libmusicbrainz4-dev (>= 2.1.1-4.1), gnome-icon-theme (>= 2.15.90), libdbus-glib-1-dev (>= 0.61), libxul-dev, xulrunner, intltool, autotools-dev, dpkg-dev (>= 1.13.19), libgconf2-dev, shared-mime-info (>= 0.17), libhal-dev (>= 0.5) [!kfreebsd-i386 !kfreebsd-amd64], libcam-dev [kfreebsd-i386 kfreebsd-amd64], libxtst-dev, libgnome2-dev (>= 2.14.0), libxrandr-dev (>= 1.1.1), libxxf86vm-dev (>= 1.0.1), libx11-dev, gnome-doc-utils
Standards-Version: 3.7.2
Package: totem
Architecture: all
-Depends: totem-xine (>= ${binary:Version}) | totem-gstreamer (>= ${binary:Version})
+Depends: totem-gstreamer (>= ${binary:Version}) | totem-xine (>= ${binary:Version})
Description: A simple media player for the Gnome desktop (dummy package)
Its features :
.
@@ -50,7 +50,7 @@
Package: totem-xine
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-icon-theme (>= 2.15.90)
Recommends: totem-mozilla (= ${source:Version})
Conflicts: totem (<< 0.99.12-2), totem-gstreamer
Description: A simple media player for the Gnome desktop based on xine
@@ -92,9 +92,9 @@
Package: totem-gstreamer
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-gnomevfs, gstreamer0.10-plugins-base, gstreamer0.10-alsa | gstreamer0.10-audiosink, gstreamer0.10-plugins-good, gstreamer0.10-x
-Conflicts: totem (<< 0.99.12-2), totem-xine
-Recommends: totem-mozilla (= ${source:Version}), gstreamer0.10-plugins-ugly, gstreamer0.10-ffmpeg
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-gnomevfs, gstreamer0.10-plugins-base, gstreamer0.10-alsa | gstreamer0.10-audiosink, gstreamer0.10-plugins-good, gstreamer0.10-x, gnome-icon-theme (>= 2.15.90)
+Conflicts: totem (<< 0.99.12-2), totem-xine, gnome-control-center (<< 2.15.90)
+Recommends: totem-mozilla (= ${source:Version}), 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 :
.
@@ -134,7 +134,7 @@
Package: totem-mozilla
Architecture: all
Section: web
-Depends: totem-xine (>= ${binary:Version}) | totem-gstreamer (>= ${binary:Version}), dbus
+Depends: totem-xine (>= ${binary:Version}) | totem-gstreamer (>= ${binary:Version}), dbus (>= 0.61)
Recommends: epiphany-browser | www-browser
Description: Totem Mozilla plugin
This package contains the Totem Mozilla plugin, which will
@@ -156,7 +156,7 @@
Package: libtotem-plparser-dev
Architecture: any
Section: libdevel
-Depends: libtotem-plparser1 (= ${binary:Version}), libgtk2.0-dev, libxml2-dev, libgnomevfs2-dev
+Depends: libtotem-plparser1 (= ${binary:Version}), libgtk2.0-dev (>= 2.10.0), libxml2-dev, libgnomevfs2-dev (>= 2.9.92)
Replaces: totem-gstreamer (<< 1.1.2-0ubuntu5), totem-xine (<< 1.1.2-0ubuntu5)
Description: Totem Playlist Parser library - development version
A library to parse playlists.
Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=10397&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in (original)
+++ desktop/unstable/totem/debian/control.in Wed Apr 25 09:52:41 2007
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.2.21), dpatch, libgtk2.0-dev (>= 2.8.17-1), libglib2.0-dev (>= 2.8.0), libgnomeui-dev (>= 2.6.1.1-4), libglade2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.8.2), libxine-dev (>= 1.1.2), liblircclient-dev (>= 0.6.6), libirman-dev (>= 0.4.2), libgnome-desktop-dev (>= 2.6.1-2), gnome-pkg-tools (>= 0.10), scrollkeeper (>= 0.3.14-5), libxml-parser-perl, libgstreamer0.10-dev (>= 0.10.1), libgstreamer-plugins-base0.10-dev (>= 0.10.1), gstreamer0.10-tools, gstreamer0.10-plugins-base (>= 0.10.7), gstreamer0.10-plugins-good, libnautilus-extension-dev, iso-codes, libmusicbrainz4-dev (>= 2.1.1-4.1), gnome-icon-theme, libdbus-glib-1-dev (>= 0.60), libxul-dev, xulrunner, intltool, autotools-dev, dpkg-dev (>= 1.13.19), libgconf2-dev, shared-mime-info (>= 0.17), libhal-dev (>= 0.5) [!kfreebsd-i386 !kfreebsd-amd64], libcam-dev [kfreebsd-i386 kfreebsd-amd64], libxtst-dev
+Build-Depends: debhelper (>= 4.2.21), dpatch, libgtk2.0-dev (>= 2.10.0), libglib2.0-dev (>= 2.12.0), libgnomeui-dev (>= 2.6.1.1-4), libglade2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.9.92), libxine-dev (>= 1.1.4), liblircclient-dev (>= 0.6.6), libirman-dev (>= 0.4.2), libgnome-desktop-dev (>= 2.6.1-2), gnome-pkg-tools (>= 0.10), scrollkeeper (>= 0.3.14-5), libxml-parser-perl, libgstreamer0.10-dev (>= 0.10.6), libgstreamer-plugins-base0.10-dev (>= 0.10.7), gstreamer0.10-tools (>= 0.10.6), gstreamer0.10-plugins-base (>= 0.10.7), gstreamer0.10-plugins-good, librsvg2-dev (>= 2.16.0-2), librsvg2-common (>= 2.16.0-2), libnautilus-extension-dev, iso-codes, libmusicbrainz4-dev (>= 2.1.1-4.1), gnome-icon-theme (>= 2.15.90), libdbus-glib-1-dev (>= 0.61), libxul-dev, xulrunner, intltool, autotools-dev, dpkg-dev (>= 1.13.19), libgconf2-dev, shared-mime-info (>= 0.17), libhal-dev (>= 0.5) [!kfreebsd-i386 !kfreebsd-amd64], libcam-dev [kfreebsd-i386 kfreebsd-amd64], libxtst-dev, libgnome2-dev (>= 2.14.0), libxrandr-dev (>= 1.1.1), libxxf86vm-dev (>= 1.0.1), libx11-dev, gnome-doc-utils
Standards-Version: 3.7.2
Package: totem
Architecture: all
-Depends: totem-xine (>= ${binary:Version}) | totem-gstreamer (>= ${binary:Version})
+Depends: totem-gstreamer (>= ${binary:Version}) | totem-xine (>= ${binary:Version})
Description: A simple media player for the Gnome desktop (dummy package)
Its features :
.
@@ -50,7 +50,7 @@
Package: totem-xine
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-icon-theme (>= 2.15.90)
Recommends: totem-mozilla (= ${source:Version})
Conflicts: totem (<< 0.99.12-2), totem-gstreamer
Description: A simple media player for the Gnome desktop based on xine
@@ -92,9 +92,9 @@
Package: totem-gstreamer
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-gnomevfs, gstreamer0.10-plugins-base, gstreamer0.10-alsa | gstreamer0.10-audiosink, gstreamer0.10-plugins-good, gstreamer0.10-x
-Conflicts: totem (<< 0.99.12-2), totem-xine
-Recommends: totem-mozilla (= ${source:Version}), gstreamer0.10-plugins-ugly, gstreamer0.10-ffmpeg
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-gnomevfs, gstreamer0.10-plugins-base, gstreamer0.10-alsa | gstreamer0.10-audiosink, gstreamer0.10-plugins-good, gstreamer0.10-x, gnome-icon-theme (>= 2.15.90)
+Conflicts: totem (<< 0.99.12-2), totem-xine, gnome-control-center (<< 2.15.90)
+Recommends: totem-mozilla (= ${source:Version}), 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 :
.
@@ -134,7 +134,7 @@
Package: totem-mozilla
Architecture: all
Section: web
-Depends: totem-xine (>= ${binary:Version}) | totem-gstreamer (>= ${binary:Version}), dbus
+Depends: totem-xine (>= ${binary:Version}) | totem-gstreamer (>= ${binary:Version}), dbus (>= 0.61)
Recommends: epiphany-browser | www-browser
Description: Totem Mozilla plugin
This package contains the Totem Mozilla plugin, which will
@@ -156,7 +156,7 @@
Package: libtotem-plparser-dev
Architecture: any
Section: libdevel
-Depends: libtotem-plparser1 (= ${binary:Version}), libgtk2.0-dev, libxml2-dev, libgnomevfs2-dev
+Depends: libtotem-plparser1 (= ${binary:Version}), libgtk2.0-dev (>= 2.10.0), libxml2-dev, libgnomevfs2-dev (>= 2.9.92)
Replaces: totem-gstreamer (<< 1.1.2-0ubuntu5), totem-xine (<< 1.1.2-0ubuntu5)
Description: Totem Playlist Parser library - development version
A library to parse playlists.
Modified: desktop/unstable/totem/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/00list?rev=10397&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/00list (original)
+++ desktop/unstable/totem/debian/patches/00list Wed Apr 25 09:52:41 2007
@@ -1,2 +1,3 @@
20_use_alternatives
30_kfreebsd_gnu
+40_lirc_freeconfig
Added: desktop/unstable/totem/debian/patches/40_lirc_freeconfig.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/40_lirc_freeconfig.dpatch?rev=10397&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/40_lirc_freeconfig.dpatch (added)
+++ desktop/unstable/totem/debian/patches/40_lirc_freeconfig.dpatch Wed Apr 25 09:52:41 2007
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_lirc_freeconfig.dpatch by Sven Arvidsson <sa at whiz.se>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad totem-2.18.1~/src/totem-remote.c totem-2.18.1/src/totem-remote.c
+--- totem-2.18.1~/src/totem-remote.c 2007-03-26 02:50:04.000000000 +0200
++++ totem-2.18.1/src/totem-remote.c 2007-04-18 18:55:25.000000000 +0200
+@@ -230,7 +230,6 @@
+
+ #ifdef HAVE_LIRC
+ lirc_freeconfig (config);
+- g_free(config);
+
+ listeners = g_list_remove (listeners, remote);
+
Propchange: desktop/unstable/totem/debian/patches/40_lirc_freeconfig.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/unstable/totem/debian/patches/90_from_svn_fix_stop_key.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/90_from_svn_fix_stop_key.dpatch?rev=10397&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/90_from_svn_fix_stop_key.dpatch (added)
+++ desktop/unstable/totem/debian/patches/90_from_svn_fix_stop_key.dpatch Wed Apr 25 09:52:41 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_from_svn_fix_stop_key.dpatch by Sebastien Bacher <seb128 at canonical.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad totem-2.18.1~/src/totem-remote.c totem-2.18.1/src/totem-remote.c
+--- totem-2.18.1~/src/totem-remote.c 2007-03-26 02:50:04.000000000 +0200
++++ totem-2.18.1/src/totem-remote.c 2007-04-05 13:04:42.000000000 +0200
+@@ -213,6 +213,8 @@
+ g_signal_emit (remote, totem_remote_signals[BUTTON_PRESSED], 0, TOTEM_REMOTE_COMMAND_PREVIOUS);
+ else if (strcmp ("Next", key) == 0)
+ g_signal_emit (remote, totem_remote_signals[BUTTON_PRESSED], 0, TOTEM_REMOTE_COMMAND_NEXT);
++ else if (strcmp ("Stop", key) == 0)
++ g_signal_emit (remote, totem_remote_signals[BUTTON_PRESSED], 0, TOTEM_REMOTE_COMMAND_PAUSE);
+ }
+ }
+ #endif /* HAVE_MEDIA_PLAYER_KEYS */
Modified: desktop/unstable/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/rules?rev=10397&op=diff
==============================================================================
--- desktop/unstable/totem/debian/rules (original)
+++ desktop/unstable/totem/debian/rules Wed Apr 25 09:52:41 2007
@@ -10,31 +10,30 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-# how to call make, similar to CDBS
+# 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)
-p_dir = $(CURDIR)/debian
-p_xine = totem-xine
-p_gstreamer = totem-gstreamer
-build_xine = debian/totem-xine
-build_gstreamer = debian/totem-gstreamer
+p_xine := totem-xine
+p_gstreamer := totem-gstreamer
+build_xine := debian/totem-xine
+build_gstreamer := debian/totem-gstreamer
-CFLAGS = -g
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+COMMON_CONFIGURE_FLAGS += \
+ --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
-COMMON_CONFIGURE_FLAGS := --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --libexecdir=\$${prefix}/lib/totem --disable-maintainer-mode --enable-mozilla --with-browser-plugins=xulrunner
-
-
-build :
+build: build-xine build-gstreamer
build-xine: build-xine-stamp
build-xine-stamp: patch
@@ -43,9 +42,9 @@
$(DEB_MAKE_INVOKE) distclean; \
rm -f build-gstreamer-stamp; \
fi
- ./configure $(COMMON_CONFIGURE_FLAGS)
+ $(DEB_CONFIGURE_INVOKE) $(COMMON_CONFIGURE_FLAGS) --enable-xine
$(DEB_MAKE_INVOKE)
- touch build-xine-stamp
+ touch $@
build-gstreamer: build-gstreamer-stamp
build-gstreamer-stamp: patch
@@ -54,11 +53,11 @@
$(DEB_MAKE_INVOKE) distclean; \
rm -f build-xine-stamp; \
fi
- ./configure $(COMMON_CONFIGURE_FLAGS) --enable-gstreamer
+ $(DEB_CONFIGURE_INVOKE) $(COMMON_CONFIGURE_FLAGS)
$(DEB_MAKE_INVOKE)
- touch build-gstreamer-stamp
+ touch $@
-clean:: unpatch
+clean:: unpatch
dh_testdir
dh_testroot
-$(DEB_MAKE_INVOKE) distclean
@@ -82,7 +81,6 @@
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/
@@ -90,7 +88,6 @@
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 {} \;
@@ -107,7 +104,6 @@
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/
@@ -115,7 +111,6 @@
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 {} \;
@@ -147,14 +142,13 @@
dh_testroot
dh_installdocs -A NEWS README
dh_installmenu
- dh_installman
dh_installchangelogs ChangeLog
dh_gconf
dh_desktop
dh_compress
dh_link
dh_fixperms
- dh_makeshlibs -V 'libtotem-plparser1 (>= 2.16.1)'
+ dh_makeshlibs -V 'libtotem-plparser1 (>= 2.17.5)'
dh_strip --dbg-package=libtotem-plparser1
dh_perl
dh_installdeb
@@ -164,4 +158,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build build-xine build-gstreamer clean binary-indep binary-arch binary
Added: desktop/unstable/totem/debian/totem-gstreamer.README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/totem-gstreamer.README.Debian?rev=10397&op=file
==============================================================================
--- desktop/unstable/totem/debian/totem-gstreamer.README.Debian (added)
+++ desktop/unstable/totem/debian/totem-gstreamer.README.Debian Wed Apr 25 09:52:41 2007
@@ -1,0 +1,9 @@
+---[ Configuring the output sink
+
+You can choose your preferred output sink by using gnome-sound-properties (in
+the gnome-control-center package), or by editing the GConf key:
+ /system/gstreamer/0.10/default/musicaudiosink
+
+The default is to detect your output sink automagically.
+
+
More information about the pkg-gnome-commits
mailing list