Merge lp:~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-201108260306 into lp:ubuntu/oneiric/gnome-shell

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/gnome-shell reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-201108260306. 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)

[Colin Watson (cjwatson)]

The discrepancy is due to an automatic gnome-pkg-tools-induced change to debian/control which wasn't committed to the manually-modified branch. Otherwise, I don't think there's any significant extra content or history here, so rejecting.

review: Disapprove

Unmerged revisions

36. By Laurent Bigonville on 2011-08-26

Release to oneiric

35. By Laurent Bigonville on 2011-08-26

* New upstream release.
* debian/control:
  - Build-depends on mesa-common-dev [armel]
  - Depend on gir1.2-soup-2.4
  - Bump libclutter, libgirepository, libgnome-bluetooth and libnm-glib
    minimum versions
  - Drop some redundant dependencies
* debian/patches/01_favorite_apps.patch: Updated
* debian/patches/03_power_dbus_name_change.patch: Dropped, upstream

=== modified file 'debian/control'
--- debian/control	2011-08-26 02:46:22 +0000
+++ debian/control	2011-09-02 22:56:33 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # This file is autogenerated. DO NOT EDIT!
 # 
 # Modifications should be made to debian/control.in instead.
@@ -84,3 +85,91 @@
  by the GNOME Panel and by the window manager in previous versions of
  GNOME. The GNOME Shell has rich visual effects enabled by new
  graphical technologies.
+=======
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+Source: gnome-shell
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Gustavo Noronha Silva <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Frederic Peters <[e-mail]>, Sjoerd Simons <[e-mail]>
+Build-Depends: cdbs,
+               debhelper (>= 7),
+               autotools-dev,
+               gnome-pkg-tools (>= 0.11),
+               intltool,
+               libgjs-dev (>= 1.29.15),
+               gvfs-backends,
+               gobject-introspection (>= 0.10.1),
+               gir1.2-json-1.0,
+               gnome-bluetooth (>= 3.1.0),
+               gsettings-desktop-schemas-dev (>= 0.1.7),
+               libcroco3-dev (>= 0.6.2),
+               libdbus-glib-1-dev,
+               libgconf2-dev,
+               libgirepository1.0-dev (>= 1.29.15),
+               libglib2.0-dev (>= 2.25.9),
+               libglib2.0-bin (>= 2.25.11),
+               libgnome-bluetooth-dev (>= 3.1.0),
+               libgnome-desktop-3-dev (>= 2.90.0),
+               libgnome-menu-dev,
+               libgstreamer0.10-dev (>= 0.10.16),
+               libgtk-3-dev (>= 3.0.0),
+               libnm-glib-dev (>= 0.8.999),
+               libstartup-notification0-dev (>= 0.11),
+               libmutter-dev (>= 3.0.0),
+               librsvg2-dev,
+               libwnck-dev,
+               libclutter-1.0-dev (>= 1.7.5),
+               libxfixes-dev (>= 1:5.0),
+               libxss-dev,
+               libpulse-dev,
+               libcanberra-dev,
+               libecal1.2-dev (>= 2.32),
+               libedataserver1.2-dev (>= 3.0.0),
+               libedataserverui-3.0-dev (>= 3.0.0),
+               libtelepathy-glib-dev (>= 0.15.3),
+               libtelepathy-logger-dev (>= 0.2.4),
+               libpolkit-agent-1-dev (>= 0.100),
+               mesa-common-dev [armel]
+Standards-Version: 3.9.1
+Homepage: http://live.gnome.org/GnomeShell
+
+Package: gnome-shell
+Architecture: any
+Depends: ${gir:Depends},
+         gjs (>= 1.29.15),
+         ${shlibs:Depends},
+         ${misc:Depends},
+         libdconf0 | gsettings-backend,
+         gnome-settings-daemon (>= 2.91.5.1),
+         gsettings-desktop-schemas (>= 0.1.7),
+         gnome-icon-theme-symbolic (>= 2.91),
+         ${icon-theme:Depends},
+         gir1.2-gconf-2.0,
+         gir1.2-gkbd-3.0,
+         gir1.2-gnomebluetooth-1.0,
+         gir1.2-networkmanager-1.0,
+         gir1.2-polkit-1.0,
+         gir1.2-soup-2.4,
+         gir1.2-upowerglib-1.0,
+         python,
+         pkg-config,
+         mesa-utils
+Recommends: gnome-control-center, gnome-user-guide, gnome-themes-standard
+Breaks: gnome-control-center (<< 1:3.0)
+Description: graphical shell for the GNOME desktop
+ The GNOME Shell redefines user interactions with the GNOME desktop.
+ In particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts
+ management. The GNOME Shell is intended to replace functions handled
+ by the GNOME Panel and by the window manager in previous versions of
+ GNOME. The GNOME Shell has rich visual effects enabled by new
+ graphical technologies.
+>>>>>>> MERGE-SOURCE