~noskcaj/ubuntu/wily/epiphany-browser/merge

« back to all changes in this revision

Viewing changes to missing

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2015-06-02 10:42:34 UTC
  • mfrom: (1.10.3) (105.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20150602104234-aud9080wq37exs53
Tags: 3.16.1-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - 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).
  - debian/patches/ubuntu_titlebars.patch: Use traditional titlebars
    for non-GNOME sessions

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#! /bin/sh
2
2
# Common wrapper for a few potentially missing GNU programs.
3
3
 
4
 
scriptversion=2012-06-26.16; # UTC
 
4
scriptversion=2013-10-28.13; # UTC
5
5
 
6
6
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
7
7
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
160
160
      ;;
161
161
   autom4te*)
162
162
      echo "You might have modified some maintainer files that require"
163
 
      echo "the 'automa4te' program to be rebuilt."
 
163
      echo "the 'autom4te' program to be rebuilt."
164
164
      program_details 'autom4te'
165
165
      ;;
166
166
    bison*|yacc*)