diff -Nru gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/changelog gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/changelog --- gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/changelog 2012-07-25 05:50:21.000000000 +0000 +++ gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/changelog 2012-08-08 20:24:45.000000000 +0000 @@ -1,8 +1,8 @@ -gnome-shell (3.5.4+git20120721.r1.dd80f390-0ubuntu1~12.10~ricotz1) quantal; urgency=medium +gnome-shell (3.5.4+git20120721.r1.dd80f390-0ubuntu1~12.10~ricotz2) quantal; urgency=high * Update or fix packaging - -- Rico Tzschichholz Wed, 25 Jul 2012 07:50:21 +0200 + -- Rico Tzschichholz Wed, 08 Aug 2012 22:24:11 +0200 gnome-shell (3.5.4-0ubuntu1) quantal; urgency=low diff -Nru gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/patches/git-adapt-bluetooth-api.patch gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/patches/git-adapt-bluetooth-api.patch --- gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/patches/git-adapt-bluetooth-api.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/patches/git-adapt-bluetooth-api.patch 2012-08-08 20:22:12.000000000 +0000 @@ -0,0 +1,51 @@ +From a2465e0670bdf83b6d3931df6d1ef1e5bd89462c Mon Sep 17 00:00:00 2001 +From: Florian Müllner +Date: Mon, 30 Jul 2012 17:09:42 +0000 +Subject: bluetooth: Adapt to GnomeBluetooth API break + +--- +diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js +index b68b843..7df1006 100644 +--- a/js/ui/status/bluetooth.js ++++ b/js/ui/status/bluetooth.js +@@ -5,6 +5,7 @@ const Gdk = imports.gi.Gdk; + const GLib = imports.gi.GLib; + const Gio = imports.gi.Gio; + const GnomeBluetoothApplet = imports.gi.GnomeBluetoothApplet; ++const GnomeBluetooth = imports.gi.GnomeBluetooth; + const Gtk = imports.gi.Gtk; + const Lang = imports.lang; + const Mainloop = imports.mainloop; +@@ -36,11 +37,11 @@ const Indicator = new Lang.Class({ + this._applet.connect('notify::killswitch-state', Lang.bind(this, this._updateKillswitch)); + this._killswitch.connect('toggled', Lang.bind(this, function() { + let current_state = this._applet.killswitch_state; +- if (current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED && +- current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER) { ++ if (current_state != GnomeBluetooth.KillswitchState.HARD_BLOCKED && ++ current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER) { + this._applet.killswitch_state = this._killswitch.state ? +- GnomeBluetoothApplet.KillswitchState.UNBLOCKED: +- GnomeBluetoothApplet.KillswitchState.SOFT_BLOCKED; ++ GnomeBluetooth.KillswitchState.UNBLOCKED: ++ GnomeBluetooth.KillswitchState.SOFT_BLOCKED; + } else + this._killswitch.setToggleState(false); + })); +@@ -99,10 +100,10 @@ const Indicator = new Lang.Class({ + + _updateKillswitch: function() { + let current_state = this._applet.killswitch_state; +- let on = current_state == GnomeBluetoothApplet.KillswitchState.UNBLOCKED; +- let has_adapter = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER; +- let can_toggle = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER && +- current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED; ++ let on = current_state == GnomeBluetooth.KillswitchState.UNBLOCKED; ++ let has_adapter = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER; ++ let can_toggle = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER && ++ current_state != GnomeBluetooth.KillswitchState.HARD_BLOCKED; + + this._killswitch.setToggleState(on); + if (can_toggle) +-- +cgit v0.9.0.2 diff -Nru gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/patches/series gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/patches/series --- gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/patches/series 2012-07-25 05:50:21.000000000 +0000 +++ gnome-shell-3.5.4+git20120721.r1.dd80f390/debian/patches/series 2012-08-08 20:23:55.000000000 +0000 @@ -3,3 +3,4 @@ 11-no-gettext.patch 14_make-GLX-optional.patch 22-remove-gdmgreeter-dep.patch +git-adapt-bluetooth-api.patch