r35077 - in /desktop/experimental/gnome-settings-daemon/debian: changelog patches/22_backlight_optional.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun May 20 04:19:16 2012
New Revision: 35077

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35077
Log:
debian/patches/22_backlight_optional.patch: Don't enable backlight helper
if GUdev is not available.

Added:
    desktop/experimental/gnome-settings-daemon/debian/patches/22_backlight_optional.patch
Modified:
    desktop/experimental/gnome-settings-daemon/debian/changelog
    desktop/experimental/gnome-settings-daemon/debian/patches/series

Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=35077&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Sun May 20 04:19:16 2012
@@ -1,7 +1,7 @@
 gnome-settings-daemon (3.4.2-2) UNRELEASED; urgency=low
 
-  * TODO: If the gconf-bridge is no longer required, drop the corresponding
-    build-depends and configure flags.
+  * debian/patches/22_backlight_optional.patch: Don't enable backlight helper
+    if GUdev is not available.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 19 May 2012 23:52:15 +0200
 

Added: desktop/experimental/gnome-settings-daemon/debian/patches/22_backlight_optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/22_backlight_optional.patch?rev=35077&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/22_backlight_optional.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/22_backlight_optional.patch [utf-8] Sun May 20 04:19:16 2012
@@ -1,0 +1,36 @@
+Description: Don't enable if backlight helper if GUdev is not available
+Author: Michael Biebl <biebl at debian.org>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=676407
+Index: gnome-settings-daemon-3.4.2/configure.ac
+===================================================================
+--- gnome-settings-daemon-3.4.2.orig/configure.ac	2012-05-20 03:37:53.546282530 +0200
++++ gnome-settings-daemon-3.4.2/configure.ac	2012-05-20 03:37:53.570282529 +0200
+@@ -139,8 +139,8 @@
+ GUDEV_PKG=""
+ AC_ARG_ENABLE(gudev, AS_HELP_STRING([--disable-gudev],[Disable GUdev support]), enable_gudev=$enableval)
+ if test x$enable_gudev != xno; then
+-	PKG_CHECK_MODULES(GUDEV, gudev-1.0, HAVE_GUDEV="yes", HAVE_GUDEV="no")
+-	if test "x$HAVE_GUDEV" = "xyes"; then
++	PKG_CHECK_MODULES(GUDEV, gudev-1.0, have_gudev="yes", have_gudev="no")
++	if test "x$have_gudev" = "xyes"; then
+ 		AC_DEFINE(HAVE_GUDEV, 1, [define if GUdev is available])
+ 		GUDEV_PKG="gudev-1.0"
+ 	else
+@@ -151,7 +151,7 @@
+ else
+ 	HAVE_GUDEV=no
+ fi
+-AM_CONDITIONAL(HAVE_GUDEV, test x$HAVE_GUDEV = xyes)
++AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - common
+@@ -314,7 +314,7 @@
+ # UPower
+ # ---------------------------------------------------------------------------
+ PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED_VERSION libcanberra-gtk3)
+-if test x$enable_gudev != xno; then
++if test x$have_gudev != xno; then
+ 	PKG_CHECK_MODULES(BACKLIGHT_HELPER,
+ 		glib-2.0 >= $GLIB_REQUIRED_VERSION
+ 		gudev-1.0

Modified: desktop/experimental/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/series?rev=35077&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Sun May 20 04:19:16 2012
@@ -5,3 +5,4 @@
 revert_git_datetime_dropping.patch
 20_disable-wacom-support-on-s390-s390x.patch
 21_disable-wacom-on-non-Linux-platforms.patch
+22_backlight_optional.patch