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

[Tim]

[lp:~darkxst/ubuntu/quantal/gui-ufw/lp1071915]

39. By Tim on 2012-10-27

remove OnShowIn line

40. By Tim on 2012-11-06

Move icon from other to system

[Didier Roche (didrocks)]

Hey, see my comment on https://code.launchpad.net/~darkxst/ubuntu/raring/gui-ufw/lp1071915/+merge/135834 as raring needs fixing first :)

However, I think this OnlyShowIn=Unity was set for a purpose, maybe you should check with upstream if that's what they wanted really?

If not, we can remove it (but not with an inline patch like here, but rather with a distro-patch/quilt patch)

Marking as needs fixing for now

review: Needs Fixing

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-09 20:56:56 +0000
+++ debian/changelog	2012-11-06 06:09:19 +0000
@@ -1,3 +1,9 @@
+gui-ufw (12.10.0-0ubuntu2) quantal-proposed; urgency=low
+
+  * Set to display in GNOME (LP: #1071915) 
+
+ -- Tim Lunn <[e-mail]>  Sat, 27 Oct 2012 08:31:44 +1100
+
 gui-ufw (12.10.0-0ubuntu1) quantal; urgency=low
 
   * New upstream release (LP: #911383, #925793).

=== modified file 'gufw.desktop.in'
--- gufw.desktop.in	2012-06-09 20:56:56 +0000
+++ gufw.desktop.in	2012-11-06 06:09:19 +0000
@@ -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