diff -Nru gnome-desktop3-3.3.90/debian/changelog gnome-desktop3-3.3.90/debian/changelog --- gnome-desktop3-3.3.90/debian/changelog 2012-02-22 07:52:14.000000000 +0000 +++ gnome-desktop3-3.3.90/debian/changelog 2012-02-27 11:17:51.000000000 +0000 @@ -1,3 +1,12 @@ +gnome-desktop3 (3.3.90-0ubuntu2) precise; urgency=low + + * debian/control.in: + - drop the scrollkeeper build-depends, it's not needed + * debian/patches/git_edp_output.patch: "Laptops with eDP panels do not + suspend when lid closed", thanks Seth Forshee (lp: #933710) + + -- Sebastien Bacher Mon, 27 Feb 2012 11:52:12 +0100 + gnome-desktop3 (3.3.90-0ubuntu1) precise; urgency=low * New upstream release: diff -Nru gnome-desktop3-3.3.90/debian/control gnome-desktop3-3.3.90/debian/control --- gnome-desktop3-3.3.90/debian/control 2012-02-22 07:53:25.000000000 +0000 +++ gnome-desktop3-3.3.90/debian/control 2012-02-27 11:21:20.000000000 +0000 @@ -16,7 +16,6 @@ dpkg-dev (>= 1.15.1), libglib2.0-dev (>= 2.27.3), intltool (>= 0.40.6), - scrollkeeper, cdbs (>= 0.4.41), gnome-pkg-tools (>= 0.10), gtk-doc-tools (>= 1.4), diff -Nru gnome-desktop3-3.3.90/debian/control.in gnome-desktop3-3.3.90/debian/control.in --- gnome-desktop3-3.3.90/debian/control.in 2012-02-06 18:36:41.000000000 +0000 +++ gnome-desktop3-3.3.90/debian/control.in 2012-02-27 10:52:25.000000000 +0000 @@ -11,7 +11,6 @@ dpkg-dev (>= 1.15.1), libglib2.0-dev (>= 2.27.3), intltool (>= 0.40.6), - scrollkeeper, cdbs (>= 0.4.41), gnome-pkg-tools (>= 0.10), gtk-doc-tools (>= 1.4), diff -Nru gnome-desktop3-3.3.90/debian/patches/git_edp_output.patch gnome-desktop3-3.3.90/debian/patches/git_edp_output.patch --- gnome-desktop3-3.3.90/debian/patches/git_edp_output.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.3.90/debian/patches/git_edp_output.patch 2012-02-27 10:50:50.000000000 +0000 @@ -0,0 +1,28 @@ +From 11997d32313cd67f24cb26e18c562fa4b75ea36f Mon Sep 17 00:00:00 2001 +From: Seth Forshee +Date: Thu, 23 Feb 2012 20:07:38 +0000 +Subject: bgo#670459 [GnomeRR] - Consider Embedded Display Port outputs as the laptop's built-in display + +xorg still hasn't fixed https://bugs.freedesktop.org/show_bug.cgi?id=26736 which is +about drivers properly exposing the ConnectorType property. This would let us +unambiguously identify a laptop's built-in display without playing heuristics +on the RANDR output names. For now, we'll use 'eDP' as the name given to +Embedded Display Port outputs. +--- +diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c +index c7afd8e..b319b26 100644 +--- a/libgnome-desktop/gnome-rr.c ++++ b/libgnome-desktop/gnome-rr.c +@@ -1905,7 +1905,8 @@ gnome_rr_output_is_laptop (GnomeRROutput *output) + && (strstr (output->name, "lvds") || /* Most drivers use an "LVDS" prefix... */ + strstr (output->name, "LVDS") || + strstr (output->name, "Lvds") || +- strstr (output->name, "LCD"))) /* ... but fglrx uses "LCD" in some versions. Shoot me now, kthxbye. */ ++ strstr (output->name, "LCD") || /* ... but fglrx uses "LCD" in some versions. Shoot me now, kthxbye. */ ++ strstr (output->name, "eDP"))) /* eDP is for internal laptop panel connections */ + return TRUE; + + return FALSE; +-- +cgit v0.9.0.2 + diff -Nru gnome-desktop3-3.3.90/debian/patches/series gnome-desktop3-3.3.90/debian/patches/series --- gnome-desktop3-3.3.90/debian/patches/series 2012-02-22 07:53:07.000000000 +0000 +++ gnome-desktop3-3.3.90/debian/patches/series 2012-02-27 10:50:57.000000000 +0000 @@ -1,3 +1,4 @@ 01_fix_rt_linking.patch 02_refuse_to_break_GL_compositors.patch 99_ltmain_as-needed.patch +git_edp_output.patch