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
=== 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 @@
1system-config-printer (1.3.3+20110712-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/patches/05_menu_entries.patch:
4 - Add .desktop magic to have s-c-p show up on the new gnome-control-center
5 (LP: #787694)
6
7 -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 21 Jul 2011 12:24:14 +0200
8
1system-config-printer (1.3.3+20110712-0ubuntu1) oneiric; urgency=low9system-config-printer (1.3.3+20110712-0ubuntu1) oneiric; urgency=low
210
3 * New upstream release11 * New upstream release
412
=== 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 @@
13diff -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.in13diff -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
14--- system-config-printer-1.3.0+20110216//system-config-printer.desktop.in 2011-02-16 23:25:01.000000000 +010014--- system-config-printer-1.3.0+20110216//system-config-printer.desktop.in 2011-02-16 23:25:01.000000000 +0100
15+++ system-config-printer-1.3.0+20110216.new//system-config-printer.desktop.in 2011-02-17 00:46:18.808862944 +010015+++ system-config-printer-1.3.0+20110216.new//system-config-printer.desktop.in 2011-02-17 00:46:18.808862944 +0100
16@@ -7,3 +7,4 @@16@@ -7,3 +7,8 @@
17 Type=Application17 Type=Application
18 Icon=printer18 Icon=printer
19 StartupNotify=true19 StartupNotify=true
20+OnlyShowIn=Unity;
20+X-Ubuntu-Gettext-Domain=system-config-printer21+X-Ubuntu-Gettext-Domain=system-config-printer
22+Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
23+X-GNOME-Settings-Panel=printing
24+X-GNOME-Keywords=Printer;Queue;Print;Paper;Ink;Toner;

Subscribers

People subscribed via source and target branches

to all changes: