Merge lp:~rodrigo-moya/ubuntu/oneiric/system-config-printer/fix-787694 into lp:ubuntu/oneiric/system-config-printer

[Rodrigo Moya]

[lp:~rodrigo-moya/ubuntu/oneiric/system-config-printer/fix-787694]

190. By Rodrigo Moya on 2011-07-21

Add OnlyShowIn

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-12 17:24:12 +0000
+++ debian/changelog	2011-07-21 10:43:24 +0000
@@ -1,3 +1,11 @@
+system-config-printer (1.3.3+20110712-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/05_menu_entries.patch:
+    - Add .desktop magic to have s-c-p show up on the new gnome-control-center
+      (LP: #787694)
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 21 Jul 2011 12:24:14 +0200
+
 system-config-printer (1.3.3+20110712-0ubuntu1) oneiric; urgency=low
 
   * New upstream release

=== modified file 'debian/patches/05_menu_entries.patch'
--- debian/patches/05_menu_entries.patch	2011-02-18 22:13:13 +0000
+++ debian/patches/05_menu_entries.patch	2011-07-21 10:43:24 +0000
@@ -13,8 +13,12 @@
 diff -Nur -x '*.orig' -x '*~' system-config-printer-1.3.0+20110216//system-config-printer.desktop.in system-config-printer-1.3.0+20110216.new//system-config-printer.desktop.in
 --- system-config-printer-1.3.0+20110216//system-config-printer.desktop.in	2011-02-16 23:25:01.000000000 +0100
 +++ system-config-printer-1.3.0+20110216.new//system-config-printer.desktop.in	2011-02-17 00:46:18.808862944 +0100
-@@ -7,3 +7,4 @@
+@@ -7,3 +7,8 @@
  Type=Application
  Icon=printer
  StartupNotify=true
++OnlyShowIn=Unity;
 +X-Ubuntu-Gettext-Domain=system-config-printer
++Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
++X-GNOME-Settings-Panel=printing
++X-GNOME-Keywords=Printer;Queue;Print;Paper;Ink;Toner;