Merge lp:~ubuntu-branches/ubuntu/precise/gnome-desktop3/precise-proposed-201205032246 into lp:ubuntu/precise-proposed/gnome-desktop3

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise-proposed/gnome-desktop3 reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/gnome-desktop3/precise-proposed-201205032246. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-05-03 22:53:19 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-05-03 22:53:19 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/03_default_display_is_internal.patch/.timestamp'
=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-04-06 16:38:09 +0000
+++ .pc/applied-patches	2012-05-03 22:53:19 +0000
@@ -1,4 +1,8 @@
 02_refuse_to_break_GL_compositors.patch
+<<<<<<< TREE
 03_default_display_is_internal.patch
 tweak_color_computation.patch
 04_compute_average_color.patch
+=======
+03_default_display_is_internal.patch
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-16 14:11:14 +0000
+++ debian/changelog	2012-05-03 22:53:19 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 gnome-desktop3 (3.4.1-0ubuntu1) precise-proposed; urgency=low
 
   * New upstream release:
@@ -31,6 +32,19 @@
 
  -- Martin Pitt <[e-mail]>  Thu, 29 Mar 2012 17:49:37 +0200
 
+=======
+gnome-desktop3 (3.4.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * 02_refuse_to_break_GL_compositors.patch: Add DEP-3 patch header.
+  * Add 03_default_display_is_internal.patch: Treat a display named "default"
+    as internal. This happens with the proprietary NVidia driver which does
+    not do proper XRandR. We cannot detect external vs. internal display
+    there, so err on the side of "internal" to make suspend on lid close work.
+    Thanks to James M. Leddy for the initial patch! (LP: #949296)
+
+ -- Martin Pitt <[e-mail]>  Wed, 28 Mar 2012 10:16:05 +0200
+
+>>>>>>> MERGE-SOURCE
 gnome-desktop3 (3.4.0-0ubuntu1) precise-proposed; urgency=low
 
   * New upstream version

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-04-06 16:38:09 +0000
+++ debian/patches/series	2012-05-03 22:53:19 +0000
@@ -1,4 +1,8 @@
 02_refuse_to_break_GL_compositors.patch
+<<<<<<< TREE
 03_default_display_is_internal.patch
 tweak_color_computation.patch
 04_compute_average_color.patch
+=======
+03_default_display_is_internal.patch
+>>>>>>> MERGE-SOURCE