r19602 - in /desktop/unstable/control-center/debian: changelog control control.in patches/06_gnomedesktop_api.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Apr 16 08:49:50 2009
New Revision: 19602

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19602
Log:
  only as a requirement. Closes: #524308.
* 06_gnomedesktop_api.patch: patch to cope with the API changes in 
  GnomeRR 2.26.
* Bump build-dependency on gnome-desktop to 2.26.

Added:
    desktop/unstable/control-center/debian/patches/06_gnomedesktop_api.patch
Modified:
    desktop/unstable/control-center/debian/changelog
    desktop/unstable/control-center/debian/control
    desktop/unstable/control-center/debian/control.in
    desktop/unstable/control-center/debian/patches/series

Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=19602&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog (original)
+++ desktop/unstable/control-center/debian/changelog Thu Apr 16 08:49:50 2009
@@ -3,8 +3,11 @@
   * Set the team as primary maintainer. Closes: #523535.
   * 02_build_libgnome.patch: new patch. Fix build failure by linking 
     explicitly to libgnomeui for stuff incorrectly listing gnome-desktop 
-    only as a requirement.
+    only as a requirement. Closes: #524308.
+  * 06_gnomedesktop_api.patch: patch to cope with the API changes in 
+    GnomeRR 2.26.
   * 70_relibtoolize.patch: regenerated.
+  * Bump build-dependency on gnome-desktop to 2.26.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 16 Apr 2009 10:34:54 +0200
 

Modified: desktop/unstable/control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/control?rev=19602&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/control (original)
+++ desktop/unstable/control-center/debian/control Thu Apr 16 08:49:50 2009
@@ -23,7 +23,7 @@
                libgconf2-dev,
                libgnomeui-dev (>= 2.16.0-2),
                libglade2-dev (>= 1:2.4.0),
-               libgnome-desktop-dev (>= 2.23.90),
+               libgnome-desktop-dev (>= 2.26),
                librsvg2-dev,
                libgnome-menu-dev (>= 2.12.0),
                libpango1.0-dev (>= 1.17),

Modified: desktop/unstable/control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/control.in?rev=19602&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/control.in (original)
+++ desktop/unstable/control-center/debian/control.in Thu Apr 16 08:49:50 2009
@@ -23,7 +23,7 @@
                libgconf2-dev,
                libgnomeui-dev (>= 2.16.0-2),
                libglade2-dev (>= 1:2.4.0),
-               libgnome-desktop-dev (>= 2.23.90),
+               libgnome-desktop-dev (>= 2.26),
                librsvg2-dev,
                libgnome-menu-dev (>= 2.12.0),
                libpango1.0-dev (>= 1.17),

Added: desktop/unstable/control-center/debian/patches/06_gnomedesktop_api.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/06_gnomedesktop_api.patch?rev=19602&op=file
==============================================================================
--- desktop/unstable/control-center/debian/patches/06_gnomedesktop_api.patch (added)
+++ desktop/unstable/control-center/debian/patches/06_gnomedesktop_api.patch Thu Apr 16 08:49:50 2009
@@ -1,0 +1,31 @@
+Index: gnome-control-center-2.24.0.1/capplets/display/xrandr-capplet.c
+===================================================================
+--- gnome-control-center-2.24.0.1.orig/capplets/display/xrandr-capplet.c	2009-04-16 10:36:37.412850259 +0200
++++ gnome-control-center-2.24.0.1/capplets/display/xrandr-capplet.c	2009-04-16 10:37:37.653350312 +0200
+@@ -435,7 +435,7 @@ rebuild_rotation_combo (App *app)
+ 
+ 	app->current_output->rotation = info->rotation;
+ 
+-	if (gnome_rr_config_applicable (app->current_configuration, app->screen))
++	if (gnome_rr_config_applicable (app->current_configuration, app->screen, NULL))
+ 	{
+  	    add_key (app->rotation_combo, info->name, 0, 0, 0, info->rotation);
+ 
+@@ -1689,7 +1689,7 @@ on_detect_displays (GtkWidget *widget, g
+ {
+     App *app = data;
+ 
+-    gnome_rr_screen_refresh (app->screen);
++    gnome_rr_screen_refresh (app->screen, NULL);
+ }
+ 
+ #define SHOW_ICON_KEY "/apps/gnome_settings_daemon/xrandr/show_notification_icon"
+@@ -1723,7 +1723,7 @@ run_application (App *app)
+     }
+ 
+     app->screen = gnome_rr_screen_new (gdk_screen_get_default (),
+-				       on_screen_changed, app);
++				       on_screen_changed, app, NULL);
+     if (!app->screen)
+     {
+ 	g_error ("Could not get screen info");

Modified: desktop/unstable/control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/series?rev=19602&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/patches/series (original)
+++ desktop/unstable/control-center/debian/patches/series Thu Apr 16 08:49:50 2009
@@ -3,6 +3,7 @@
 03_a11y_logout.patch
 04_path_xtra.patch
 05_ta_po.patch
+06_gnomedesktop_api.patch
 25_window_manager_settings.patch
 70_relibtoolize.patch
 99_ltmain_as-needed.patch