← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libpanel-applet/Makefile.in

  • 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:
libpanel-applet/Makefile.in
38
38
build_triplet = @build@
39
39
host_triplet = @host@
40
40
noinst_PROGRAMS = test-dbus-applet$(EXEEXT)
41
 
@HAVE_INTROSPECTION_TRUE@am__append_1 = PanelApplet-3.0.gir
 
41
@HAVE_INTROSPECTION_TRUE@am__append_1 = PanelApplet-4.0.gir
42
42
@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA)
43
43
subdir = libpanel-applet
44
44
DIST_COMMON = $(libpanel_appletinclude_HEADERS) $(srcdir)/Makefile.am \
45
45
        $(srcdir)/Makefile.in \
46
 
        $(srcdir)/libpanelapplet-3.0-uninstalled.pc.in \
47
 
        $(srcdir)/libpanelapplet-3.0.pc.in TODO
 
46
        $(srcdir)/libpanelapplet-4.0-uninstalled.pc.in \
 
47
        $(srcdir)/libpanelapplet-4.0.pc.in TODO
48
48
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
49
49
am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
50
50
        $(top_srcdir)/m4/gnome-doc-utils.m4 \
56
56
        $(ACLOCAL_M4)
57
57
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
58
58
CONFIG_HEADER = $(top_builddir)/config.h
59
 
CONFIG_CLEAN_FILES = libpanelapplet-3.0.pc \
60
 
        libpanelapplet-3.0-uninstalled.pc
 
59
CONFIG_CLEAN_FILES = libpanelapplet-4.0.pc \
 
60
        libpanelapplet-4.0-uninstalled.pc
61
61
CONFIG_CLEAN_VPATH_FILES =
62
62
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
63
63
am__vpath_adj = case $$p in \
85
85
        "$(DESTDIR)$(libpanel_appletincludedir)"
86
86
LTLIBRARIES = $(lib_LTLIBRARIES)
87
87
am__DEPENDENCIES_1 =
88
 
libpanel_applet_3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 
88
libpanel_applet_4_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
89
89
        $(am__DEPENDENCIES_1)
90
90
am__objects_1 = panel-applet-enums.lo panel-applet-marshal.lo
91
 
am_libpanel_applet_3_la_OBJECTS = $(am__objects_1) panel-applet.lo \
92
 
        panel-applet-factory.lo panel-applet-gconf.lo
93
 
libpanel_applet_3_la_OBJECTS = $(am_libpanel_applet_3_la_OBJECTS)
 
91
am_libpanel_applet_4_la_OBJECTS = $(am__objects_1) panel-applet.lo \
 
92
        panel-applet-factory.lo panel-applet-bindings.lo \
 
93
        panel-applet-gconf.lo
 
94
libpanel_applet_4_la_OBJECTS = $(am_libpanel_applet_4_la_OBJECTS)
94
95
AM_V_lt = $(am__v_lt_$(V))
95
96
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
96
97
am__v_lt_0 = --silent
97
 
libpanel_applet_3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 
98
libpanel_applet_4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
98
99
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
99
 
        $(AM_CFLAGS) $(CFLAGS) $(libpanel_applet_3_la_LDFLAGS) \
 
100
        $(AM_CFLAGS) $(CFLAGS) $(libpanel_applet_4_la_LDFLAGS) \
100
101
        $(LDFLAGS) -o $@
101
102
PROGRAMS = $(noinst_PROGRAMS)
102
103
test_dbus_applet_SOURCES = test-dbus-applet.c
103
104
test_dbus_applet_OBJECTS = test-dbus-applet.$(OBJEXT)
104
105
test_dbus_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
105
 
        libpanel-applet-3.la
 
106
        libpanel-applet-4.la
106
107
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
107
108
depcomp = $(SHELL) $(top_srcdir)/depcomp
108
109
am__depfiles_maybe = depfiles
129
130
AM_V_GEN = $(am__v_GEN_$(V))
130
131
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
131
132
am__v_GEN_0 = @echo "  GEN   " $@;
132
 
SOURCES = $(libpanel_applet_3_la_SOURCES) test-dbus-applet.c
133
 
DIST_SOURCES = $(libpanel_applet_3_la_SOURCES) test-dbus-applet.c
 
133
SOURCES = $(libpanel_applet_4_la_SOURCES) test-dbus-applet.c
 
134
DIST_SOURCES = $(libpanel_applet_4_la_SOURCES) test-dbus-applet.c
134
135
DATA = $(gir_DATA) $(noinst_DATA) $(pkgconfig_DATA) $(typelib_DATA)
135
136
HEADERS = $(libpanel_appletinclude_HEADERS)
136
137
ETAGS = etags
147
148
AUTOHEADER = @AUTOHEADER@
148
149
AUTOMAKE = @AUTOMAKE@
149
150
AWK = @AWK@
150
 
BONOBO_ACT_IDLDIR = @BONOBO_ACT_IDLDIR@
151
 
BONOBO_CFLAGS = @BONOBO_CFLAGS@
152
 
BONOBO_IDLDIR = @BONOBO_IDLDIR@
153
 
BONOBO_LIBS = @BONOBO_LIBS@
154
151
CATALOGS = @CATALOGS@
155
152
CATOBJEXT = @CATOBJEXT@
156
153
CC = @CC@
186
183
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
187
184
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
188
185
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
189
 
GIO_QUERYMODULES = @GIO_QUERYMODULES@
 
186
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
190
187
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
191
188
GMOFILES = @GMOFILES@
192
189
GMSGFMT = @GMSGFMT@
193
190
GREP = @GREP@
 
191
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
194
192
GTKDOC_CHECK = @GTKDOC_CHECK@
195
193
GTKDOC_MKPDF = @GTKDOC_MKPDF@
196
194
GTKDOC_REBASE = @GTKDOC_REBASE@
218
216
LD = @LD@
219
217
LDFLAGS = @LDFLAGS@
220
218
LIBOBJS = @LIBOBJS@
221
 
LIBPANEL_APPLET_BONOBO_CFLAGS = @LIBPANEL_APPLET_BONOBO_CFLAGS@
222
 
LIBPANEL_APPLET_BONOBO_LIBS = @LIBPANEL_APPLET_BONOBO_LIBS@
 
219
LIBPANEL_APPLET_API_VERSION = @LIBPANEL_APPLET_API_VERSION@
223
220
LIBPANEL_APPLET_CFLAGS = @LIBPANEL_APPLET_CFLAGS@
224
221
LIBPANEL_APPLET_LIBS = @LIBPANEL_APPLET_LIBS@
225
222
LIBS = @LIBS@
226
223
LIBTOOL = @LIBTOOL@
227
 
LIB_PANEL_APPLET_BONOBO_LT_VERSION = @LIB_PANEL_APPLET_BONOBO_LT_VERSION@
228
224
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
229
225
LIPO = @LIPO@
230
226
LN_S = @LN_S@
245
241
OBJDUMP = @OBJDUMP@
246
242
OBJEXT = @OBJEXT@
247
243
OMF_DIR = @OMF_DIR@
248
 
ORBIT_IDL = @ORBIT_IDL@
249
244
OTOOL = @OTOOL@
250
245
OTOOL64 = @OTOOL64@
251
246
PACKAGE = @PACKAGE@
258
253
PANEL_CFLAGS = @PANEL_CFLAGS@
259
254
PANEL_INTLTOOL_PANEL_APPLET_RULE = @PANEL_INTLTOOL_PANEL_APPLET_RULE@
260
255
PANEL_LIBS = @PANEL_LIBS@
261
 
PANEL_MODULE_BONOBO_CFLAGS = @PANEL_MODULE_BONOBO_CFLAGS@
262
 
PANEL_MODULE_BONOBO_LIBS = @PANEL_MODULE_BONOBO_LIBS@
263
256
PATH_SEPARATOR = @PATH_SEPARATOR@
264
257
PERL = @PERL@
265
258
PKG_CONFIG = @PKG_CONFIG@
280
273
SET_MAKE = @SET_MAKE@
281
274
SHELL = @SHELL@
282
275
STRIP = @STRIP@
 
276
TELEPATHY_GLIB_CFLAGS = @TELEPATHY_GLIB_CFLAGS@
 
277
TELEPATHY_GLIB_LIBS = @TELEPATHY_GLIB_LIBS@
283
278
TZ_CFLAGS = @TZ_CFLAGS@
284
279
TZ_LIBS = @TZ_LIBS@
285
280
USE_NLS = @USE_NLS@
307
302
am__tar = @am__tar@
308
303
am__untar = @am__untar@
309
304
appletsdir = @appletsdir@
 
305
appletsdir_pkgconfig = @appletsdir_pkgconfig@
310
306
bindir = @bindir@
311
307
build = @build@
312
308
build_alias = @build_alias@
319
315
docdir = @docdir@
320
316
dvidir = @dvidir@
321
317
exec_prefix = @exec_prefix@
 
318
gsettingsschemadir = @gsettingsschemadir@
322
319
host = @host@
323
320
host_alias = @host_alias@
324
321
host_cpu = @host_cpu@
353
350
top_build_prefix = @top_build_prefix@
354
351
top_builddir = @top_builddir@
355
352
top_srcdir = @top_srcdir@
356
 
lib_LTLIBRARIES = libpanel-applet-3.la
 
353
lib_LTLIBRARIES = libpanel-applet-4.la
357
354
AM_CPPFLAGS = \
358
355
        $(LIBPANEL_APPLET_CFLAGS)                               \
359
356
        -I$(top_builddir)/libpanel-applet                       \
361
358
        $(DISABLE_DEPRECATED_CFLAGS)
362
359
 
363
360
AM_CFLAGS = $(WARN_CFLAGS)
364
 
libpanel_appletincludedir = $(includedir)/gnome-panel-3.0/libpanel-applet
 
361
libpanel_appletincludedir = $(includedir)/gnome-panel-4.0/libpanel-applet
365
362
libpanel_appletinclude_HEADERS = \
366
363
        panel-applet.h                  \
367
364
        panel-applet-gconf.h            \
368
365
        panel-applet-enums.h
369
366
 
370
 
libpanel_applet_3_la_SOURCES = \
 
367
libpanel_applet_4_la_SOURCES = \
371
368
        $(BUILT_SOURCES)                \
372
369
        panel-applet.h                  \
373
370
        panel-applet.c                  \
374
371
        panel-applet-factory.h          \
375
372
        panel-applet-factory.c          \
 
373
        panel-applet-bindings.h         \
 
374
        panel-applet-bindings.c         \
376
375
        panel-applet-gconf.c            \
377
376
        panel-applet-gconf.h
378
377
 
379
 
libpanel_applet_3_la_LIBADD = \
 
378
libpanel_applet_4_la_LIBADD = \
380
379
        $(LIBPANEL_APPLET_LIBS) \
381
380
        $(X_LIBS)
382
381
 
383
 
libpanel_applet_3_la_LDFLAGS = \
 
382
libpanel_applet_4_la_LDFLAGS = \
384
383
        -version-info $(LIB_PANEL_APPLET_LT_VERSION)    \
385
384
        -no-undefined
386
385
 
387
386
test_dbus_applet_LDADD = \
388
387
        $(LIBPANEL_APPLET_LIBS) \
389
 
        libpanel-applet-3.la
 
388
        libpanel-applet-4.la
390
389
 
391
390
panel_applet_enum_headers = $(top_srcdir)/libpanel-applet/panel-applet.h
392
391
BUILT_SOURCES = \
396
395
        panel-applet-marshal.h
397
396
 
398
397
pkgconfigdir = $(libdir)/pkgconfig
399
 
pkgconfig_DATA = libpanelapplet-3.0.pc
 
398
pkgconfig_DATA = libpanelapplet-4.0.pc
400
399
appletdir = $(datadir)/gnome-panel/applets
401
400
applet_in_files = org.gnome.panel.TestApplet.panel-applet.in
402
401
noinst_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
403
402
EXTRA_DIST = \
404
403
        org.gnome.panel.TestApplet.panel-applet.in      \
405
404
        panel-applet-marshal.list                       \
406
 
        libpanelapplet-3.0.pc.in                        \
407
 
        libpanelapplet-3.0-uninstalled.pc.in
 
405
        libpanelapplet-4.0.pc.in                        \
 
406
        libpanelapplet-4.0-uninstalled.pc.in
408
407
 
409
408
CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA) $(am__append_2)
410
409
INTROSPECTION_GIRS = $(am__append_1)
420
419
@HAVE_INTROSPECTION_TRUE@       panel-applet-enums.c    \
421
420
@HAVE_INTROSPECTION_TRUE@       panel-applet-enums.h
422
421
 
423
 
@HAVE_INTROSPECTION_TRUE@PanelApplet_3_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 GConf-2.0
424
 
@HAVE_INTROSPECTION_TRUE@PanelApplet_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
425
 
@HAVE_INTROSPECTION_TRUE@PanelApplet_3_0_gir_LIBS = libpanel-applet-3.la
426
 
@HAVE_INTROSPECTION_TRUE@PanelApplet_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix $(builddir)/,$(built_introspection_sources))
427
 
# When requiring gobject-introspection 0.9.5, use this:
428
 
#PanelApplet_3_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel --pkg-export=libpanelapplet-3.0
429
 
@HAVE_INTROSPECTION_TRUE@PanelApplet_3_0_gir_SCANNERFLAGS = --strip-prefix=Panel --pkg-export=libpanelapplet-3.0
 
422
@HAVE_INTROSPECTION_TRUE@PanelApplet_4_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GConf-2.0
 
423
@HAVE_INTROSPECTION_TRUE@PanelApplet_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
 
424
@HAVE_INTROSPECTION_TRUE@PanelApplet_4_0_gir_LIBS = libpanel-applet-4.la
 
425
@HAVE_INTROSPECTION_TRUE@PanelApplet_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix $(builddir)/,$(built_introspection_sources))
 
426
@HAVE_INTROSPECTION_TRUE@PanelApplet_4_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel --pkg-export=libpanelapplet-4.0
430
427
@HAVE_INTROSPECTION_TRUE@girdir = $(INTROSPECTION_GIRDIR)
431
428
@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
432
429
@HAVE_INTROSPECTION_TRUE@typelibdir = $(INTROSPECTION_TYPELIBDIR)
466
463
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
467
464
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
468
465
$(am__aclocal_m4_deps):
469
 
libpanelapplet-3.0.pc: $(top_builddir)/config.status $(srcdir)/libpanelapplet-3.0.pc.in
 
466
libpanelapplet-4.0.pc: $(top_builddir)/config.status $(srcdir)/libpanelapplet-4.0.pc.in
470
467
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
471
 
libpanelapplet-3.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libpanelapplet-3.0-uninstalled.pc.in
 
468
libpanelapplet-4.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libpanelapplet-4.0-uninstalled.pc.in
472
469
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
473
470
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
474
471
        @$(NORMAL_INSTALL)
501
498
          echo "rm -f \"$${dir}/so_locations\""; \
502
499
          rm -f "$${dir}/so_locations"; \
503
500
        done
504
 
libpanel-applet-3.la: $(libpanel_applet_3_la_OBJECTS) $(libpanel_applet_3_la_DEPENDENCIES) 
505
 
        $(AM_V_CCLD)$(libpanel_applet_3_la_LINK) -rpath $(libdir) $(libpanel_applet_3_la_OBJECTS) $(libpanel_applet_3_la_LIBADD) $(LIBS)
 
501
libpanel-applet-4.la: $(libpanel_applet_4_la_OBJECTS) $(libpanel_applet_4_la_DEPENDENCIES) 
 
502
        $(AM_V_CCLD)$(libpanel_applet_4_la_LINK) -rpath $(libdir) $(libpanel_applet_4_la_OBJECTS) $(libpanel_applet_4_la_LIBADD) $(LIBS)
506
503
 
507
504
clean-noinstPROGRAMS:
508
505
        @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
522
519
distclean-compile:
523
520
        -rm -f *.tab.c
524
521
 
 
522
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-applet-bindings.Plo@am__quote@
525
523
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-applet-enums.Plo@am__quote@
526
524
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-applet-factory.Plo@am__quote@
527
525
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-applet-gconf.Plo@am__quote@
855
853
        uninstall-pkgconfigDATA uninstall-typelibDATA
856
854
 
857
855
 
858
 
$(libpanel_applet_3_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
 
856
$(libpanel_applet_4_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
859
857
 
860
858
panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
861
859
        $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
899
897
 
900
898
-include $(INTROSPECTION_MAKEFILE)
901
899
 
902
 
@HAVE_INTROSPECTION_TRUE@PanelApplet-3.0.gir: libpanel-applet-3.la
 
900
@HAVE_INTROSPECTION_TRUE@PanelApplet-4.0.gir: libpanel-applet-4.la
903
901
 
904
902
################################
905
903