Merge lp:~ubuntu-branches/ubuntu/raring/gnome-panel/raring-201212181443 into lp:ubuntu/raring/gnome-panel

[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/raring/gnome-panel reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/raring/gnome-panel/raring-201212181443. 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)

Unmerged revisions

235. By Iain Lane on 2012-12-18

Add DEP3 info to patch added in previous upload.

234. By Iain Lane on 2012-12-18

releasing version 1:3.6.2-0ubuntu3

233. By Alberts Muktupāvels on 2012-12-03

* debian/patches/fix-for-1083811.patch:
  + Don't set screen to default screen when it exist. (LP: #1083811)
  + Set screen for menu, otherwise menu always appears on first screen.

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-18 13:23:10 +0000
+++ debian/changelog	2012-12-18 14:52:19 +0000
@@ -1,3 +1,9 @@
+gnome-panel (1:3.6.2-0ubuntu4) UNRELEASED; urgency=low
+
+  * Add DEP3 info to patch added in previous upload. 
+
+ -- Iain Lane <[e-mail]>  Tue, 18 Dec 2012 13:32:01 +0000
+
 gnome-panel (1:3.6.2-0ubuntu3) raring; urgency=low
 
   [ Alberts Muktupāvels ]

=== modified file 'debian/patches/fix-for-1083811.patch'
--- debian/patches/fix-for-1083811.patch	2012-12-03 22:12:43 +0000
+++ debian/patches/fix-for-1083811.patch	2012-12-18 14:52:19 +0000
@@ -1,6 +1,7 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
+## Description: Fix "All panels on one screen when using separate x screens"
+## Author: Alberts Muktupāvels <[e-mail]>
+## Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=689610
+## Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-panel/+bug/1083811
 Index: gnome-panel/gnome-panel/panel-toplevel.c
 ===================================================================
 --- gnome-panel.orig/gnome-panel/panel-toplevel.c	2012-12-03 23:45:17.737596000 +0200