Merge lp:~darkxst/ubuntu/quantal/gui-ufw/lp1071915B into lp:ubuntu/quantal/gui-ufw

[Tim Lunn]

[Didier Roche-Tolomelli (didrocks)]

Looks good to me now :) Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-09 20:56:56 +0000
+++ debian/changelog	2012-11-23 09:29:22 +0000
@@ -1,3 +1,9 @@
+gui-ufw (12.10.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * Set to display in GNOME (LP: #1071915) 
+
+ -- Tim Lunn <[e-mail]>  Fri, 23 Nov 2012 20:25:10 +1100
+
 gui-ufw (12.10.0-0ubuntu1) quantal; urgency=low
 
   * New upstream release (LP: #911383, #925793).

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-11-23 09:29:22 +0000
@@ -0,0 +1,1 @@
+ubuntu_desktop.patch

=== added file 'debian/patches/ubuntu_desktop.patch'
--- debian/patches/ubuntu_desktop.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_desktop.patch	2012-11-23 09:29:22 +0000
@@ -0,0 +1,10 @@
+--- a/gufw.desktop.in
++++ b/gufw.desktop.in
+@@ -72,6 +72,5 @@
+ Comment[ast]=Permite configurar el tornafuéu ufw
+ Comment[ar]=يسٌمح لك بإعداد الجدار الناري UFW
+ Icon=gufw.png
+-Categories=System;Settings;X-GNOME-Settings-Panel;
+-OnlyShowIn=Unity;
++Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;
+ X-GNOME-Settings-Panel=gufw.png