diff -Nurd -x'*~' gnome-desktop-2.28.2.orig/configure gnome-desktop-2.28.2/configure
--- gnome-desktop-2.28.2.orig/configure	2009-12-17 06:22:33.000000000 -0500
+++ gnome-desktop-2.28.2/configure	2010-03-01 03:30:53.000000000 -0500
@@ -2827,7 +2827,7 @@
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
 
-LT_VERSION=15:2:4
+LT_VERSION=14:2:3
 
 
 
@@ -13627,7 +13627,7 @@
 GLIB_REQUIRED=2.19.1
 GCONF_REQUIRED=2.0.0
 STARTUP_NOTIFICATION_REQUIRED=0.5
-XRANDR_REQUIRED=1.2
+XRANDR_REQUIRED=99999.FORCE.NONDETECT
 
 
 
@@ -15096,7 +15096,7 @@
 $as_echo "$as_me: error: \"no (requires X development libraries)\"" >&2;}
    { (exit 1); exit 1; }; }
      else
-       XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXrandr $X_EXTRA_LIBS"
+       XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
        XLIB_CFLAGS=$X_CFLAGS
      fi
 elif test $pkg_failed = untried; then
@@ -16621,7 +16621,7 @@
 
 
 
-GETTEXT_PACKAGE=gnome-desktop-2.0
+GETTEXT_PACKAGE=gnome-desktop-2.11
 
 cat >>confdefs.h <<_ACEOF
 #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
diff -Nurd -x'*~' gnome-desktop-2.28.2.orig/docs/reference/gnome-desktop/Makefile.in gnome-desktop-2.28.2/docs/reference/gnome-desktop/Makefile.in
--- gnome-desktop-2.28.2.orig/docs/reference/gnome-desktop/Makefile.in	2009-12-17 06:22:36.000000000 -0500
+++ gnome-desktop-2.28.2/docs/reference/gnome-desktop/Makefile.in	2010-03-01 03:20:22.000000000 -0500
@@ -318,7 +318,7 @@
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES = $(GNOME_DESKTOP_CFLAGS) -I$(top_srcdir)/libgnome-desktop -DGNOME_DESKTOP_USE_UNSTABLE_API
+INCLUDES = -I$(top_srcdir)/libgnome-desktop -DGNOME_DESKTOP_USE_UNSTABLE_API $(GNOME_DESKTOP_CFLAGS)
 GTKDOC_LIBS = $(GNOME_DESKTOP_LIBS) $(top_builddir)/libgnome-desktop/libgnome-desktop-2.la
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff -Nurd -x'*~' gnome-desktop-2.28.2.orig/docs/reference/gnome-desktop/gnome-desktop.types gnome-desktop-2.28.2/docs/reference/gnome-desktop/gnome-desktop.types
--- gnome-desktop-2.28.2.orig/docs/reference/gnome-desktop/gnome-desktop.types	2009-12-17 06:24:10.000000000 -0500
+++ gnome-desktop-2.28.2/docs/reference/gnome-desktop/gnome-desktop.types	2010-03-01 03:32:24.000000000 -0500
@@ -1,9 +1,7 @@
 #include <libgnome/gnome-desktop-item.h>
 #include <libgnomeui/gnome-bg.h>
 #include <libgnomeui/gnome-desktop-thumbnail.h>
-#include <libgnomeui/gnome-rr-labeler.h>
 
 gnome_desktop_item_get_type
 gnome_bg_get_type
 gnome_desktop_thumbnail_factory_get_type
-gnome_rr_labeler_get_type
diff -Nurd -x'*~' gnome-desktop-2.28.2.orig/libgnome-desktop/Makefile.in gnome-desktop-2.28.2/libgnome-desktop/Makefile.in
--- gnome-desktop-2.28.2.orig/libgnome-desktop/Makefile.in	2009-12-17 06:22:36.000000000 -0500
+++ gnome-desktop-2.28.2/libgnome-desktop/Makefile.in	2010-03-01 03:39:13.000000000 -0500
@@ -85,8 +85,7 @@
 am_libgnome_desktop_2_la_OBJECTS = gnome-desktop-item.lo \
 	gnome-desktop-utils.lo gnome-desktop-thumbnail.lo \
 	gnome-thumbnail-pixbuf-utils.lo gnome-bg.lo \
-	gnome-bg-crossfade.lo display-name.lo gnome-rr.lo \
-	gnome-rr-config.lo gnome-rr-labeler.lo edid-parse.lo
+	gnome-bg-crossfade.lo display-name.lo edid-parse.lo
 libgnome_desktop_2_la_OBJECTS = $(am_libgnome_desktop_2_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -374,17 +373,13 @@
 	gnome-bg.c		\
 	gnome-bg-crossfade.c	\
 	display-name.c		\
-	gnome-rr.c		\
-	gnome-rr-config.c	\
-	gnome-rr-labeler.c	\
-	gnome-rr-private.h	\
 	edid-parse.c		\
 	edid.h			\
 	private.h
 
 libgnome_desktop_2_la_LIBADD = \
 	$(XLIB_LIBS)		\
-	$(GNOME_DESKTOP_LIBS)
+	$(GNOME_DESKTOP_LIBS) $(INTLLIBS)
 
 libgnome_desktop_2_la_LDFLAGS = \
 	-version-info $(LT_VERSION) \
@@ -508,9 +503,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-desktop-item.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-desktop-thumbnail.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-desktop-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-rr-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-rr-labeler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-rr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-thumbnail-pixbuf-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ditem.Po@am__quote@
 
diff -Nurd -x'*~' gnome-desktop-2.28.2.orig/libgnome-desktop/libgnomeui/Makefile.in gnome-desktop-2.28.2/libgnome-desktop/libgnomeui/Makefile.in
--- gnome-desktop-2.28.2.orig/libgnome-desktop/libgnomeui/Makefile.in	2009-12-17 06:22:36.000000000 -0500
+++ gnome-desktop-2.28.2/libgnome-desktop/libgnomeui/Makefile.in	2010-03-01 03:33:57.000000000 -0500
@@ -274,10 +274,7 @@
 libgnomeui_desktop_HEADERS = \
 	gnome-bg.h		\
 	gnome-bg-crossfade.h	\
-	gnome-desktop-thumbnail.h \
-	gnome-rr.h		\
-	gnome-rr-config.h	\
-	gnome-rr-labeler.h
+	gnome-desktop-thumbnail.h
 
 all: all-am