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

« back to all changes in this revision

Viewing changes to .pc/61_unity_use_application_indicator.patch/plugins/a11y-keyboard/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Sebastien Bacher, Robert Ancell, Rico Tzschichholz, Iain Lane
  • Date: 2012-11-21 17:16:23 UTC
  • mfrom: (1.1.62)
  • Revision ID: package-import@ubuntu.com-20121121171623-k7iufrs14qoiozeq
Tags: 3.6.3-0ubuntu1
[ Sebastien Bacher ]
* New upstream version (lp: #1008840)
* debian/patches/git*,
  debian/patches/power-ignore-bad-dbus-requests.patch,
  debian/patches/power-ignore-bad-dbus-requests.patch,
  debian/patches/10_smaller_syndaemon_timeout.patch: 
  - dropped, those fixes are in the new version
* debian/control.in:
  - restore build-depends on libgnomekbd-dev, libxklavier-dev,
    drop the build-depends on libxkbfile-dev
* debian/patches/20_migrate_background_uri.patch:
  - dropped, it was only needed until the LTS
* debian/patches/40_xres_lcddefault.patch:
  - dropped, that was a workaround for libreoffice that shouldn't be
    needed and we should better fix libreoffice
* debian/patches/61_unity_use_application_indicator.patch:
  - drop the keyboard indicator code, that will need to be turned 
    into a proper indicator refactored to handle the new ibus config
* debian/patches/90_set_gmenus_xsettings.patch:
  - refreshed for the new version
* debian/patches/revert_new_ibus_use.patch:
  - revert keyboard code to our 3.4 version
* debian/patches/sync_keyboard_layout_to_accountsservice.patch:
  - dropped, the changes are included in the previous patch

[ Robert Ancell ]
* New upstream release
* debian/control:
  - Bump build-depends on libgnome-desktop-3-dev, libwacom-dev
  - Drop build-depends on libgnomekbd-dev, libxklavier-dev
  - Add build-depends on libxkbfile-dev

[ Rico Tzschichholz ]
* debian/control.in:
  - Build-depend on gtk-doc-tools

[ Iain Lane ]
* New upstream release
* Refresh patches and remove those applied upstream.
* Remove gstreamer BDs which are now obsolete. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
NULL =
2
2
 
3
 
plugin_name = keyboard
 
3
plugin_name = a11y-keyboard
4
4
 
5
5
gtkbuilderdir = $(pkgdatadir)
6
6
gtkbuilder_DATA =                       \
7
7
        gsd-a11y-preferences-dialog.ui  \
8
8
        $(NULL)
9
9
 
10
 
noinst_PROGRAMS =                               \
11
 
        test-a11y-preferences-dialog            \
12
 
        $(NULL)
 
10
noinst_PROGRAMS = test-a11y-preferences-dialog
 
11
 
 
12
libexec_PROGRAMS = gsd-test-a11y-keyboard
 
13
 
 
14
gsd_test_a11y_keyboard_SOURCES =                \
 
15
        gsd-a11y-keyboard-manager.h             \
 
16
        gsd-a11y-keyboard-manager.c             \
 
17
        gsd-a11y-preferences-dialog.c           \
 
18
        gsd-a11y-preferences-dialog.h           \
 
19
        test-a11y-keyboard.c
 
20
 
 
21
gsd_test_a11y_keyboard_CFLAGS =                                 \
 
22
        -I$(top_srcdir)/gnome-settings-daemon                   \
 
23
        -I$(top_srcdir)/plugins/common                          \
 
24
        -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
 
25
        -DGTKBUILDERDIR=\""$(pkgdatadir)"\"                     \
 
26
        $(PLUGIN_CFLAGS)                                        \
 
27
        $(LIBNOTIFY_CFLAGS)                                     \
 
28
        $(SETTINGS_PLUGIN_CFLAGS)                               \
 
29
        $(AM_CFLAGS)
 
30
 
 
31
gsd_test_a11y_keyboard_LDADD =                                  \
 
32
        $(top_builddir)/gnome-settings-daemon/libgsd.la         \
 
33
        $(top_builddir)/plugins/common/libcommon.la             \
 
34
        $(LIBNOTIFY_LIBS)                                       \
 
35
        $(SETTINGS_PLUGIN_LIBS)
13
36
 
14
37
test_a11y_preferences_dialog_SOURCES =          \
15
38
        gsd-a11y-preferences-dialog.c           \