r38276 - in /desktop/unstable/meta-gnome3/debian: changelog control control.in

[ah at users.alioth.debian.org]

Author: ah
Date: Fri May 31 17:03:40 2013
New Revision: 38276

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38276
Log:
* Depend on rygel-tracker | rygel instead of just rygel-tracker.
  - provides same functionality and can both be configured by
    the Sharing panel in gnome-control-center 3.8.

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

Modified: desktop/unstable/meta-gnome3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/changelog?rev=38276&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/changelog [utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/changelog [utf-8] Fri May 31 17:03:40 2013
@@ -1,6 +1,9 @@
 meta-gnome3 (1:3.8+2) UNRELEASED; urgency=low
 
   * Don't exclude rygel on s390x anymore since it's now available.
+  * Depend on rygel-tracker | rygel instead of just rygel-tracker.
+    - provides same functionality and can both be configured by
+      the Sharing panel in gnome-control-center 3.8.
 
  -- Andreas Henriksson <andreas at fatal.se>  Fri, 31 May 2013 18:58:43 +0200
 

Modified: desktop/unstable/meta-gnome3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/control?rev=38276&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/control [utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/control [utf-8] Fri May 31 17:03:40 2013
@@ -7,7 +7,7 @@
 Section: metapackages
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
 Standards-Version: 3.9.3
 Build-Depends: cdbs (>= 0.4.90),
                debhelper (>= 8),
@@ -120,7 +120,7 @@
          gnome-nettool (>= 3.2) [!kfreebsd-any],
          nautilus-sendto (>= 3.0),
          gnome-orca (>= 3.4),
-         rygel-preferences (>= 0.14) [!s390x],
+         rygel-preferences (>= 0.14),
          seahorse (>= 3.4),
          totem (>= 3.0),
          vinagre (>= 3.4),
@@ -153,8 +153,8 @@
          gstreamer1.0-plugins-ugly (>= 0.10.19),
          rhythmbox-plugins,
          rhythmbox-plugin-cdrecorder,
-         rygel-playbin [!s390x],
-         rygel-tracker [!s390x],
+         rygel-playbin,
+         rygel-tracker | rygel,
          telepathy-gabble,
          telepathy-rakia,
          telepathy-salut,

Modified: desktop/unstable/meta-gnome3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/control.in?rev=38276&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/control.in [utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/control.in [utf-8] Fri May 31 17:03:40 2013
@@ -149,7 +149,7 @@
          rhythmbox-plugins,
          rhythmbox-plugin-cdrecorder,
          rygel-playbin,
-         rygel-tracker,
+         rygel-tracker | rygel,
          telepathy-gabble,
          telepathy-rakia,
          telepathy-salut,