~shnatsel/ubuntu/precise/gnome-control-center/fix-939882

« back to all changes in this revision

Viewing changes to panels/universal-access/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:
77
77
LTLIBRARIES = $(ccpanels_LTLIBRARIES)
78
78
am__DEPENDENCIES_1 =
79
79
libuniversal_access_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
80
 
        $(am__DEPENDENCIES_1) \
81
 
        $(top_builddir)/panels/common/libshortcuts.la
 
80
        $(am__DEPENDENCIES_1)
82
81
am_libuniversal_access_la_OBJECTS = universal-access-module.lo \
83
 
        cc-ua-panel.lo gconf-property-editor.lo cc-marshal.lo
 
82
        cc-ua-panel.lo cc-marshal.lo zoom-options.lo
84
83
libuniversal_access_la_OBJECTS = $(am_libuniversal_access_la_OBJECTS)
85
84
AM_V_lt = $(am__v_lt_$(V))
86
85
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
132
131
AWK = @AWK@
133
132
BACKGROUND_PANEL_CFLAGS = @BACKGROUND_PANEL_CFLAGS@
134
133
BACKGROUND_PANEL_LIBS = @BACKGROUND_PANEL_LIBS@
 
134
BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
 
135
BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
135
136
CC = @CC@
136
137
CCDEPMODE = @CCDEPMODE@
137
138
CFLAGS = @CFLAGS@
151
152
DATETIME_PANEL_LIBS = @DATETIME_PANEL_LIBS@
152
153
DEFS = @DEFS@
153
154
DEPDIR = @DEPDIR@
154
 
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
155
155
DISPLAY_PANEL_CFLAGS = @DISPLAY_PANEL_CFLAGS@
156
156
DISPLAY_PANEL_LIBS = @DISPLAY_PANEL_LIBS@
157
157
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
189
189
KEYBOARD_PANEL_LIBS = @KEYBOARD_PANEL_LIBS@
190
190
LD = @LD@
191
191
LDFLAGS = @LDFLAGS@
192
 
LIBGNOMECONTROLCENTER_AGE = @LIBGNOMECONTROLCENTER_AGE@
193
 
LIBGNOMECONTROLCENTER_CURRENT = @LIBGNOMECONTROLCENTER_CURRENT@
194
 
LIBGNOMECONTROLCENTER_REVISION = @LIBGNOMECONTROLCENTER_REVISION@
195
192
LIBGNOME_CONTROL_CENTER_CFLAGS = @LIBGNOME_CONTROL_CENTER_CFLAGS@
196
193
LIBGNOME_CONTROL_CENTER_LIBS = @LIBGNOME_CONTROL_CENTER_LIBS@
197
194
LIBLANGUAGE_CFLAGS = @LIBLANGUAGE_CFLAGS@
346
343
        universal-access-module.c               \
347
344
        cc-ua-panel.c                           \
348
345
        cc-ua-panel.h                           \
349
 
        gconf-property-editor.h                 \
350
 
        gconf-property-editor.c                 \
351
346
        cc-marshal.c                            \
352
 
        cc-marshal.h
 
347
        cc-marshal.h                            \
 
348
        zoom-options.c                          \
 
349
        zoom-options.h
353
350
 
354
 
libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(UNIVERSAL_ACCESS_PANEL_LIBS) $(top_builddir)/panels/common/libshortcuts.la
 
351
libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(UNIVERSAL_ACCESS_PANEL_LIBS)
355
352
libuniversal_access_la_LDFLAGS = $(PANEL_LDFLAGS)
356
353
uidir = $(pkgdatadir)/ui
357
 
dist_ui_DATA = uap.ui
 
354
dist_ui_DATA = uap.ui zoom-options.ui
358
355
desktopdir = $(datadir)/applications
359
356
desktop_in_files = gnome-universal-access-panel.desktop.in
360
357
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
437
434
 
438
435
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-marshal.Plo@am__quote@
439
436
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-ua-panel.Plo@am__quote@
440
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gconf-property-editor.Plo@am__quote@
441
437
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/universal-access-module.Plo@am__quote@
 
438
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom-options.Plo@am__quote@
442
439
 
443
440
.c.o:
444
441
@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<