← Back to branch summary

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

« back to all changes in this revision

Viewing changes to applets/notification_area/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:
applets/notification_area/Makefile.in
76
76
  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
77
77
am__installdirs = "$(DESTDIR)$(notification_area_appletlibdir)" \
78
78
        "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" \
79
 
        "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"
 
79
        "$(DESTDIR)$(servicedir)"
80
80
LTLIBRARIES = $(noinst_LTLIBRARIES) \
81
81
        $(notification_area_appletlib_LTLIBRARIES)
82
82
am__DEPENDENCIES_1 =
83
 
am__DEPENDENCIES_2 = ../../libpanel-applet/libpanel-applet-3.la \
 
83
am__DEPENDENCIES_2 = ../../libpanel-applet/libpanel-applet-4.la \
84
84
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
85
85
        $(am__DEPENDENCIES_1) libtray.la
86
86
@NOTIFICATION_AREA_INPROCESS_TRUE@libnotification_area_applet_la_DEPENDENCIES =  \
87
87
@NOTIFICATION_AREA_INPROCESS_TRUE@      $(am__DEPENDENCIES_2)
88
 
am__libnotification_area_applet_la_SOURCES_DIST = main.c
 
88
am__libnotification_area_applet_la_SOURCES_DIST = main.c main.h
89
89
am__objects_1 = libnotification_area_applet_la-main.lo
90
90
@NOTIFICATION_AREA_INPROCESS_TRUE@am_libnotification_area_applet_la_OBJECTS =  \
91
91
@NOTIFICATION_AREA_INPROCESS_TRUE@      $(am__objects_1)
106
106
        na-tray-child.lo na-tray-manager.lo
107
107
libtray_la_OBJECTS = $(am_libtray_la_OBJECTS)
108
108
PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
109
 
am__notification_area_applet_SOURCES_DIST = main.c
 
109
am__notification_area_applet_SOURCES_DIST = main.c main.h
110
110
am__objects_2 = notification_area_applet-main.$(OBJEXT)
111
111
@NOTIFICATION_AREA_INPROCESS_FALSE@am_notification_area_applet_OBJECTS =  \
112
112
@NOTIFICATION_AREA_INPROCESS_FALSE@     $(am__objects_2)
155
155
        $(libtray_la_SOURCES) \
156
156
        $(am__notification_area_applet_SOURCES_DIST) \
157
157
        $(testtray_SOURCES)
158
 
DATA = $(applet_DATA) $(service_DATA) $(ui_DATA)
 
158
DATA = $(applet_DATA) $(service_DATA)
159
159
ETAGS = etags
160
160
CTAGS = ctags
161
161
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
170
170
AUTOHEADER = @AUTOHEADER@
171
171
AUTOMAKE = @AUTOMAKE@
172
172
AWK = @AWK@
173
 
BONOBO_ACT_IDLDIR = @BONOBO_ACT_IDLDIR@
174
 
BONOBO_CFLAGS = @BONOBO_CFLAGS@
175
 
BONOBO_IDLDIR = @BONOBO_IDLDIR@
176
 
BONOBO_LIBS = @BONOBO_LIBS@
177
173
CATALOGS = @CATALOGS@
178
174
CATOBJEXT = @CATOBJEXT@
179
175
CC = @CC@
209
205
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
210
206
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
211
207
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
212
 
GIO_QUERYMODULES = @GIO_QUERYMODULES@
 
208
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
213
209
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
214
210
GMOFILES = @GMOFILES@
215
211
GMSGFMT = @GMSGFMT@
216
212
GREP = @GREP@
 
213
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
217
214
GTKDOC_CHECK = @GTKDOC_CHECK@
218
215
GTKDOC_MKPDF = @GTKDOC_MKPDF@
219
216
GTKDOC_REBASE = @GTKDOC_REBASE@
241
238
LD = @LD@
242
239
LDFLAGS = @LDFLAGS@
243
240
LIBOBJS = @LIBOBJS@
244
 
LIBPANEL_APPLET_BONOBO_CFLAGS = @LIBPANEL_APPLET_BONOBO_CFLAGS@
245
 
LIBPANEL_APPLET_BONOBO_LIBS = @LIBPANEL_APPLET_BONOBO_LIBS@
 
241
LIBPANEL_APPLET_API_VERSION = @LIBPANEL_APPLET_API_VERSION@
246
242
LIBPANEL_APPLET_CFLAGS = @LIBPANEL_APPLET_CFLAGS@
247
243
LIBPANEL_APPLET_LIBS = @LIBPANEL_APPLET_LIBS@
248
244
LIBS = @LIBS@
249
245
LIBTOOL = @LIBTOOL@
250
 
LIB_PANEL_APPLET_BONOBO_LT_VERSION = @LIB_PANEL_APPLET_BONOBO_LT_VERSION@
251
246
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
252
247
LIPO = @LIPO@
253
248
LN_S = @LN_S@
268
263
OBJDUMP = @OBJDUMP@
269
264
OBJEXT = @OBJEXT@
270
265
OMF_DIR = @OMF_DIR@
271
 
ORBIT_IDL = @ORBIT_IDL@
272
266
OTOOL = @OTOOL@
273
267
OTOOL64 = @OTOOL64@
274
268
PACKAGE = @PACKAGE@
281
275
PANEL_CFLAGS = @PANEL_CFLAGS@
282
276
PANEL_INTLTOOL_PANEL_APPLET_RULE = @PANEL_INTLTOOL_PANEL_APPLET_RULE@
283
277
PANEL_LIBS = @PANEL_LIBS@
284
 
PANEL_MODULE_BONOBO_CFLAGS = @PANEL_MODULE_BONOBO_CFLAGS@
285
 
PANEL_MODULE_BONOBO_LIBS = @PANEL_MODULE_BONOBO_LIBS@
286
278
PATH_SEPARATOR = @PATH_SEPARATOR@
287
279
PERL = @PERL@
288
280
PKG_CONFIG = @PKG_CONFIG@
303
295
SET_MAKE = @SET_MAKE@
304
296
SHELL = @SHELL@
305
297
STRIP = @STRIP@
 
298
TELEPATHY_GLIB_CFLAGS = @TELEPATHY_GLIB_CFLAGS@
 
299
TELEPATHY_GLIB_LIBS = @TELEPATHY_GLIB_LIBS@
306
300
TZ_CFLAGS = @TZ_CFLAGS@
307
301
TZ_LIBS = @TZ_LIBS@
308
302
USE_NLS = @USE_NLS@
330
324
am__tar = @am__tar@
331
325
am__untar = @am__untar@
332
326
appletsdir = @appletsdir@
 
327
appletsdir_pkgconfig = @appletsdir_pkgconfig@
333
328
bindir = @bindir@
334
329
build = @build@
335
330
build_alias = @build_alias@
342
337
docdir = @docdir@
343
338
dvidir = @dvidir@
344
339
exec_prefix = @exec_prefix@
 
340
gsettingsschemadir = @gsettingsschemadir@
345
341
host = @host@
346
342
host_alias = @host_alias@
347
343
host_cpu = @host_cpu@
401
397
        na-tray-manager.c       \
402
398
        na-tray-manager.h
403
399
 
404
 
NOTIFICATION_AREA_SOURCES = main.c
 
400
NOTIFICATION_AREA_SOURCES = main.c main.h
405
401
NOTIFICATION_AREA_LDADD = \
406
 
        ../../libpanel-applet/libpanel-applet-3.la      \
 
402
        ../../libpanel-applet/libpanel-applet-4.la      \
407
403
        $(X_LIBS)                                       \
408
404
        $(NOTIFICATION_AREA_LIBS)                       \
409
405
        $(LIBPANEL_APPLET_LIBS)                         \
418
414
@NOTIFICATION_AREA_INPROCESS_FALSE@APPLET_IN_PROCESS = false
419
415
@NOTIFICATION_AREA_INPROCESS_TRUE@APPLET_IN_PROCESS = true
420
416
@NOTIFICATION_AREA_INPROCESS_FALSE@APPLET_LOCATION = $(libexecdir)/notification-area-applet
421
 
@NOTIFICATION_AREA_INPROCESS_TRUE@APPLET_LOCATION = $(pkglibdir)/libnotification-area-applet.so
422
 
@NOTIFICATION_AREA_INPROCESS_TRUE@notification_area_appletlibdir = $(pkglibdir)
 
417
@NOTIFICATION_AREA_INPROCESS_TRUE@APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libnotification-area-applet.so
 
418
@NOTIFICATION_AREA_INPROCESS_TRUE@notification_area_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
423
419
@NOTIFICATION_AREA_INPROCESS_TRUE@notification_area_appletlib_LTLIBRARIES = libnotification-area-applet.la
424
420
@NOTIFICATION_AREA_INPROCESS_TRUE@libnotification_area_applet_la_SOURCES = $(NOTIFICATION_AREA_SOURCES)
425
421
@NOTIFICATION_AREA_INPROCESS_TRUE@libnotification_area_applet_la_LIBADD = $(NOTIFICATION_AREA_LDADD)
429
425
@NOTIFICATION_AREA_INPROCESS_FALSE@notification_area_applet_LDADD = $(NOTIFICATION_AREA_LDADD)
430
426
@NOTIFICATION_AREA_INPROCESS_FALSE@notification_area_applet_CFLAGS = $(AM_CFLAGS)
431
427
BUILT_SOURCES = na-marshal.c na-marshal.h
432
 
appletdir = $(datadir)/gnome-panel/applets
 
428
appletdir = $(appletsdir)
433
429
applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
434
430
applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
435
431
@NOTIFICATION_AREA_INPROCESS_FALSE@servicedir = $(datadir)/dbus-1/services
436
432
@NOTIFICATION_AREA_INPROCESS_FALSE@service_in_files = org.gnome.panel.applet.NotificationAreaAppletFactory.service.in
437
433
@NOTIFICATION_AREA_INPROCESS_FALSE@service_DATA = $(service_in_files:.service.in=.service)
438
 
uidir = $(datadir)/gnome-panel/ui
439
 
ui_DATA = notification-area-menu.xml
440
434
EXTRA_DIST = \
441
435
        org.gnome.panel.NotificationAreaApplet.panel-applet.in.in       \
442
436
        $(ui_DATA)                                                      \
694
688
        test -n "$$files" || exit 0; \
695
689
        echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \
696
690
        cd "$(DESTDIR)$(servicedir)" && rm -f $$files
697
 
install-uiDATA: $(ui_DATA)
698
 
        @$(NORMAL_INSTALL)
699
 
        test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
700
 
        @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
701
 
        for p in $$list; do \
702
 
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
703
 
          echo "$$d$$p"; \
704
 
        done | $(am__base_list) | \
705
 
        while read files; do \
706
 
          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
707
 
          $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
708
 
        done
709
 
 
710
 
uninstall-uiDATA:
711
 
        @$(NORMAL_UNINSTALL)
712
 
        @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
713
 
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
714
 
        test -n "$$files" || exit 0; \
715
 
        echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
716
 
        cd "$(DESTDIR)$(uidir)" && rm -f $$files
717
691
 
718
692
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
719
693
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
802
776
        $(MAKE) $(AM_MAKEFLAGS) check-am
803
777
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
804
778
installdirs:
805
 
        for dir in "$(DESTDIR)$(notification_area_appletlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"; do \
 
779
        for dir in "$(DESTDIR)$(notification_area_appletlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(servicedir)"; do \
806
780
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
807
781
        done
808
782
install: $(BUILT_SOURCES)
859
833
 
860
834
install-data-am: install-appletDATA \
861
835
        install-notification_area_appletlibLTLIBRARIES \
862
 
        install-serviceDATA install-uiDATA
 
836
        install-serviceDATA
863
837
 
864
838
install-dvi: install-dvi-am
865
839
 
907
881
 
908
882
uninstall-am: uninstall-appletDATA uninstall-libexecPROGRAMS \
909
883
        uninstall-notification_area_appletlibLTLIBRARIES \
910
 
        uninstall-serviceDATA uninstall-uiDATA
 
884
        uninstall-serviceDATA
911
885
 
912
886
.MAKE: all check install install-am install-strip
913
887
 
923
897
        install-info-am install-libexecPROGRAMS install-man \
924
898
        install-notification_area_appletlibLTLIBRARIES install-pdf \
925
899
        install-pdf-am install-ps install-ps-am install-serviceDATA \
926
 
        install-strip install-uiDATA installcheck installcheck-am \
927
 
        installdirs maintainer-clean maintainer-clean-generic \
928
 
        mostlyclean mostlyclean-compile mostlyclean-generic \
929
 
        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
930
 
        uninstall-am uninstall-appletDATA uninstall-libexecPROGRAMS \
 
900
        install-strip installcheck installcheck-am installdirs \
 
901
        maintainer-clean maintainer-clean-generic mostlyclean \
 
902
        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 
903
        pdf pdf-am ps ps-am tags uninstall uninstall-am \
 
904
        uninstall-appletDATA uninstall-libexecPROGRAMS \
931
905
        uninstall-notification_area_appletlibLTLIBRARIES \
932
 
        uninstall-serviceDATA uninstall-uiDATA
 
906
        uninstall-serviceDATA
933
907
 
934
908
 
935
909
na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL)