← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ibus/quantal

« back to all changes in this revision

Viewing changes to data/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Barry Warsaw
  • Date: 2011-08-11 17:00:57 UTC
  • mfrom: (6.2.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110811170057-6dmbfs4s3cchzl7x
Tags: 1.3.99.20110419-1ubuntu1
https://launchpad.net/bugs/457632
* Merge with Debian unstable.  Remaining Ubuntu changes:
  - Indicator support:
    + Add 05_appindicator.patch: Use an indicator rather than a notification
      icon.
    + debian/control: Recommend python-appindicator.
  - debian/control: Install im-switch instead of im-config by default.
  - debian/README.source: Removed, it was outdated and no longer correct
  - debian/patches/01_ubuntu_desktop: Fix "Desktop entry needs the
    X-Ubuntu-Gettext-Domain key"  (LP: #457632)
  - debian/patches/02_title_update.patch: Rename "IBus Preferences" to
    "Keyboard Input Methods"
  - debian/patches/06_locale_parser.patch: Cherry-picked from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.in
59
59
subdir = data
60
60
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
61
61
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
62
 
am__aclocal_m4_deps = $(top_srcdir)/m4/as-version.m4 \
63
 
        $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
 
62
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 
63
        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
64
64
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
65
65
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
66
66
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
164
164
CXXFLAGS = @CXXFLAGS@
165
165
CYGPATH_W = @CYGPATH_W@
166
166
DATADIRNAME = @DATADIRNAME@
167
 
DATE_DISPLAY = @DATE_DISPLAY@
168
167
DBUS_CFLAGS = @DBUS_CFLAGS@
169
168
DBUS_LIBS = @DBUS_LIBS@
170
169
DBUS_PYTHON_CFLAGS = @DBUS_PYTHON_CFLAGS@
216
215
GTKDOC_MKPDF = @GTKDOC_MKPDF@
217
216
GTKDOC_REBASE = @GTKDOC_REBASE@
218
217
HTML_DIR = @HTML_DIR@
 
218
IBUS_API_VERSION = @IBUS_API_VERSION@
219
219
IBUS_GIR_SCANNERFLAGS = @IBUS_GIR_SCANNERFLAGS@
 
220
IBUS_ICON_KEYBOARD = @IBUS_ICON_KEYBOARD@
 
221
IBUS_MAJOR_VERSION = @IBUS_MAJOR_VERSION@
 
222
IBUS_MICRO_VERSION = @IBUS_MICRO_VERSION@
 
223
IBUS_MINOR_VERSION = @IBUS_MINOR_VERSION@
220
224
INSTALL = @INSTALL@
221
225
INSTALL_DATA = @INSTALL_DATA@
222
226
INSTALL_PROGRAM = @INSTALL_PROGRAM@
268
272
PACKAGE_TARNAME = @PACKAGE_TARNAME@
269
273
PACKAGE_URL = @PACKAGE_URL@
270
274
PACKAGE_VERSION = @PACKAGE_VERSION@
271
 
PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
272
 
PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@
273
 
PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
274
 
PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@
275
 
PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
276
275
PATH_SEPARATOR = @PATH_SEPARATOR@
277
276
PKG_CONFIG = @PKG_CONFIG@
278
277
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
754
753
@GCONF_SCHEMAS_INSTALL_TRUE@            done \
755
754
@GCONF_SCHEMAS_INSTALL_TRUE@    fi
756
755
 
 
756
-include $(top_srcdir)/git.mk
 
757
 
757
758
# Tell versions [3.59,3.63) of GNU make to not export all variables.
758
759
# Otherwise a system limit (for SysV at least) may be exceeded.
759
760
.NOEXPORT: