~ubuntu-branches/ubuntu/precise/gnome-control-center/precise-updates

« back to all changes in this revision

Viewing changes to panels/keyboard/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha, Ken VanDine
  • Date: 2012-02-15 23:16:31 UTC
  • mfrom: (1.1.56)
  • Revision ID: package-import@ubuntu.com-20120215231631-vk7me0mhofpsq0hp
Tags: 1:3.3.5-0ubuntu1
* Upload the new serie, that will bring in quite some fixes, we revert
  some problematic or risky changes as well
* The new version includes those fixes:
  - "Change Password in User Accounts panel focuses "New password" field, 
     skipping "Current password"" (lp: #821759)
  - The dialog to add online accounts should have a title 
    (lp: #822380)
  - "Remove Profile" button clickable in Color panel when 
     no profile selected (lp: #869603)
  - Move Removable Media into System Info (lp: #835880)
  - Sound preferences: mouse scrolling balance only works for right.
    (lp: #918017)
  - gnome-control-center SIGSEGV in actualize_printers_list() 
    (lp: #903009)
  - selecting preffered applications is not an info (lp: #890143)
  - Add a keyboard shortcut by default for take screenshot of a selection"
    (lp: #625518)
* debian/patches/revert_git_datetime_port.patch:
  - revert use of datetimed, we don't use systemd and ubuntu-system-service 
    doesn't support it yet
* debian/patches/revert_git_drop_library.patch:
  - consolidate "01_allow_external_panels.patch", don't drop the library
    we use it from other components on ubuntu, the patch will be improved
    later to not use a copy of files like it does in that version
* debian/patches/revert_git_stop_using_gconf.patch,
  debian/patches/revert_ua_gsettings.patch,
  debian/patches/revert_git_keyboard_gsettings.patch:
  - revert keyboard porting to gsettings, compiz still use gconf and we
    didn't update gnome-shell to the new serie (yet)

[ Jeremy Bicha ]
* New upstream release (Thanks Rico Tzchichholz!)
* debian/control.in:
  - Bump minimum dependency versions and add libwacom dependency
* debian/rules: Build without -Wl,-z,defs
* debian/watch: Watch for unstable releases
* Refreshed patches:
  - 01_allow_external_panels.patch
  - 04_add_theme_selection.patch
  - 50_ubuntu_systemwide_prefs.patch
  - 58_ubuntu_icon_views_redesign.patch
  - 59_install_gcm_components_on_demand.patch
  - 91_configure_cheese.patch
* Dropped upstream patches:
  - 00git_handle_media_dialog_close.patch
  - 03_show_wacom_under_unity.patch
  - 90_git_sound_tab_order.patch
  - 91_git_build_use_fontconfig.patch
  - 92_git_minimal_output_height.patch
  - 93_change_window_role_on_panel_change.patch
  - 94_git_adding_shortcuts.patch
  - 95_git_ctrlw_shortcut.patch
  - git_extra_keywords.patch

[ Ken VanDine ]
* debian/patches/96_sound_nua_panel.patch
  - refreshed with latest changes from ronoc

Show diffs side-by-side

added added

removed removed

Lines of Context:
79
79
LTLIBRARIES = $(ccpanels_LTLIBRARIES)
80
80
am__DEPENDENCIES_1 =
81
81
libkeyboard_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
82
 
        $(am__DEPENDENCIES_1) \
83
 
        $(top_builddir)/panels/common/libshortcuts.la
 
82
        $(am__DEPENDENCIES_1)
84
83
am_libkeyboard_la_OBJECTS = libkeyboard_la-keyboard-module.lo \
85
84
        libkeyboard_la-cc-keyboard-panel.lo \
86
85
        libkeyboard_la-cc-keyboard-item.lo libkeyboard_la-wm-common.lo \
87
86
        libkeyboard_la-keyboard-general.lo \
88
 
        libkeyboard_la-keyboard-shortcuts.lo \
89
 
        libkeyboard_la-eggcellrendererkeys.lo
 
87
        libkeyboard_la-keyboard-shortcuts.lo
90
88
libkeyboard_la_OBJECTS = $(am_libkeyboard_la_OBJECTS)
91
89
AM_V_lt = $(am__v_lt_$(V))
92
90
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
138
136
AWK = @AWK@
139
137
BACKGROUND_PANEL_CFLAGS = @BACKGROUND_PANEL_CFLAGS@
140
138
BACKGROUND_PANEL_LIBS = @BACKGROUND_PANEL_LIBS@
 
139
BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
 
140
BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
141
141
CC = @CC@
142
142
CCDEPMODE = @CCDEPMODE@
143
143
CFLAGS = @CFLAGS@
157
157
DATETIME_PANEL_LIBS = @DATETIME_PANEL_LIBS@
158
158
DEFS = @DEFS@
159
159
DEPDIR = @DEPDIR@
160
 
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
161
160
DISPLAY_PANEL_CFLAGS = @DISPLAY_PANEL_CFLAGS@
162
161
DISPLAY_PANEL_LIBS = @DISPLAY_PANEL_LIBS@
163
162
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
195
194
KEYBOARD_PANEL_LIBS = @KEYBOARD_PANEL_LIBS@
196
195
LD = @LD@
197
196
LDFLAGS = @LDFLAGS@
198
 
LIBGNOMECONTROLCENTER_AGE = @LIBGNOMECONTROLCENTER_AGE@
199
 
LIBGNOMECONTROLCENTER_CURRENT = @LIBGNOMECONTROLCENTER_CURRENT@
200
 
LIBGNOMECONTROLCENTER_REVISION = @LIBGNOMECONTROLCENTER_REVISION@
201
197
LIBGNOME_CONTROL_CENTER_CFLAGS = @LIBGNOME_CONTROL_CENTER_CFLAGS@
202
198
LIBGNOME_CONTROL_CENTER_LIBS = @LIBGNOME_CONTROL_CENTER_LIBS@
203
199
LIBLANGUAGE_CFLAGS = @LIBLANGUAGE_CFLAGS@
352
348
        keyboard-general.c              \
353
349
        keyboard-general.h              \
354
350
        keyboard-shortcuts.c            \
355
 
        keyboard-shortcuts.h            \
356
 
        eggcellrendererkeys.c           \
357
 
        eggcellrendererkeys.h
 
351
        keyboard-shortcuts.h
358
352
 
359
353
libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS) -I$(top_srcdir)/panels/common/
360
 
libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS) $(top_builddir)/panels/common/libshortcuts.la
 
354
libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS)
361
355
libkeyboard_la_LDFLAGS = $(PANEL_LDFLAGS)
362
356
uidir = $(pkgdatadir)/ui
363
357
ui_DATA = gnome-keyboard-panel.ui
365
359
Desktop_in_files = gnome-keyboard-panel.desktop.in
366
360
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
367
361
xmldir = $(pkgdatadir)/keybindings
368
 
xml_in_files = 00-multimedia.xml.in 01-launchers.xml.in 01-system.xml.in 50-accessibility.xml.in
 
362
xml_in_files = 00-multimedia.xml.in 01-launchers.xml.in 01-screenshot.xml.in 01-system.xml.in 50-accessibility.xml.in
369
363
xml_DATA = $(xml_in_files:.xml.in=.xml)
370
364
pkgconfigdir = $(datadir)/pkgconfig
371
365
pkgconfig_DATA = gnome-keybindings.pc
461
455
 
462
456
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-cc-keyboard-item.Plo@am__quote@
463
457
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-cc-keyboard-panel.Plo@am__quote@
464
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-eggcellrendererkeys.Plo@am__quote@
465
458
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-keyboard-general.Plo@am__quote@
466
459
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-keyboard-module.Plo@am__quote@
467
460
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-keyboard-shortcuts.Plo@am__quote@
539
532
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
540
533
@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-keyboard-shortcuts.lo `test -f 'keyboard-shortcuts.c' || echo '$(srcdir)/'`keyboard-shortcuts.c
541
534
 
542
 
libkeyboard_la-eggcellrendererkeys.lo: eggcellrendererkeys.c
543
 
@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-eggcellrendererkeys.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-eggcellrendererkeys.Tpo -c -o libkeyboard_la-eggcellrendererkeys.lo `test -f 'eggcellrendererkeys.c' || echo '$(srcdir)/'`eggcellrendererkeys.c
544
 
@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libkeyboard_la-eggcellrendererkeys.Tpo $(DEPDIR)/libkeyboard_la-eggcellrendererkeys.Plo
545
 
@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
546
 
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='eggcellrendererkeys.c' object='libkeyboard_la-eggcellrendererkeys.lo' libtool=yes @AMDEPBACKSLASH@
547
 
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
548
 
@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-eggcellrendererkeys.lo `test -f 'eggcellrendererkeys.c' || echo '$(srcdir)/'`eggcellrendererkeys.c
549
 
 
550
535
mostlyclean-libtool:
551
536
        -rm -f *.lo
552
537