Merge lp:~noskcaj/ubuntu/trusty/gnome-tweak-tool/merge into lp:ubuntu/trusty/gnome-tweak-tool

[Jackson Doak]

Adds missing depends, debian RC bugs

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

16. By Jackson Doak on 2014-03-23

* Merge from Debian unstable. Remaining changes:
  - debian/patches/fix_crash_for_non-shell_use.patch:
    + Don't crash if gnome-shell is not running.
* debian/control.in:
  + Bump gir1.2-gtk-3.0 minimum dependency. Closes: #740337.
* Add dependency on gir1.2-notify-0.7. Closes: #740595.

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-16 13:38:43 +0000
+++ debian/changelog	2014-03-23 20:48:10 +0000
@@ -1,3 +1,22 @@
+gnome-tweak-tool (3.10.1-2ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/fix_crash_for_non-shell_use.patch:
+      + Don't crash if gnome-shell is not running.
+
+ -- Jackson Doak <[e-mail]>  Mon, 24 Mar 2014 07:39:51 +1100
+
+gnome-tweak-tool (3.10.1-2) unstable; urgency=medium
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/control.in:
+    + Bump gir1.2-gtk-3.0 minimum dependency. Closes: #740337.
+
+  [ Andreas Henriksson ]
+  * Add dependency on gir1.2-notify-0.7. Closes: #740595.
+
+ -- Andreas Henriksson <[e-mail]>  Sun, 16 Mar 2014 19:47:10 +0100
+
 gnome-tweak-tool (3.10.1-1ubuntu1) trusty; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2014-03-16 13:38:43 +0000
+++ debian/control	2014-03-23 20:48:10 +0000
@@ -29,8 +29,9 @@
          gsettings-desktop-schemas (>= 3.6),
          gnome-shell-common (>= 3.4),
          python-gi (>= 3.2.1),
-         gir1.2-gtk-3.0,
-         gir1.2-gnomedesktop-3.0
+         gir1.2-gtk-3.0 (>= 3.10),
+         gir1.2-gnomedesktop-3.0,
+         gir1.2-notify-0.7
 Description: tool to adjust advanced configuration settings for GNOME
  GNOME Tweak Tool allows the adjustment of several advanced GNOME
  options that can't be configured in gnome-control-center.
 
=== modified file 'debian/control.in'
--- debian/control.in	2014-03-16 13:38:43 +0000
+++ debian/control.in	2014-03-23 20:48:10 +0000
@@ -25,8 +25,9 @@
          gsettings-desktop-schemas (>= 3.6),
          gnome-shell-common (>= 3.4),
          python-gi (>= 3.2.1),
-         gir1.2-gtk-3.0,
-         gir1.2-gnomedesktop-3.0
+         gir1.2-gtk-3.0 (>= 3.10),
+         gir1.2-gnomedesktop-3.0,
+         gir1.2-notify-0.7
 Description: tool to adjust advanced configuration settings for GNOME
  GNOME Tweak Tool allows the adjustment of several advanced GNOME
  options that can't be configured in gnome-control-center.