~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to gnome-panel/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Sebastien Bacher, Jeremy Bicha
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.13.10 upstream) (2.2.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20110530110449-hinl17kxkcefjw6x
Tags: 1:3.0.2-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in:
  - the new libgweather version is in oneiric, use it
  - drop the python and python-gconf depends, 
    they were added for gnome-panel-add which is still using gconf and buggy
* debian/gnome-panel-data.install:
  - don't install the apport hook, it's only getting gconf datas which 
    doesn't work since gnome-panel uses gsettings
* debian/patches/90_build_fixes.patch:
  - restore build fix from git not applied in the new serie
* debian/patches/01_panel_submenus.patch:
  - don't take that Debian diff, the .menus use the upstream naming in Ubuntu
* debian/patches/06_no_resize_grip.patch:
  - dropped, the issue is fixed in the new version
* debian/patches/50_fix-potfiles.patch:
  - dropped, the issue is fixed in the new version
* debian/watch:
  - track unstable series as well

Drop those delta, since gnome-panel is not the default Ubuntu session now we
can go back to an experience closer to the upstream one: 
* debian/control.in:
  - drop the indicators recommends, unity-2d is the ubuntu fallback session
    so we can get back to use an upstream config for gnome-panel and reduce
    the delta we carry
* debian/patches/04_default_panel_config.patch:
  - don't modify the upstream layout
* debian/patches/05_no_session_delay.patch:
  - no need to tweak the upstream session to optimize it
* debian/patches/16_compiz_workspace_switcher.patch:
  - go back to the upstream switcher behaviour    
* debian/patches/25_dynamic_fusa_detection.patch:
  - not needed since we use the upstream layout, could be ported if someone
    is wanting to do the work though
* debian/patches/30_disable-initial-animation.patch, debian/rules:
  - drop the --disable-initial-animation, that was some login optimization
    but since it's not the default desktop you should go back to the 
    upstream behaviour

[ Jeremy Bicha ]   
* New upstream version
* Merge from Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Recommends gnome-settings-daemon which has the timezone polkit service
* debian/rules:
  - Update translations template.
* debian/gnome-panel-data.install:
  - Install apport hook
  - Install the "About Ubuntu" menu item.
* debian/patches/01_layout.patch:
  - Disabled, Help & About Ubuntu don't fit as well in Gnome Panel 3
* debian/patches/01_panel_submenus.patch.
  - Dropped
* debian/patches/03_dnd_places_link.patch:
  - Disabled, when using Drag'n'Drop from Places menu, install a link launcher
    (.desktop file) instead of copying the entire directory.
* debian/patches/17_about-ubuntu-translation.patch:
  - List ubuntu-about.desktop for translation.
* debian/patches/40_unset_menuproxy.patch:
  - Make sure gnome-panel and the applets don't pick up menu proxies.
* debian/patches/50_fix-potfiles.patch
  - Fix i18n
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/71_change_bookmark_submenu_limit_value.patch
  - Dropped, picked up by Debian
* debian/patches/18_lockdown_lock_editor.patch:
* debian/patches/90_git_wnck_show_realize.patch:
* debian/patches/90_fix_linking_DSO_link.patch:
* debian/patches/91_gir_annotations.patch
* debian/patches/92_git_calendar_day.patch
* debian/patches/92_git_fix_applets_in_multiscreen.patch:
  - Dropped, applied upstream
* debian/watch:
  - watch unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
 
9
9
AM_CPPFLAGS =                                                   \
10
10
        $(PANEL_CFLAGS)                                         \
11
 
        $(X_CFLAGS)                                             \
12
 
        $(XRANDR_CFLAGS)                                        \
13
11
        -I.                                                     \
14
12
        -I$(srcdir)                                             \
15
13
        -I$(top_builddir)/gnome-panel                           \
16
14
        -I$(top_builddir)/gnome-panel/libpanel-util             \
 
15
        -DPANELDATADIR=\""$(datadir)/gnome-panel"\"             \
17
16
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
18
17
        -DBUILDERDIR=\""$(uidir)"\"                             \
19
18
        -DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\"          \
34
33
        panel-compatibility.c   \
35
34
        panel.c                 \
36
35
        applet.c                \
37
 
        drawer.c                \
38
 
        panel-config-global.c   \
39
36
        panel-util.c            \
40
37
        panel-gconf.c           \
41
38
        panel-properties-dialog.c       \
51
48
        panel-stock-icons.c     \
52
49
        panel-action-button.c   \
53
50
        panel-menu-bar.c        \
 
51
        panel-menu-bar-object.c \
54
52
        panel-menu-button.c     \
55
53
        panel-menu-items.c      \
56
54
        panel-separator.c       \
63
61
        panel-multiscreen.c     \
64
62
        panel-a11y.c            \
65
63
        panel-bindings.c        \
66
 
        panel-profile.c         \
67
64
        panel-force-quit.c      \
68
65
        panel-lockdown.c        \
69
66
        panel-addto.c           \
70
67
        panel-ditem-editor.c    \
 
68
        panel-layout.c          \
71
69
        panel-modules.c         \
72
 
        panel-applet-info.c     \
73
 
        applet-signaler.c
 
70
        panel-object-loader.c   \
 
71
        panel-user-menu.c       \
 
72
        panel-applet-info.c
74
73
 
75
74
panel_headers =                 \
76
75
        panel-types.h           \
82
81
        panel-compatibility.h   \
83
82
        panel.h                 \
84
83
        applet.h                \
85
 
        drawer.h                \
86
84
        panel-util.h            \
87
85
        panel-properties-dialog.h       \
88
 
        panel-config-global.h   \
89
86
        panel-gconf.h           \
90
87
        panel-run-dialog.h      \
91
88
        menu.h                  \
99
96
        panel-stock-icons.h     \
100
97
        panel-action-button.h   \
101
98
        panel-menu-bar.h        \
 
99
        panel-menu-bar-object.h \
102
100
        panel-menu-button.h     \
103
101
        panel-menu-items.h      \
104
102
        panel-separator.h       \
111
109
        panel-multiscreen.h     \
112
110
        panel-a11y.h            \
113
111
        panel-bindings.h        \
114
 
        panel-profile.h         \
115
112
        panel-enums.h           \
 
113
        panel-enums-gsettings.h \
116
114
        panel-force-quit.h      \
117
115
        panel-lockdown.h        \
118
116
        panel-addto.h           \
119
117
        panel-ditem-editor.h    \
120
118
        panel-icon-names.h      \
 
119
        panel-layout.h          \
121
120
        panel-modules.h         \
122
 
        panel-applet-info.h     \
123
 
        applet-signaler.h
 
121
        panel-object-loader.h   \
 
122
        panel-schemas.h         \
 
123
        panel-user-menu.h       \
 
124
        panel-applet-info.h
124
125
 
125
126
gnome_panel_SOURCES =                   \
126
127
        $(panel_sources)                \
128
129
 
129
130
gnome_panel_CPPFLAGS =                          \
130
131
        $(AM_CPPFLAGS)                          \
 
132
        $(TELEPATHY_GLIB_CFLAGS)                \
131
133
        $(XRANDR_CFLAGS)                        \
132
134
        -DPANEL_MODULES_DIR=\"$(modulesdir)\"   \
133
 
        -DGMENU_I_KNOW_THIS_IS_UNSTABLE
 
135
        -DGMENU_I_KNOW_THIS_IS_UNSTABLE         \
 
136
        -DGNOME_DESKTOP_USE_UNSTABLE_API
134
137
 
135
138
gnome_panel_LDADD =             \
136
139
        $(top_builddir)/gnome-panel/libegg/libegg.la                                    \
137
140
        $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la  \
138
141
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la                      \
139
142
        $(PANEL_LIBS)                                                                   \
 
143
        $(TELEPATHY_GLIB_LIBS)                                                          \
140
144
        $(XRANDR_LIBS)                                                                  \
141
145
        $(X_LIBS)
142
146
 
169
173
panel_test_applets_LDADD =              \
170
174
        $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private-mini.la     \
171
175
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la                              \
172
 
        $(PANEL_LIBS)   \
173
 
        $(XRANDR_LIBS)
 
176
        $(PANEL_LIBS)
174
177
 
175
178
panel_test_applets_LDFLAGS = -export-dynamic
176
179
 
181
184
                < $< > $@
182
185
        $(AM_V_at)chmod a+x $@
183
186
 
184
 
panel_enum_headers =                                    \
185
 
        $(top_srcdir)/gnome-panel/panel-enums.h         \
 
187
panel_enum_headers =                                            \
 
188
        $(top_srcdir)/gnome-panel/panel-enums.h                 \
 
189
        $(top_srcdir)/gnome-panel/panel-enums-gsettings.h       \
186
190
        $(top_srcdir)/gnome-panel/panel-types.h
187
191
 
188
192
panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL)
226
230
        panel-marshal.c                 \
227
231
        panel-marshal.h
228
232
 
229
 
rcdir = $(datadir)
230
 
rc_DATA = gnome-panelrc
231
 
 
232
233
uidir = $(datadir)/gnome-panel/ui
233
234
ui_DATA =                                       \
234
235
        panel-properties-dialog.ui              \
241
242
 
242
243
@INTLTOOL_DESKTOP_RULE@
243
244
 
244
 
entriesdir       = $(GCONF_SCHEMA_FILE_DIR)
245
 
entries_DATA     = panel-default-setup.entries
246
 
 
247
 
schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
248
 
schemas_in_files =                              \
249
 
        panel-global.schemas.in                 \
250
 
        panel-general.schemas.in                \
251
 
        panel-toplevel.schemas.in               \
252
 
        panel-object.schemas.in
253
 
schemas_DATA     = panel-compatibility.schemas $(schemas_in_files:.schemas.in=.schemas)
254
 
 
255
 
@INTLTOOL_SCHEMAS_RULE@
256
 
 
257
 
if GCONF_SCHEMAS_INSTALL
258
 
install-data-local:
259
 
        if test -z "$(DESTDIR)" ; then \
260
 
                for p in $(schemas_DATA) ; do \
261
 
                        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \
262
 
                done ; \
263
 
                $(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries ; \
264
 
                $(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries /apps/panel ; \
265
 
        fi
266
 
uninstall-local:
267
 
        for p in $(schema_DATA) ; do \
268
 
                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/ngome-panel/$$p ; \
269
 
        done
270
 
endif
271
 
 
272
245
EXTRA_DIST =                                    \
273
246
        $(ui_DATA)                              \
274
247
        nothing.cP                              \
275
248
        nothing.h                               \
276
 
        $(schemas_in_files)                     \
277
 
        panel-compatibility.schemas             \
278
249
        panel-marshal.list                      \
279
 
        gnome-panelrc                           \
280
 
        $(entries_DATA)                         \
281
250
        $(desktop_in_files)                     \
282
251
        gnome-panel-add.in
283
252
 
284
253
CLEANFILES = \
285
254
        $(BUILT_SOURCES) \
286
 
        $(schemas_in_files:.schemas.in=.schemas) \
287
255
        $(sys_DATA) \
288
256
        $(desktop_DATA) \
289
257
        gnome-panel-add