~tkluck/ubuntu/precise/gnome-shell/lp883443

« back to all changes in this revision

Viewing changes to src/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Raphaël Hertzog, Frederic Peters, Raphaël Hertzog, Laurent Bigonville
  • Date: 2011-04-11 21:03:31 UTC
  • mfrom: (1.1.22 upstream)
  • mto: (18.1.1 sid)
  • mto: This revision was merged to the branch mainline in revision 25.
  • Revision ID: james.westby@ubuntu.com-20110411210331-345p7j40vf0wp6t1
Tags: 3.0.0.2-1
* Team upload.

[ Frederic Peters ]
* New upstream release (2.91.93).
* debian/control.in:
  + added dependency on gnome-icon-theme-symbolic.
  + bumped gnome-shell dependency.
  + bumped gir1.2-freedesktop build-dep to 0.10.6, for a fix to
    cairo-1.0.typelib

[ Raphaël Hertzog ]
* New upstream release (3.0.0.2).
* New patch 02_rpath-bluetooth-applet.patch by Rico Tzschichholz to
  add an RPATH so that the compilation doesn't fail when g-ir-scanner
  tries to analyze libgnome-shell.so linked against
  libgnome-bluetooth-applet.so.0 which is in a private directory.
* Add a lintian override for the RPATH that we can't avoid.
* Teach dpkg-shlibdeps how to find that private lib and add the
  corresponding dependency in debian/slibs.local.
* Update and add a bunch of build-depends to match the latest configure
  requirements.
* Add gir1.2-gnomebluetooth-1.0 and gir1.2-networkmanager-1.0 to Depends
  because they are needed to benefit from the improved UI associated to the
  respective status bar applet.

[ Laurent Bigonville ]
* debian/control.in: {Build-}Depends against gir1.2-mutter-3.0 instead of
  gir1.2-mutter-2.91

Show diffs side-by-side

added added

removed removed

Lines of Context:
900
900
run_js_test_SOURCES = \
901
901
        run-js-test.c
902
902
 
903
 
libgnome_shell_la_LDFLAGS = -avoid-version
 
903
libgnome_shell_la_LDFLAGS = -avoid-version -rpath $(pkglibdir):/usr/lib/gnome-bluetooth -R $(pkglibdir)
904
904
libgnome_shell_la_LIBADD = \
905
905
        -lm                     \
906
906
        $(GNOME_SHELL_LIBS)     \
912
912
        $(NULL)
913
913
 
914
914
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
915
 
Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-2.91 TelepathyGLib-0.12 TelepathyLogger-0.2
 
915
Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2
916
916
Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
917
917
Shell_0_1_gir_LIBS = libgnome-shell.la
918
918
Shell_0_1_gir_FILES = $(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources))