← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnome-settings-daemon/saucy

« back to all changes in this revision

Viewing changes to .pc/revert_new_ibus_use.patch/data/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, William Hua, Jeremy Bicha
  • Date: 2013-08-21 11:22:42 UTC
  • Revision ID: package-import@ubuntu.com-20130821112242-v7o0n638ranf2mrv
Tags: 3.6.4-0ubuntu16
[ William Hua ]
* debian/control.in:
  - Depend on IBus 1.5.0.
* debian/patches/revert_new_ibus_use.patch:
  - Drop upstream revert.
* debian/patches/ibus-ubuntu-session.patch:
  - Check for Ubuntu session too
* debian/patches/git_keyboard_Adapt_to_gnome_xkb_info_API_change.patch:
* debian/patches/git_keyboard_Adapt_to_gnome_xkb_info_API_change_2.patch:
  - Take upstream's 8174dcd701de399ff28a19efbe9744744b802ce8 and
    55fee0c57563b95deddc4396eec87ab6bee35d34 and so we can work with
    gnome-desktop 3.8.

[ Jeremy Bicha ]
* debian/gnome-settings-daemon.gsettings-override:
  - Set switch-input-source keyboard shortcut to Super+Space to match ibus,
    GNOME 3.8 and Windows 8 default

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/revert_new_ibus_use.patch/data/Makefile.am
1
 
NULL =
2
 
 
3
 
apidir = $(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon
4
 
api_DATA = gsd-enums.h
5
 
 
6
 
gsettings_ENUM_NAMESPACE = org.gnome.settings-daemon
7
 
gsettings_ENUM_FILES = $(top_srcdir)/data/$(api_DATA)
8
 
 
9
 
gsettings_SCHEMAS =                                                     \
10
 
        org.gnome.settings-daemon.peripherals.gschema.xml               \
11
 
        org.gnome.settings-daemon.plugins.gschema.xml                   \
12
 
        org.gnome.settings-daemon.plugins.keyboard.gschema.xml          \
13
 
        org.gnome.settings-daemon.plugins.power.gschema.xml             \
14
 
        org.gnome.settings-daemon.plugins.color.gschema.xml             \
15
 
        org.gnome.settings-daemon.plugins.media-keys.gschema.xml        \
16
 
        org.gnome.settings-daemon.plugins.xsettings.gschema.xml         \
17
 
        org.gnome.settings-daemon.plugins.housekeeping.gschema.xml      \
18
 
        org.gnome.settings-daemon.plugins.print-notifications.gschema.xml       \
19
 
        org.gnome.settings-daemon.plugins.xrandr.gschema.xml            \
20
 
        org.gnome.settings-daemon.plugins.updates.gschema.xml           \
21
 
        org.gnome.settings-daemon.plugins.orientation.gschema.xml       \
22
 
        org.gnome.settings-daemon.peripherals.wacom.gschema.xml
23
 
 
24
 
@INTLTOOL_XML_NOMERGE_RULE@
25
 
 
26
 
@GSETTINGS_RULES@
27
 
 
28
 
convertdir = $(datadir)/GConf/gsettings
29
 
convert_DATA = gnome-settings-daemon.convert
30
 
 
31
 
@INTLTOOL_DESKTOP_RULE@
32
 
desktopdir = $(sysconfdir)/xdg/autostart
33
 
desktop_in_files = gnome-settings-daemon.desktop.in.in
34
 
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
35
 
 
36
 
gnome-settings-daemon.desktop.in: gnome-settings-daemon.desktop.in.in
37
 
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@
38
 
 
39
 
pkgconfigdir = $(libdir)/pkgconfig
40
 
pkgconfig_DATA = gnome-settings-daemon.pc
41
 
 
42
 
@INTLTOOL_XML_NOMERGE_RULE@
43
 
 
44
 
man_MANS = gnome-settings-daemon.1
45
 
 
46
 
dbusservice_in_files = org.freedesktop.IBus.service.in
47
 
 
48
 
EXTRA_DIST =                                    \
49
 
        $(man_MANS)                             \
50
 
        $(convert_DATA)                         \
51
 
        $(gsettings_SCHEMAS:.xml=.xml.in.in)    \
52
 
        $(desktop_in_files)                     \
53
 
        $(gsettings_ENUM_FILES)                 \
54
 
        gnome-settings-daemon.pc.in             \
55
 
        $(api_DATA)                             \
56
 
        $(dbusservice_in_files)                 \
57
 
        $(NULL)
58
 
 
59
 
DISTCLEANFILES =                        \
60
 
        $(gsettings_SCHEMAS)            \
61
 
        $(desktop_DATA)                 \
62
 
        gnome-settings-daemon.desktop.in \
63
 
        $(NULL)
64
 
 
65
 
MAINTAINERCLEANFILES =                  \
66
 
        *~                              \
67
 
        Makefile.in                     \
68
 
        $(gsettings_SCHEMAS:.xml=.valid)
69
 
 
70
 
if HAVE_IBUS
71
 
dbusservicedir=${datadir}/dbus-1/services
72
 
dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
73
 
 
74
 
org.freedesktop.IBus.service: org.freedesktop.IBus.service.in
75
 
        $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@.tmp && mv $@.tmp $@
76
 
 
77
 
CLEANFILES = $(dbusservice_DATA)
78
 
endif