← Back to branch summary

~ubuntu-branches/ubuntu/trusty/epiphany-browser/trusty

« back to all changes in this revision

Viewing changes to Makefile.in

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-05-17 23:20:42 UTC
  • mfrom: (1.6.11) (98.2.4 sid)
  • Revision ID: package-import@ubuntu.com-20120517232042-qkdp2sqfbgwteakm
Tags: 3.5.1-0ubuntu1
* Resynchronize on Debian, remaining diffs:
* New upstream unstable release.
* debian/control.in:
  - Bump minimum intltool to 0.50
* debian/epiphany-browser-data.gsettings-override:
  - Set search client to Ubuntu
* debian/epiphany-browser-data.install:
  - The developers no longer provide help files to install since they were
    too outdated
* debian/patches/07_bookmarks.patch:
  - Add Ubuntu-specific default bookmarks, borrowed from Firefox
* debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
  - update the bookmarks menu every time the internal structure
    is changed (needed for the indicator application menu to work correctly).
* Dropped upstream patches:
  - 01_email-as-user-for-password-remembering.patch
  - 13_toolbar_size_fixes.patch
* debian/watch: Watch for unstable releases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.in
77
77
        distdir dist dist-all distcheck
78
78
ETAGS = etags
79
79
CTAGS = ctags
80
 
DIST_SUBDIRS = lib embed src data po help doc tests
 
80
DIST_SUBDIRS = lib embed src data po doc tests
81
81
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
82
82
distdir = $(PACKAGE)-$(VERSION)
83
83
top_distdir = $(distdir)
305
305
top_build_prefix = @top_build_prefix@
306
306
top_builddir = @top_builddir@
307
307
top_srcdir = @top_srcdir@
308
 
SUBDIRS = lib embed src data po help doc $(am__append_1)
 
308
SUBDIRS = lib embed src data po doc $(am__append_1)
309
309
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
310
310
NULL = 
311
311
EXTRA_DIST = \
312
312
        autogen.sh              \
313
 
        gnome-doc-utils.make    \
314
313
        COPYING.README          \
315
314
        HACKING                 \
316
315
        MAINTAINERS             \
321
320
        ChangeLog-20061106      \
322
321
        ChangeLog-20070912      \
323
322
        po/ChangeLog.pre-2-23   \
324
 
        help/ChangeLog.pre-2-23 \
325
 
        $(NULL)
326
 
 
327
 
DISTCLEANFILES = \
328
 
        gnome-doc-utils.make    \
329
323
        $(NULL)
330
324
 
331
325
 
731
725
distclean-generic:
732
726
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
733
727
        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
734
 
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
735
728
 
736
729
maintainer-clean-generic:
737
730
        @echo "This command is intended for maintainers to use"