r20130 - in /desktop/unstable/meta-gnome2/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Tue May 26 20:43:02 2009
New Revision: 20130

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20130
Log:
g-d-e conflicts against gstreamer0.10-gnomevfs since gstreamer will 
prefer it over gio, which is, well, stupid.

Modified:
    desktop/unstable/meta-gnome2/debian/changelog
    desktop/unstable/meta-gnome2/debian/control
    desktop/unstable/meta-gnome2/debian/control.in

Modified: desktop/unstable/meta-gnome2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/changelog?rev=20130&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/changelog (original)
+++ desktop/unstable/meta-gnome2/debian/changelog Tue May 26 20:43:02 2009
@@ -4,6 +4,8 @@
   * Don’t depend on rarian-compat, it’s not needed at all.
   * gnome-core-devel depends on rarian-compat since it is needed to 
     build some gnome packages.
+  * g-d-e conflicts against gstreamer0.10-gnomevfs since gstreamer will 
+    prefer it over gio, which is, well, stupid.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 28 Apr 2009 13:27:59 +0200
 

Modified: desktop/unstable/meta-gnome2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control?rev=20130&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control (original)
+++ desktop/unstable/meta-gnome2/debian/control Tue May 26 20:43:02 2009
@@ -151,6 +151,7 @@
 Recommends: gnome-accessibility,
             gnome-games (>= 1:2.24.3)
 Suggests: gnome-dbg
+Conflicts: gstreamer0.10-gnomevfs
 Description: The GNOME Desktop Environment
  This is the GNOME Desktop environment, an intuitive and attractive
  desktop.

Modified: desktop/unstable/meta-gnome2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control.in?rev=20130&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control.in (original)
+++ desktop/unstable/meta-gnome2/debian/control.in Tue May 26 20:43:02 2009
@@ -151,6 +151,7 @@
 Recommends: gnome-accessibility,
             gnome-games (>= 1:2.24.3)
 Suggests: gnome-dbg
+Conflicts: gstreamer0.10-gnomevfs
 Description: The GNOME Desktop Environment
  This is the GNOME Desktop environment, an intuitive and attractive
  desktop.