← Back to branch summary

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

« back to all changes in this revision

Viewing changes to panels/region/Makefile.am

  • 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:
panels/region/Makefile.am
25
25
        gnome-region-panel-system.h \
26
26
        gnome-region-panel-input.c \
27
27
        gnome-region-panel-input.h \
28
 
        cc-region-keyboard-item.c \
29
 
        cc-region-keyboard-item.h \
30
 
        keyboard-shortcuts.c \
31
 
        keyboard-shortcuts.h \
32
 
        gtkentryaccel.c \
33
 
        gtkentryaccel.h \
34
 
        wm-common.c \
35
 
        wm-common.h \
36
28
        $(NULL)
37
29
 
38
30
libregion_la_LIBADD = $(PANEL_LIBS) $(REGION_PANEL_LIBS) $(builddir)/../common/liblanguage.la
44
36
uidir   = $(pkgdatadir)/ui
45
37
ui_DATA = \
46
38
        gnome-region-panel.ui \
47
 
        unity-region-panel.ui \
48
39
        gnome-region-panel-input-chooser.ui \
49
40
        $(NULL)
50
41
 
51
42
desktopdir = $(datadir)/applications
52
 
Desktop_in_files =      \
53
 
        gnome-region-panel.desktop.in \
54
 
        gnome-unity-region-panel.desktop.in
 
43
Desktop_in_files = gnome-region-panel.desktop.in
55
44
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
56
45
 
57
46
CLEANFILES = $(Desktop_in_files) $(desktop_DATA)