~maxolasersquad/ubuntu/precise/epiphany-browser/add_quicklist

« back to all changes in this revision

Viewing changes to data/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2010-10-14 12:45:29 UTC
  • mfrom: (98.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20101014124529-57hi6lecoo68e3sq
Tags: 2.30.6-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Update the search URL:
    + add debian/patches/80_ubuntu_search_url.patch
    + update debian/epiphany-browser-data.gconf-defaults
  - Set branding to Ubuntu.
  - debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
    + Update the bookmarks menu every time the internal structure
      is changed (needed for the UNE application menu to work correctly).
  - Support appindicator.
  - debian/control.in:
    + Temporary bump for gir dependencies to ensure we rebuild against
      the correct version.
  - debian/patches/13_clearing_temp.patch:
    + Fix crashing epiphany-browser while clearing temp files.
      This patch can be dropped with new upstream 2.32 release.
* debian/control.in:
  - Bump Build-Depends on network-manager-dev to avoid FTBFS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
191
191
GMSGFMT = @GMSGFMT@
192
192
GREP = @GREP@
193
193
GTKDOC_CHECK = @GTKDOC_CHECK@
 
194
GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
195
GTKDOC_REBASE = @GTKDOC_REBASE@
194
196
HELP_DIR = @HELP_DIR@
195
197
HTML_DIR = @HTML_DIR@
196
198
INSTALL = @INSTALL@
244
246
PACKAGE_NAME = @PACKAGE_NAME@
245
247
PACKAGE_STRING = @PACKAGE_STRING@
246
248
PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
249
PACKAGE_URL = @PACKAGE_URL@
247
250
PACKAGE_VERSION = @PACKAGE_VERSION@
248
251
PATH_SEPARATOR = @PATH_SEPARATOR@
249
252
PKG_CONFIG = @PKG_CONFIG@
 
253
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 
254
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
250
255
POFILES = @POFILES@
251
256
POSUB = @POSUB@
252
257
POW_LIB = @POW_LIB@