r17413 - in /desktop/experimental/totem/debian: changelog control control.in patches/02_flv.patch patches/30_fix_youtube_plugin.patch patches/series rules totem-mozilla.links
samm-guest at users.alioth.debian.org
samm-guest at users.alioth.debian.org
Sun Nov 9 14:22:04 UTC 2008
Author: samm-guest
Date: Sun Nov 9 14:22:03 2008
New Revision: 17413
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17413
Log:
* New upstream release. Totem now ships a shared library,
libbaconvideowidget.so.0, that I don't know how to deal with
while keeping totem-gstreamer and totem-xine co-installable. So
trying to install both will now cause dpkg to complain that one
overwrites the other's files. Hopefully someone can think of a
way to deal with this without dropping the ability to have both
packages installed at once.
* 01_gecko_iceape.patch: disabled, no longer applies, and I'm not sure
it's necessary any more.
* 02_flv.patch: refreshed.
* 30_fix_youtube_plugin.patch: merged upstream.
* 70_autoconf.patch: disabled, no need for it.
* Drop GnomeVFS dependency.
* Reduce GLib dependency to 2.13.
* Depend on x11proto-core-dev for multimedia keys.
* Depend on libgmythupnp-dev and bump gmyth dependency to 0.7.1.
* Increase GTK+ dependency to 2.13.
* Increase totem-plparser dependency to 2.23.91.
* The browser plugin no longer uses xpt files; remove
totem-mozilla.links and the code in debian/rules that handles them.
* Explicitly enable the complex browser plugin, as it is disabled by
default.
Removed:
desktop/experimental/totem/debian/patches/30_fix_youtube_plugin.patch
Modified:
desktop/experimental/totem/debian/changelog
desktop/experimental/totem/debian/control
desktop/experimental/totem/debian/control.in
desktop/experimental/totem/debian/patches/02_flv.patch
desktop/experimental/totem/debian/patches/series
desktop/experimental/totem/debian/rules
desktop/experimental/totem/debian/totem-mozilla.links
Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=17413&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog (original)
+++ desktop/experimental/totem/debian/changelog Sun Nov 9 14:22:03 2008
@@ -1,3 +1,30 @@
+totem (2.24.3-1) experimental; urgency=low
+
+ * New upstream release. Totem now ships a shared library,
+ libbaconvideowidget.so.0, that I don't know how to deal with
+ while keeping totem-gstreamer and totem-xine co-installable. So
+ trying to install both will now cause dpkg to complain that one
+ overwrites the other's files. Hopefully someone can think of a
+ way to deal with this without dropping the ability to have both
+ packages installed at once.
+ * 01_gecko_iceape.patch: disabled, no longer applies, and I'm not sure
+ it's necessary any more.
+ * 02_flv.patch: refreshed.
+ * 30_fix_youtube_plugin.patch: merged upstream.
+ * 70_autoconf.patch: disabled, no need for it.
+ * Drop GnomeVFS dependency.
+ * Reduce GLib dependency to 2.13.
+ * Depend on x11proto-core-dev for multimedia keys.
+ * Depend on libgmythupnp-dev and bump gmyth dependency to 0.7.1.
+ * Increase GTK+ dependency to 2.13.
+ * Increase totem-plparser dependency to 2.23.91.
+ * The browser plugin no longer uses xpt files; remove
+ totem-mozilla.links and the code in debian/rules that handles them.
+ * Explicitly enable the complex browser plugin, as it is disabled by
+ default.
+
+ -- Sam Morris <sam at robots.org.uk> Thu, 25 Sep 2008 23:10:19 +0100
+
totem (2.22.2-5) unstable; urgency=low
* Don’t build-depend on libbluetooth-dev on kfreebsd. Closes: #499384.
Modified: desktop/experimental/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control?rev=17413&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control (original)
+++ desktop/experimental/totem/debian/control Sun Nov 9 14:22:03 2008
@@ -7,15 +7,15 @@
quilt,
python-support (>= 0.6),
libepc-ui-dev (>= 0.3.0),
- libgmyth-dev (>= 0.3.0),
- libgtk2.0-dev (>= 2.12.6),
- libglib2.0-dev (>= 2.15),
+ libgmyth-dev (>= 0.7.1),
+ libgmythupnp-dev (>= 0.7.1),
+ libgtk2.0-dev (>= 2.13.0),
+ libglib2.0-dev (>= 2.13.4),
libgnome-keyring-dev,
libgnomeui-dev (>= 2.6.1.1-4),
libglade2-dev (>= 2.4.0),
- libgnomevfs2-dev (>= 2.16.0),
libstartup-notification0-dev (>= 0.8),
- libtotem-plparser-dev (>= 2.21.90),
+ libtotem-plparser-dev (>= 2.23.91),
libtrackerclient-dev,
libxine-dev (>= 1.1.7),
liblircclient-dev (>= 0.6.6),
@@ -48,6 +48,7 @@
libxrandr-dev (>= 1.1.1),
libxxf86vm-dev (>= 1.0.1),
libx11-dev,
+ x11proto-core-dev,
gnome-doc-utils,
python-dev (>= 2.3),
python-gobject-dev,
Modified: desktop/experimental/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control.in?rev=17413&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control.in (original)
+++ desktop/experimental/totem/debian/control.in Sun Nov 9 14:22:03 2008
@@ -7,15 +7,15 @@
quilt,
python-support (>= 0.6),
libepc-ui-dev (>= 0.3.0),
- libgmyth-dev (>= 0.3.0),
- libgtk2.0-dev (>= 2.12.6),
- libglib2.0-dev (>= 2.15),
+ libgmyth-dev (>= 0.7.1),
+ libgmythupnp-dev (>= 0.7.1),
+ libgtk2.0-dev (>= 2.13.0),
+ libglib2.0-dev (>= 2.13.4),
libgnome-keyring-dev,
libgnomeui-dev (>= 2.6.1.1-4),
libglade2-dev (>= 2.4.0),
- libgnomevfs2-dev (>= 2.16.0),
libstartup-notification0-dev (>= 0.8),
- libtotem-plparser-dev (>= 2.21.90),
+ libtotem-plparser-dev (>= 2.23.91),
libtrackerclient-dev,
libxine-dev (>= 1.1.7),
liblircclient-dev (>= 0.6.6),
@@ -48,6 +48,7 @@
libxrandr-dev (>= 1.1.1),
libxxf86vm-dev (>= 1.0.1),
libx11-dev,
+ x11proto-core-dev,
gnome-doc-utils,
python-dev (>= 2.3),
python-gobject-dev,
Modified: desktop/experimental/totem/debian/patches/02_flv.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/02_flv.patch?rev=17413&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/02_flv.patch (original)
+++ desktop/experimental/totem/debian/patches/02_flv.patch Sun Nov 9 14:22:03 2008
@@ -1,8 +1,8 @@
-Index: totem-2.22.2/data/mime-type-list.txt
+Index: totem-2.24.0/data/mime-type-list.txt
===================================================================
---- totem-2.22.2.orig/data/mime-type-list.txt 2008-09-05 16:59:47.099803255 +0200
-+++ totem-2.22.2/data/mime-type-list.txt 2008-09-05 16:59:51.774219976 +0200
-@@ -64,7 +64,7 @@
+--- totem-2.24.0.orig/data/mime-type-list.txt 2008-09-19 06:43:46.000000000 +0100
++++ totem-2.24.0/data/mime-type-list.txt 2008-09-25 23:28:44.000000000 +0100
+@@ -66,7 +66,7 @@
video/3gpp
video/dv
video/fli
Modified: desktop/experimental/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/series?rev=17413&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/series (original)
+++ desktop/experimental/totem/debian/patches/series Sun Nov 9 14:22:03 2008
@@ -1,5 +1,4 @@
-01_gecko_iceape.patch
+#01_gecko_iceape.patch
02_flv.patch
20_use_alternatives.patch
-30_fix_youtube_plugin.patch
-70_autoconf.patch
+#70_autoconf.patch
Modified: desktop/experimental/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/rules?rev=17413&op=diff
==============================================================================
--- desktop/experimental/totem/debian/rules (original)
+++ desktop/experimental/totem/debian/rules Sun Nov 9 14:22:03 2008
@@ -33,7 +33,8 @@
--with-gecko=iceape \
--enable-vala=no \
--disable-run-in-source-tree \
- --disable-scrollkeeper
+ --disable-scrollkeeper \
+ --enable-complex-plugin
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
COMMON_CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE)
@@ -87,7 +88,7 @@
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/$*/
+ mv *.so $(installdir)/usr/lib/totem/$*/
# drop anything else
rm -rf $(installdir)/usr/lib/xulrunner
# drop *.a and *.la files
Modified: desktop/experimental/totem/debian/totem-mozilla.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/totem-mozilla.links?rev=17413&op=diff
==============================================================================
--- desktop/experimental/totem/debian/totem-mozilla.links (original)
+++ desktop/experimental/totem/debian/totem-mozilla.links Sun Nov 9 14:22:03 2008
@@ -1,20 +1,10 @@
/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
More information about the pkg-gnome-commits
mailing list