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

Proposed by Rodrigo Moya on 2011-07-21
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~rodrigo-moya/ubuntu/oneiric/system-config-printer/fix-787694
Merge into: lp:ubuntu/oneiric/system-config-printer
Diff against target: 33 lines (+13/-1)
2 files modified
debian/changelog (+8/-0)
debian/patches/05_menu_entries.patch (+5/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/oneiric/system-config-printer/fix-787694
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-07-21 Pending
Review via email: mp+68656@code.launchpad.net
To post a comment you must log in.
190. By Rodrigo Moya on 2011-07-21

Add OnlyShowIn

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-07-12 17:24:12 +0000
3+++ debian/changelog 2011-07-21 10:43:24 +0000
4@@ -1,3 +1,11 @@
5+system-config-printer (1.3.3+20110712-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/patches/05_menu_entries.patch:
8+ - Add .desktop magic to have s-c-p show up on the new gnome-control-center
9+ (LP: #787694)
10+
11+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 21 Jul 2011 12:24:14 +0200
12+
13 system-config-printer (1.3.3+20110712-0ubuntu1) oneiric; urgency=low
14
15 * New upstream release
16
17=== modified file 'debian/patches/05_menu_entries.patch'
18--- debian/patches/05_menu_entries.patch 2011-02-18 22:13:13 +0000
19+++ debian/patches/05_menu_entries.patch 2011-07-21 10:43:24 +0000
20@@ -13,8 +13,12 @@
21 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
22 --- system-config-printer-1.3.0+20110216//system-config-printer.desktop.in 2011-02-16 23:25:01.000000000 +0100
23 +++ system-config-printer-1.3.0+20110216.new//system-config-printer.desktop.in 2011-02-17 00:46:18.808862944 +0100
24-@@ -7,3 +7,4 @@
25+@@ -7,3 +7,8 @@
26 Type=Application
27 Icon=printer
28 StartupNotify=true
29++OnlyShowIn=Unity;
30 +X-Ubuntu-Gettext-Domain=system-config-printer
31++Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
32++X-GNOME-Settings-Panel=printing
33++X-GNOME-Keywords=Printer;Queue;Print;Paper;Ink;Toner;

Subscribers

People subscribed via source and target branches

to all changes: