← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnome-desktop3/vivid

« back to all changes in this revision

Viewing changes to docs/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-10-31 07:46:09 UTC
  • mfrom: (1.6.5) (32.1.1 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141031074609-gb280wdsxsgldc91
Tags: 3.14.1-1ubuntu1
* Merge with Debian, Remaining changes:
  - debian/patches:
    + 04_compute_average_color.patch: Compute the avergage color in
      gnome-desktop itself, not in unity to fix some races (LP #963140)
    + tweak_color_computation.patch, Patch from Gord, no patch header,
      no bug link.
    + git_revert_draw_background.patch
    + ubuntu_language.patch, Ported relevant bits from g-c-c 
      52_region_language.patch, as required for gnome 3.8 region panel
    + ubuntu_language_list_from_SUPPORTED.patch,
      adds api to get list of available languages from SUPPORTED file.
      To be used by gnome 3.8 region panel language installation.
  - debian/libgnome-desktop-3-10.symbols:
    + Add symbols included in Ubuntu patches
  - debian/control.in:
    + Mark gnome-desktop3-data Multi-Arch: foreign

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/Makefile.in
1
 
# Makefile.in generated by automake 1.13.4 from Makefile.am.
 
1
# Makefile.in generated by automake 1.14.1 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
80
80
subdir = docs
81
81
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
82
82
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
83
 
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
84
 
        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
85
 
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
86
 
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
87
 
        $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 
83
am__aclocal_m4_deps = $(top_srcdir)/m4/glibtests.m4 \
 
84
        $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
 
85
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 
86
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 
87
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
 
88
        $(top_srcdir)/configure.ac
88
89
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
89
90
        $(ACLOCAL_M4)
90
91
mkinstalldirs = $(install_sh) -d
220
221
GNOME_PLATFORM = @GNOME_PLATFORM@
221
222
GREP = @GREP@
222
223
GTKDOC_CHECK = @GTKDOC_CHECK@
 
224
GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
223
225
GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
224
226
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
225
227
GTKDOC_MKPDF = @GTKDOC_MKPDF@
256
258
LDFLAGS = @LDFLAGS@
257
259
LIBM = @LIBM@
258
260
LIBOBJS = @LIBOBJS@
 
261
LIBRT = @LIBRT@
259
262
LIBS = @LIBS@
260
263
LIBTOOL = @LIBTOOL@
261
264
LIPO = @LIPO@
313
316
X_EXTRA_LIBS = @X_EXTRA_LIBS@
314
317
X_LIBS = @X_LIBS@
315
318
X_PRE_LIBS = @X_PRE_LIBS@
 
319
YELP_LC_DIST = @YELP_LC_DIST@
 
320
YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
316
321
abs_builddir = @abs_builddir@
317
322
abs_srcdir = @abs_srcdir@
318
323
abs_top_builddir = @abs_top_builddir@
346
351
includedir = @includedir@
347
352
infodir = @infodir@
348
353
install_sh = @install_sh@
 
354
installed_test_metadir = @installed_test_metadir@
 
355
installed_testdir = @installed_testdir@
349
356
intltool__v_merge_options_ = @intltool__v_merge_options_@
350
357
intltool__v_merge_options_0 = @intltool__v_merge_options_0@
351
358
libdir = @libdir@