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

« back to all changes in this revision

Viewing changes to .pc/revert_git_datetime_port.patch/panels/datetime/Makefile.am

  • 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:
 
1
# This is used in PANEL_CFLAGS
 
2
cappletname = datetime
 
3
 
 
4
SUBDIRS = po-timezones
 
5
 
 
6
icons16dir = $(datadir)/icons/hicolor/16x16/apps
 
7
dist_icons16_DATA = icons/16x16/preferences-system-time.png
 
8
icons22dir = $(datadir)/icons/hicolor/22x22/apps
 
9
dist_icons22_DATA = icons/22x22/preferences-system-time.png
 
10
icons32dir = $(datadir)/icons/hicolor/32x32/apps
 
11
dist_icons32_DATA = icons/32x32/preferences-system-time.png
 
12
icons48dir = $(datadir)/icons/hicolor/48x48/apps
 
13
dist_icons48_DATA = icons/48x48/preferences-system-time.png
 
14
icons256dir = $(datadir)/icons/hicolor/256x256/apps
 
15
dist_icons256_DATA = icons/256x256/preferences-system-time.png
 
16
iconsscalabledir = $(datadir)/icons/hicolor/scalable/apps
 
17
dist_iconsscalable_DATA = icons/scalable/preferences-system-time.svg
 
18
 
 
19
uidir = $(pkgdatadir)/ui/datetime
 
20
dist_ui_DATA = \
 
21
        datetime.ui \
 
22
        data/bg.png \
 
23
        data/cc.png \
 
24
        data/pin.png \
 
25
        data/timezone_0.png \
 
26
        data/timezone_-10.png \
 
27
        data/timezone_10.png \
 
28
        data/timezone_10.5.png \
 
29
        data/timezone_-1.png \
 
30
        data/timezone_1.png \
 
31
        data/timezone_-11.png \
 
32
        data/timezone_11.png \
 
33
        data/timezone_11.5.png \
 
34
        data/timezone_12.png \
 
35
        data/timezone_12.75.png \
 
36
        data/timezone_13.png \
 
37
        data/timezone_14.png \
 
38
        data/timezone_-2.png \
 
39
        data/timezone_2.png \
 
40
        data/timezone_-3.png \
 
41
        data/timezone_3.png \
 
42
        data/timezone_-3.5.png \
 
43
        data/timezone_3.5.png \
 
44
        data/timezone_-4.png \
 
45
        data/timezone_4.png \
 
46
        data/timezone_-4.5.png \
 
47
        data/timezone_4.5.png \
 
48
        data/timezone_-5.png \
 
49
        data/timezone_5.png \
 
50
        data/timezone_-5.5.png \
 
51
        data/timezone_5.5.png \
 
52
        data/timezone_5.75.png \
 
53
        data/timezone_-6.png \
 
54
        data/timezone_6.png \
 
55
        data/timezone_6.5.png \
 
56
        data/timezone_-7.png \
 
57
        data/timezone_7.png \
 
58
        data/timezone_-8.png \
 
59
        data/timezone_8.png \
 
60
        data/timezone_8.75.png \
 
61
        data/timezone_-9.png \
 
62
        data/timezone_9.png \
 
63
        data/timezone_-9.5.png \
 
64
        data/timezone_9.5.png
 
65
 
 
66
tzdatadir = $(pkgdatadir)/datetime
 
67
dist_tzdata_DATA = backward
 
68
 
 
69
AM_CPPFLAGS =                                           \
 
70
        $(PANEL_CFLAGS)                                 \
 
71
        $(DATETIME_PANEL_CFLAGS)                        \
 
72
        -DGNOMELOCALEDIR="\"$(datadir)/locale\""        \
 
73
        -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""          \
 
74
        -DDATADIR="\"$(uidir)\""                        \
 
75
        $(NULL)
 
76
 
 
77
noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
 
78
 
 
79
test_timezone_SOURCES = test-timezone.c cc-timezone-map.h cc-timezone-map.c tz.c tz.h
 
80
test_timezone_LDADD = $(DATETIME_PANEL_LIBS)
 
81
test_timezone_CFLAGS = $(DATETIME_PANEL_CFLAGS)
 
82
 
 
83
test_timezone_gfx_SOURCES = test-timezone-gfx.c tz.c tz.h
 
84
test_timezone_gfx_LDADD = $(DATETIME_PANEL_LIBS)
 
85
test_timezone_gfx_CFLAGS = $(DATETIME_PANEL_CFLAGS)
 
86
 
 
87
test_endianess_SOURCES = test-endianess.c date-endian.c date-endian.h
 
88
test_endianess_LDADD = $(DATETIME_PANEL_LIBS)
 
89
test_endianess_CFLAGS = $(DATETIME_PANEL_CFLAGS)
 
90
 
 
91
all-local: check-local
 
92
 
 
93
check-local: test-timezone-gfx test-endianess test-timezone
 
94
        $(builddir)/test-timezone-gfx $(srcdir)/data
 
95
        $(builddir)/test-endianess
 
96
#       $(builddir)/test-timezone
 
97
 
 
98
ccpanelsdir = $(PANELS_DIR)
 
99
ccpanels_LTLIBRARIES = libdate_time.la
 
100
 
 
101
 
 
102
# This requires running d-bus session and accessible timedate1 daemon
 
103
# FIXME: need to find a way how to filter out unnecessary d-bus stuff (introspectable, properties)
 
104
#timedated1-interface.xml:
 
105
#       gdbus introspect                                        \
 
106
#               --xml                                           \
 
107
#               --system                                        \
 
108
#               --dest org.freedesktop.timedate1                \
 
109
#               --object-path /org/freedesktop/timedate1        \
 
110
#                > timedated1-interface.xml
 
111
 
 
112
dbus_built_sources = timedated.c timedated.h
 
113
timedated.c: timedated.h
 
114
timedated.h: Makefile.am timedated1-interface.xml
 
115
        gdbus-codegen                                           \
 
116
                --interface-prefix org.freedesktop.             \
 
117
                --generate-c-code timedated                     \
 
118
                $(srcdir)/timedated1-interface.xml
 
119
 
 
120
libdate_time_la_SOURCES =       \
 
121
        datetime-module.c       \
 
122
        cc-datetime-panel.c     \
 
123
        cc-datetime-panel.h     \
 
124
        cc-timezone-map.c       \
 
125
        cc-timezone-map.h       \
 
126
        date-endian.c           \
 
127
        date-endian.h           \
 
128
        tz.c tz.h               \
 
129
        $(dbus_built_sources)   \
 
130
        $(NULL)
 
131
 
 
132
libdate_time_la_LIBADD = $(PANEL_LIBS) $(DATETIME_PANEL_LIBS)
 
133
libdate_time_la_LDFLAGS = $(PANEL_LDFLAGS)
 
134
 
 
135
 
 
136
polkitdir = $(datadir)/polkit-1/actions
 
137
polkit_in_files = org.gnome.controlcenter.datetime.policy.in
 
138
 
 
139
@INTLTOOL_POLICY_RULE@
 
140
polkit_DATA = $(polkit_in_files:.policy.in=.policy)
 
141
 
 
142
 
 
143
@INTLTOOL_DESKTOP_RULE@
 
144
 
 
145
desktopdir = $(datadir)/applications
 
146
desktop_in_files = gnome-datetime-panel.desktop.in
 
147
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
148
 
 
149
CLEANFILES =                                    \
 
150
        $(desktop_in_files)                     \
 
151
        $(desktop_DATA)                         \
 
152
        $(dbus_built_sources)                   \
 
153
        org.gnome.controlcenter.datetime.policy
 
154
 
 
155
EXTRA_DIST =                            \
 
156
        timedated1-interface.xml        \
 
157
        $(polkit_in_files)
 
158
 
 
159
BUILT_SOURCES = $(dbus_built_sources)
 
160
 
 
161
-include $(top_srcdir)/git.mk