~ubuntu-desktop/yelp/ubuntu

Viewing all changes in revision 123.

  • Committer: Sebastien Bacher
  • Author(s): Jackson Doak
  • Date: 2014-06-18 09:45:09 UTC
  • mfrom: (122.1.1 ubuntu)
  • Revision ID: seb128@ubuntu.com-20140618094509-vgaeshp2mpvo4a9m
* Merge from Debian unstable, remaining changes:
  - Use dh-autoreconf for current libtool.
  - debian/control{,.in}: Drop Recommends on ttf-dejavu; not used by Ubuntu.
  - debian/patches/05_menu_tooltip.patch: Change comment in .desktop file to
    refer to Unity instead of GNOME.
  - debian/patches/06_make_ubuntu_docs_default.patch: On Unity, use
    ubuntu-docs by default.
  - debian/patches/07_disable_package_search.patch: Remove "Search for
    packages" feature since it doesn't work with Ubuntu's default install.
  - debian/source_yelp.py: Install apport hook
  - debian/watch: Track unstable versions too

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: