← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/90_fix_linking_DSO_link.patch/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:
.pc/90_fix_linking_DSO_link.patch/gnome-panel/Makefile.am
1
 
SUBDIRS = libegg libpanel-applet-private libpanel-util
2
 
 
3
 
bin_PROGRAMS = \
4
 
        gnome-panel                     \
5
 
        gnome-desktop-item-edit         \
6
 
        panel-test-applets
7
 
libexec_SCRIPTS = gnome-panel-add
8
 
 
9
 
AM_CPPFLAGS =                                                   \
10
 
        $(PANEL_CFLAGS)                                         \
11
 
        -I.                                                     \
12
 
        -I$(srcdir)                                             \
13
 
        -I$(top_builddir)/gnome-panel                           \
14
 
        -I$(top_builddir)/gnome-panel/libpanel-util             \
15
 
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
16
 
        -DBUILDERDIR=\""$(uidir)"\"                             \
17
 
        -DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\"          \
18
 
        $(DISABLE_DEPRECATED_CFLAGS)
19
 
 
20
 
AM_CFLAGS = $(WARN_CFLAGS)
21
 
 
22
 
panel_sources =                 \
23
 
        panel-typebuiltins.c    \
24
 
        panel-typebuiltins.h    \
25
 
        panel-marshal.c         \
26
 
        panel-marshal.h         \
27
 
        main.c                  \
28
 
        panel-widget.c          \
29
 
        button-widget.c         \
30
 
        xstuff.c                \
31
 
        panel-session.c         \
32
 
        panel-compatibility.c   \
33
 
        panel.c                 \
34
 
        applet.c                \
35
 
        drawer.c                \
36
 
        panel-config-global.c   \
37
 
        panel-util.c            \
38
 
        panel-gconf.c           \
39
 
        panel-properties-dialog.c       \
40
 
        panel-run-dialog.c      \
41
 
        menu.c                  \
42
 
        panel-context-menu.c    \
43
 
        launcher.c              \
44
 
        panel-applet-frame.c    \
45
 
        panel-applets-manager.c \
46
 
        panel-shell.c           \
47
 
        panel-background.c      \
48
 
        panel-background-monitor.c      \
49
 
        panel-stock-icons.c     \
50
 
        panel-action-button.c   \
51
 
        panel-menu-bar.c        \
52
 
        panel-menu-button.c     \
53
 
        panel-menu-items.c      \
54
 
        panel-separator.c       \
55
 
        panel-recent.c          \
56
 
        panel-action-protocol.c \
57
 
        panel-toplevel.c        \
58
 
        panel-struts.c          \
59
 
        panel-frame.c           \
60
 
        panel-xutils.c          \
61
 
        panel-multiscreen.c     \
62
 
        panel-a11y.c            \
63
 
        panel-bindings.c        \
64
 
        panel-profile.c         \
65
 
        panel-force-quit.c      \
66
 
        panel-lockdown.c        \
67
 
        panel-addto.c           \
68
 
        panel-ditem-editor.c    \
69
 
        panel-modules.c         \
70
 
        panel-applet-info.c     \
71
 
        applet-signaler.c
72
 
 
73
 
panel_headers =                 \
74
 
        panel-types.h           \
75
 
        panel-widget.h          \
76
 
        panel-globals.h         \
77
 
        button-widget.h         \
78
 
        xstuff.h                \
79
 
        panel-session.h         \
80
 
        panel-compatibility.h   \
81
 
        panel.h                 \
82
 
        applet.h                \
83
 
        drawer.h                \
84
 
        panel-util.h            \
85
 
        panel-properties-dialog.h       \
86
 
        panel-config-global.h   \
87
 
        panel-gconf.h           \
88
 
        panel-run-dialog.h      \
89
 
        menu.h                  \
90
 
        panel-context-menu.h    \
91
 
        launcher.h              \
92
 
        panel-applet-frame.h    \
93
 
        panel-applets-manager.h \
94
 
        panel-shell.h           \
95
 
        panel-background.h      \
96
 
        panel-background-monitor.h      \
97
 
        panel-stock-icons.h     \
98
 
        panel-action-button.h   \
99
 
        panel-menu-bar.h        \
100
 
        panel-menu-button.h     \
101
 
        panel-menu-items.h      \
102
 
        panel-separator.h       \
103
 
        panel-recent.h          \
104
 
        panel-action-protocol.h \
105
 
        panel-toplevel.h        \
106
 
        panel-struts.h          \
107
 
        panel-frame.h           \
108
 
        panel-xutils.h          \
109
 
        panel-multiscreen.h     \
110
 
        panel-a11y.h            \
111
 
        panel-bindings.h        \
112
 
        panel-profile.h         \
113
 
        panel-enums.h           \
114
 
        panel-force-quit.h      \
115
 
        panel-lockdown.h        \
116
 
        panel-addto.h           \
117
 
        panel-ditem-editor.h    \
118
 
        panel-icon-names.h      \
119
 
        panel-modules.h         \
120
 
        panel-applet-info.h     \
121
 
        applet-signaler.h
122
 
 
123
 
gnome_panel_SOURCES =                   \
124
 
        $(panel_sources)                \
125
 
        $(panel_headers)
126
 
 
127
 
gnome_panel_CPPFLAGS =                          \
128
 
        $(AM_CPPFLAGS)                          \
129
 
        $(XRANDR_CFLAGS)                        \
130
 
        -DPANEL_MODULES_DIR=\"$(modulesdir)\"   \
131
 
        -DGMENU_I_KNOW_THIS_IS_UNSTABLE
132
 
 
133
 
gnome_panel_LDADD =             \
134
 
        $(top_builddir)/gnome-panel/libegg/libegg.la                                    \
135
 
        $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la  \
136
 
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la                      \
137
 
        $(PANEL_LIBS)                                                                   \
138
 
        $(XRANDR_LIBS)                                                                  \
139
 
        $(X_LIBS)
140
 
 
141
 
gnome_panel_LDFLAGS = -export-dynamic
142
 
 
143
 
gnome_desktop_item_edit_SOURCES =       \
144
 
        gnome-desktop-item-edit.c       \
145
 
        panel-ditem-editor.c            \
146
 
        panel-marshal.c                 \
147
 
        panel-util.c                    \
148
 
        xstuff.c
149
 
 
150
 
gnome_desktop_item_edit_LDADD =         \
151
 
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la      \
152
 
        $(PANEL_LIBS)                                                   \
153
 
        $(X_LIBS)
154
 
 
155
 
panel_test_applets_SOURCES =            \
156
 
        panel-modules.c                 \
157
 
        panel-applet-info.c             \
158
 
        panel-applets-manager.c         \
159
 
        panel-marshal.c                 \
160
 
        panel-test-applets.c
161
 
 
162
 
panel_test_applets_CPPFLAGS =                   \
163
 
        $(AM_CPPFLAGS)                          \
164
 
        -DPANEL_MODULES_DIR=\"$(modulesdir)\"   \
165
 
        -DPANEL_APPLETS_DIR=\"$(appletsdir)\"
166
 
 
167
 
panel_test_applets_LDADD =              \
168
 
        $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private-mini.la     \
169
 
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la                              \
170
 
        $(PANEL_LIBS)
171
 
 
172
 
panel_test_applets_LDFLAGS = -export-dynamic
173
 
 
174
 
gnome-panel-add: gnome-panel-add.in Makefile
175
 
        $(AM_V_GEN)sed                                          \
176
 
                -e s!\@PYTHON\@!@PYTHON@!                       \
177
 
                -e s!\@PANEL_APPLETS_DIR\@!$(appletsdir)!       \
178
 
                < $< > $@
179
 
        $(AM_V_at)chmod a+x $@
180
 
 
181
 
panel_enum_headers =                                    \
182
 
        $(top_srcdir)/gnome-panel/panel-enums.h         \
183
 
        $(top_srcdir)/gnome-panel/panel-types.h
184
 
 
185
 
panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL)
186
 
        $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
187
 
 
188
 
panel-marshal.c: panel-marshal.list $(GLIB_GENMARSHAL)
189
 
        $(AM_V_GEN)echo "#include \"panel-marshal.h\"" > $@ && \
190
 
        $(GLIB_GENMARSHAL) $< --body --prefix=panel_marshal >> $@
191
 
 
192
 
panel-typebuiltins.c: @REBUILD@ $(panel_enum_headers)
193
 
        $(AM_V_GEN)glib-mkenums \
194
 
                        --fhead "#include <glib-object.h>\n" \
195
 
                        --fhead "#include \"panel-typebuiltins.h\"\n\n" \
196
 
                        --fprod "\n/* enumerations from \"@filename@\" */" \
197
 
                        --fprod "\n#include \"@filename@\"\n" \
198
 
                        --vhead "static const GEnumValue _@enum_name@_values[] = {" \
199
 
                        --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
200
 
                        --vtail "  { 0, NULL, NULL }\n};\n\n" \
201
 
                        --vtail "GType\n@enum_name@_get_type (void)\n{\n" \
202
 
                        --vtail "  static GType type = 0;\n\n" \
203
 
                        --vtail "  if (!type)\n" \
204
 
                        --vtail "    type = g_enum_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
205
 
                        --vtail "  return type;\n}\n\n" \
206
 
                $(panel_enum_headers) > $@
207
 
 
208
 
panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
209
 
        $(AM_V_GEN)glib-mkenums \
210
 
                        --fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
211
 
                        --fhead "#define __PANEL_TYPEBUILTINS_H__ 1\n\n" \
212
 
                        --fhead "G_BEGIN_DECLS\n\n" \
213
 
                        --ftail "G_END_DECLS\n\n" \
214
 
                        --ftail "#endif /* __PANEL_TYPEBUILTINS_H__ */\n" \
215
 
                        --fprod "\n/* --- @filename@ --- */" \
216
 
                        --eprod "#define PANEL_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
217
 
                        --eprod "GType @enum_name@_get_type (void);\n" \
218
 
                $(panel_enum_headers) > $@
219
 
 
220
 
BUILT_SOURCES = \
221
 
        panel-typebuiltins.c            \
222
 
        panel-typebuiltins.h            \
223
 
        panel-marshal.c                 \
224
 
        panel-marshal.h
225
 
 
226
 
rcdir = $(datadir)
227
 
rc_DATA = gnome-panelrc
228
 
 
229
 
uidir = $(datadir)/gnome-panel/ui
230
 
ui_DATA =                                       \
231
 
        panel-properties-dialog.ui              \
232
 
        panel-run-dialog.ui                     \
233
 
        panel-test-applets.ui
234
 
 
235
 
desktopdir = $(datadir)/applications
236
 
desktop_in_files = gnome-panel.desktop.in
237
 
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
238
 
 
239
 
@INTLTOOL_DESKTOP_RULE@
240
 
 
241
 
entriesdir       = $(GCONF_SCHEMA_FILE_DIR)
242
 
entries_DATA     = panel-default-setup.entries
243
 
 
244
 
schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
245
 
schemas_in_files =                              \
246
 
        panel-global.schemas.in                 \
247
 
        panel-general.schemas.in                \
248
 
        panel-toplevel.schemas.in               \
249
 
        panel-object.schemas.in
250
 
schemas_DATA     = panel-compatibility.schemas $(schemas_in_files:.schemas.in=.schemas)
251
 
 
252
 
@INTLTOOL_SCHEMAS_RULE@
253
 
 
254
 
if GCONF_SCHEMAS_INSTALL
255
 
install-data-local:
256
 
        if test -z "$(DESTDIR)" ; then \
257
 
                for p in $(schemas_DATA) ; do \
258
 
                        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \
259
 
                done ; \
260
 
                $(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries ; \
261
 
                $(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries /apps/panel ; \
262
 
        fi
263
 
uninstall-local:
264
 
        for p in $(schema_DATA) ; do \
265
 
                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/ngome-panel/$$p ; \
266
 
        done
267
 
endif
268
 
 
269
 
EXTRA_DIST =                                    \
270
 
        $(ui_DATA)                              \
271
 
        nothing.cP                              \
272
 
        nothing.h                               \
273
 
        $(schemas_in_files)                     \
274
 
        panel-compatibility.schemas             \
275
 
        panel-marshal.list                      \
276
 
        gnome-panelrc                           \
277
 
        $(entries_DATA)                         \
278
 
        $(desktop_in_files)                     \
279
 
        gnome-panel-add.in
280
 
 
281
 
CLEANFILES = \
282
 
        $(BUILT_SOURCES) \
283
 
        $(schemas_in_files:.schemas.in=.schemas) \
284
 
        $(sys_DATA) \
285
 
        $(desktop_DATA) \
286
 
        gnome-panel-add
287
 
 
288
 
dist-hook:
289
 
        cd $(distdir) ; rm -f $(CLEANFILES)
290
 
 
291
 
-include $(top_srcdir)/git.mk