← Back to branch summary

~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Martin Pitt, Aurélien Gâteau
  • Date: 2012-03-08 18:30:18 UTC
  • Revision ID: package-import@ubuntu.com-20120308183018-ewmdzzyuoll4twgk
Tags: 1:3.3.91-0ubuntu2
https://launchpad.net/bugs/948236
https://launchpad.net/bugs/945813
https://launchpad.net/bugs/936761
* debian/patches/96_sound_nua_panel.patch:
  - change X-GNOME-Keywords to Keywords
  - updated to r273, fixes profile selection issues with bluetooth devices
    (lp: #948236)
* debian/patches/revert_git_drop_library.patch:
  - simplified, don't copy files or create a new dir
* debian/patches/git_zoom_shell_only.patch:
  - hide zoom option when not under gnome-shell since they do nothing 
    on other environments (lp: #945813)

[ Martin Pitt ]
* debian/control.in: Only recommend gnome-session-bin, to avoid pulling in
  all of gnome-session and Unity for derivatives. (LP: #936761)

[ Aurélien Gâteau ]
* debian/patches/60_ubuntu_nav_bar.patch: Use a GtkBox instead of a GtkGrid
  so that GTK_STYLE_CLASS_LINKED works.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
237
237
PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\""
238
238
AC_SUBST(PANEL_CFLAGS)
239
239
 
240
 
PANEL_LIBS="\$(top_builddir)/libgnome-control-center/libgnome-control-center.la"
 
240
PANEL_LIBS="\$(top_builddir)/shell/libgnome-control-center.la"
241
241
AC_SUBST(PANEL_LIBS)
242
242
 
243
243
PANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
327
327
 
328
328
AC_OUTPUT([
329
329
Makefile
330
 
libgnome-control-center/Makefile
331
 
libgnome-control-center/libgnome-control-center.pc
 
330
shell/libgnome-control-center.pc
332
331
panels/Makefile
333
332
panels/common/Makefile
334
333
panels/background/Makefile