Merge lp:~maco.m/ubuntu/oneiric/system-config-printer/desktop-change into lp:ubuntu/oneiric/system-config-printer

[Mackenzie Morgan]

change from OnlyShowIn:Unity to NotShowIn:KDE,GNOME so that Xubuntu users can have access without it showing in GNOME for reasons seb128 outlined in the bug report

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-31 16:35:20 +0000
+++ debian/changelog	2011-09-06 18:52:04 +0000
@@ -1,3 +1,10 @@
+system-config-printer (1.3.6+20110831-0ubuntu2) UNRELEASED; urgency=low
+
+  * Change system-config-printer.desktop.in from OnlyShowIn:Unity
+    to NotShowIn:KDE so it works for Xubuntu, GNOME, etc. (LP: #841817)
+
+ -- Mackenzie Morgan <[e-mail]>  Tue, 06 Sep 2011 12:17:12 -0400
+
 system-config-printer (1.3.6+20110831-0ubuntu1) oneiric; urgency=low
 
   * New upstream bug fix release

=== modified file 'debian/patches/05_menu_entries.patch'
--- debian/patches/05_menu_entries.patch	2011-07-21 13:24:14 +0000
+++ debian/patches/05_menu_entries.patch	2011-09-06 18:52:04 +0000
@@ -17,7 +17,7 @@
  Type=Application
  Icon=printer
  StartupNotify=true
-+OnlyShowIn=Unity;
++NotShowIn=KDE,GNOME;
 +X-Ubuntu-Gettext-Domain=system-config-printer
 +Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
 +X-GNOME-Settings-Panel=printing