← Back to branch summary

~bratsche/ubuntu/maverick/gtk+2.0/menu-activation-fix

« back to all changes in this revision

Viewing changes to modules/input/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-07-22 21:41:30 UTC
  • mfrom: (1.11.7 upstream) (72.1.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20100722214130-5uzyvpb9g4m0ts2c
Tags: 2.21.5-1ubuntu1
* Merge with Debian experimental, Ubuntu changes:
* debian/control.in:
  - Add introspection build-depends
  - Add Vcs-Bzr link
  - Add gir1.0-gtk-2.0 package
  - libgtk2.0-dev replaces gir-repository-dev
  - Conflict with appmenu-gtk (<< 0.1.3) to prevent menu proxy breakage
* debian/rules:
  - Build with --enable-introspection
  - Add gir1.0-gtk-2.0 package to BINARY_ARCH_PKGS
  - Add dh_girepository call
  - Disable devhelp files
* debian/dh_gtkmodules.in:
  - Remove obsolete script content
* debian/libgtk2.0-0.symbols:
  - Add Ubuntu specific symbols
* debian/libgtk2.0-dev.install.in:
  - Add gir files
* debian/libgtk2.0-doc.install.in
  - Disable devhelp files
* debian/gir1.0-gtk-2.0.install.in
  - Introspection package
* debian/patches/043_menu_proxy.patch
  - Add GtkMenuProxy support for remoting menus.
* debian/patches/062_dnd_menubar.patch:
  - Allow click on menubars for dnd
* debian/patches/063_treeview_almost_fixed.patch:
  - Add an ubuntu-almost-fixed-height-mode property, (required for
    software-center)
* debian/patches/071_no_offscreen_widgets_grabbing.patch:
  - Don't let offscreen widgets do grabbing
* debian/patches/072_indicator_menu_update.patch:
  - change by Cody Russell to send an update event on menu changes,
    should make the bluetooth indicator refresh correctly
* debian/patches/091_bugzilla_tooltip_refresh.patch:
  - Upstream bugzilla change to have better looking tooltips the gtk theme
    need to set "new-tooltip-style" to use those
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/input/Makefile.in
74
74
        "$(DESTDIR)$(imconffiledir)"
75
75
LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES)
76
76
am__DEPENDENCIES_1 =
77
 
am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
78
 
        $(top_builddir)/gdk/$(gdktargetlib) \
 
77
am__DEPENDENCIES_2 = $(top_builddir)/gdk/$(gdktargetlib) \
79
78
        $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1)
80
79
im_am_et_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
81
80
am_im_am_et_la_OBJECTS = imam-et.lo
378
377
GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@
379
378
GDK_PACKAGES = @GDK_PACKAGES@
380
379
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
381
 
GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@
382
 
GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@
383
 
GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@
384
 
GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@
385
 
GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@
386
 
GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@
387
 
GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@
388
 
GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@
389
 
GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@
390
 
GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@
391
 
GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@
392
 
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
393
 
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
394
 
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
 
380
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
395
381
GDK_WLIBS = @GDK_WLIBS@
396
382
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
397
383
GLIB_CFLAGS = @GLIB_CFLAGS@
426
412
HTML_DIR = @HTML_DIR@
427
413
INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@
428
414
INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@
429
 
INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@
430
 
INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@
431
415
INDENT = @INDENT@
432
416
INSTALL = @INSTALL@
433
417
INSTALL_DATA = @INSTALL_DATA@
446
430
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
447
431
LD = @LD@
448
432
LDFLAGS = @LDFLAGS@
449
 
LIBJASPER = @LIBJASPER@
450
 
LIBJPEG = @LIBJPEG@
451
433
LIBOBJS = @LIBOBJS@
452
 
LIBPNG = @LIBPNG@
453
434
LIBS = @LIBS@
454
 
LIBTIFF = @LIBTIFF@
455
435
LIBTOOL = @LIBTOOL@
456
436
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
457
437
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
492
472
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
493
473
RANLIB = @RANLIB@
494
474
REBUILD = @REBUILD@
495
 
REBUILD_PNGS = @REBUILD_PNGS@
496
475
SED = @SED@
497
476
SET_MAKE = @SET_MAKE@
498
477
SHELL = @SHELL@
549
528
libexecdir = @libexecdir@
550
529
localedir = @localedir@
551
530
localstatedir = @localstatedir@
552
 
lt_ECHO = @lt_ECHO@
553
531
mandir = @mandir@
554
532
mkdir_p = @mkdir_p@
555
533
ms_librarian = @ms_librarian@
609
587
        $(INCLUDED_IMMODULE_DEFINE)
610
588
 
611
589
DEPS = \
612
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
613
590
        $(top_builddir)/gdk/$(gdktargetlib)                             \
614
591
        $(top_builddir)/gtk/$(gtktargetlib)
615
592
 
616
593
LDADDS = \
617
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
618
594
        $(top_builddir)/gdk/$(gdktargetlib)                             \
619
595
        $(top_builddir)/gtk/$(gtktargetlib)                             \
620
596
        $(GTK_DEP_LIBS)