← Back to branch summary

~wongchiachen/ubuntu/precise/totem/hey_about_dialog

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-05-20 16:38:02 UTC
  • mfrom: (1.11.13 upstream) (2.1.17 experimental)
  • Revision ID: james.westby@ubuntu.com-20110520163802-p3lohdmfvws2jqeo
Tags: 3.0.1-0ubuntu1
* Resynchronize on Debian, remaining diffs:
* debian/control.in:
  - use suggests rather than recommends for universe gstreamer components
  - add totem-plugins-extra for the components which have depends in universe
  - add build-depends on gnome-common, dh-autoreconf, 
    liblaunchpad-intrgration-3.0-dev, hardening-wrapper
  - drop build-depends on libepc-ui-dev, python-feedparser, xulrunner-dev,
    libtracker-sparql-0.10-dev
  - add XB-Npp-Description and XB-Npp-Filename header to the 
    totem-mozilla package to improve ubufox/ubuntu plugin db integration 
  - change refences from Iceweasel to Firefox
  - recommends gnome-icon-theme-symbolic rather than depending on it
  - list firefox as a totem-mozilla recommends before epiphany-browser
  - libtotem replaces totem (<< 3.0.1-1) for ppa upgrades
* debian/totem-common.install:
  - Install apport hook
* debian/totem-plugins-extra.install:
  - Plugins split out ouf totem-plugins
* debian/totem-plugins.install:    
  - Move some plugins to totem-plugins-extra
* debian/totem.preinst:
  - No longer required as Lucid has been released
* debian/patches/01_fake_keypresses.patch:
  - dropped it's an old workaround and should not be required
* debian/patches/02_lpi.patch:
  - Launchpad integration
* debian/patches/03_default_options.patch: 
  - enable the youtube option by default
* debian/patches/70_bbc_plugin.patch:
  - bbc content viewer, needs to be fixed for the new version
* debian/source_totem.py:
  - ubuntu apport debugging
* debian/rules:
  - run autoreconf on build
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
1
 
NORMAL_SUBDIRS = lib bindings po data help src docs
 
1
NORMAL_SUBDIRS = lib po data help src docs
2
2
SUBDIRS = $(NORMAL_SUBDIRS)
3
3
 
 
4
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
5
 
4
6
if ENABLE_BROWSER_PLUGINS
5
7
SUBDIRS += browser-plugin
6
8
endif
7
9
 
8
 
 
9
10
EXTRA_DIST =                    \
10
11
        license_change          \
11
12
        autogen.sh              \
17
18
        totem.spec              \
18
19
        omf.make                \
19
20
        xmldocs.make            \
20
 
        gnome-doc-utils.make
 
21
        gnome-doc-utils.make    \
 
22
        ChangeLog.pre-gitlog    \
 
23
        MAINTAINERS             \
 
24
        totem.doap
21
25
 
22
26
CLEANFILES = totem.spec
23
27
 
 
28
MAINTAINERCLEANFILES = \
 
29
        $(srcdir)/INSTALL \
 
30
        $(srcdir)/aclocal.m4 \
 
31
        $(srcdir)/autoscan.log \
 
32
        $(srcdir)/compile \
 
33
        $(srcdir)/config.guess \
 
34
        $(srcdir)/config.h.in \
 
35
        $(srcdir)/config.sub \
 
36
        $(srcdir)/configure.scan \
 
37
        $(srcdir)/depcomp \
 
38
        $(srcdir)/install-sh \
 
39
        $(srcdir)/ltmain.sh \
 
40
        $(srcdir)/missing \
 
41
        $(srcdir)/mkinstalldirs \
 
42
        $(srcdir)/omf.make \
 
43
        $(srcdir)/py-compile \
 
44
        $(srcdir)/xmldocs.make \
 
45
        $(srcdir)/gtk-doc.make \
 
46
        $(srcdir)/ChangeLog \
 
47
        `find "$(srcdir)" -type f -name Makefile.in -print`
 
48
 
24
49
DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
25
50
                 gnome-doc-utils.make
26
51
 
27
52
DIST_SUBDIRS = $(NORMAL_SUBDIRS) browser-plugin
28
 
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' --enable-vala=yes
 
53
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' --enable-vala=no --enable-introspection
29
54
 
30
55
# Build ChangeLog from GIT history
31
56
ChangeLog:
37
62
 
38
63
.PHONY: ChangeLog
39
64
 
 
65
-include $(top_srcdir)/git.mk