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

« back to all changes in this revision

Viewing changes to Makefile.am

  • 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:
1
 
SUBDIRS = libgnome-desktop docs po
 
1
SUBDIRS = libgnome-desktop docs po tests
2
2
 
3
3
if DESKTOP_DOCS_ENABLED
4
4
SUBDIRS += desktop-docs
6
6
 
7
7
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
8
8
 
9
 
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
 
9
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
10
10
 
11
11
versiondir = $(datadir)/gnome
12
12
version_DATA = gnome-version.xml
18
18
        HACKING                 \
19
19
        MAINTAINERS             \
20
20
        ChangeLog.pre-git       \
21
 
        gnome-version.xml.in.in
 
21
        glib-tap.mk             \
 
22
        gnome-version.xml.in.in \
 
23
        tap-driver.sh           \
 
24
        tap-test
22
25
 
23
26
CLEANFILES = \
24
27
        $(version_DATA)