r22571 - in /packages/unstable/rhythmbox/debian: changelog control control.in rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon Dec 14 12:17:20 UTC 2009


Author: joss
Date: Mon Dec 14 12:17:19 2009
New Revision: 22571

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22571
Log:
Use gudev on Linux, not HAL.

Modified:
    packages/unstable/rhythmbox/debian/changelog
    packages/unstable/rhythmbox/debian/control
    packages/unstable/rhythmbox/debian/control.in
    packages/unstable/rhythmbox/debian/rules

Modified: packages/unstable/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/changelog?rev=22571&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog [utf-8] Mon Dec 14 12:17:19 2009
@@ -3,6 +3,7 @@
   * Switch to quilt for patch management.
   * 01_dlna_vorbis.patch: patch from Brent Hendricks to enable Ogg 
     Vorbis playback on UPnP/DLNA shares. Closes: #558694.
+  * Use gudev on Linux, not HAL.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 30 Nov 2009 14:11:23 +0100
 

Modified: packages/unstable/rhythmbox/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control?rev=22571&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control [utf-8] Mon Dec 14 12:17:19 2009
@@ -28,7 +28,8 @@
                libavahi-glib-dev (>= 0.6),
                libsoup2.4-dev (>= 2.26.0),
                libsoup-gnome2.4-dev (>= 2.26.0),
-               libhal-dev (>= 0.5),
+               libgudev-1.0-dev (>= 143) [linux-any],
+               libhal-dev (>= 0.5) [!linux-any],
                libmtp-dev (>= 0.3.0),
                libgnome-keyring-dev,
                zlib1g-dev,

Modified: packages/unstable/rhythmbox/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control.in?rev=22571&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control.in [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control.in [utf-8] Mon Dec 14 12:17:19 2009
@@ -23,7 +23,8 @@
                libavahi-glib-dev (>= 0.6),
                libsoup2.4-dev (>= 2.26.0),
                libsoup-gnome2.4-dev (>= 2.26.0),
-               libhal-dev (>= 0.5),
+               libgudev-1.0-dev (>= 143) [linux-any],
+               libhal-dev (>= 0.5) [!linux-any],
                libmtp-dev (>= 0.3.0),
                libgnome-keyring-dev,
                zlib1g-dev,

Modified: packages/unstable/rhythmbox/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rules?rev=22571&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rules [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rules [utf-8] Mon Dec 14 12:17:19 2009
@@ -10,6 +10,12 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-lirc
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+DEB_CONFIGURE_EXTRA_FLAGS += --without-hal --with-gudev
+else
+DEB_CONFIGURE_EXTRA_FLAGS += --with-hal --without-gudev
+endif
+
 # exclude plugins from shlibs generation
 DEB_DH_MAKESHLIBS_ARGS_rhythmbox += -Xdebian/$(cdbs_curpkg)/usr/lib/rhythmbox
 DEB_DH_MAKESHLIBS_ARGS_rhythmbox += -Xdebian/$(cdbs_curpkg)/usr/lib/mozilla




More information about the pkg-gnome-commits mailing list