← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-control-center/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_update_translations_template.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Brian Murray
  • Date: 2014-02-26 19:21:03 UTC
  • Revision ID: package-import@ubuntu.com-20140226192103-eem23maw14t3w0jj
Tags: 1:3.6.3-0ubuntu52
https://launchpad.net/bugs/1280872
https://launchpad.net/bugs/1237119
* debian/patches/gcc_not_in_unity.patch:
  - don't list "Unity" in OnlyShowIn, other g-c-c and u-c-c entries get 
    duplicated in the Unity dash, when they both installed (lp: #1280872)
* debian/libgnome-control-center1.symbols,
  debian/patches/10_keyboard_layout_on_unity.patch,
  debian/patches/input-sources-text-entry.patch,
  debian/patches/sound_nua_panel.patch,
  debian/patches/unity_menus.patch,
  debian/patches/unity_notice_info.patch:
  - dropped some unity specific changes

[ Brian Murray ]
* debian/source_gnome-control-center.py: Do not pass an empty list
  of plugin packages to apport. (LP: #1237119)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_update_translations_template.patch
1
1
# Description: files to translate from ubuntu patches
2
2
Index: gnome-control-center-3.6.3/po/POTFILES.in
3
3
===================================================================
4
 
--- gnome-control-center-3.6.3.orig/po/POTFILES.in      2013-11-29 12:29:52.549067375 +0100
5
 
+++ gnome-control-center-3.6.3/po/POTFILES.in   2013-11-29 12:31:23.049071327 +0100
6
 
@@ -99,6 +99,9 @@
 
4
--- gnome-control-center-3.6.3.orig/po/POTFILES.in      2014-02-26 19:01:53.387678617 +0100
 
5
+++ gnome-control-center-3.6.3/po/POTFILES.in   2014-02-26 19:02:22.587679589 +0100
 
6
@@ -98,6 +98,9 @@
7
7
 panels/sound/gvc-speaker-test.c
8
8
 panels/sound/gvc-stream-status-icon.c
9
9
 panels/sound/sound-theme-file-utils.c
13
13
 panels/universal-access/cc-ua-panel.c
14
14
 panels/universal-access/gnome-universal-access-panel.desktop.in.in
15
15
 [type: gettext/glade]panels/universal-access/uap.ui
16
 
@@ -132,7 +135,12 @@
 
16
@@ -131,7 +134,10 @@
17
17
 [type: gettext/glade]panels/wacom/gnome-wacom-properties.ui
18
18
 panels/wacom/gsd-wacom-device.c
19
19
 [type: gettext/glade]panels/wacom/wacom-stylus-page.ui
23
23
 shell/gnome-control-center.desktop.in.in
24
24
 [type: gettext/glade]shell/shell.ui
25
25
+panels/display/cc-rr-labeler.c
26
 
+panels/region/keyboard-shortcuts.c
27
 
+panels/region/unity-region-panel.ui
28
 
+panels/region/gnome-unity-region-panel.desktop.in.in
 
26
+