~noskcaj/ubuntu/vivid/dhelp/merge

Viewing all changes in revision 21.

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2010-06-04 09:15:52 UTC
  • mfrom: (3.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100604091552-g4qlkxuihmodxqxk
Tags: 0.6.19ubuntu1
* Merge with debian unstable, remaining changes:
  - debian/control:
    + Packages that Depend/Recommend/Suggest firefox (metapackages) must
      alternatively Depend/Recommend/Suggest abrowser.
  - lib/dhelp.rb:
    + Exit and return zero code if bdb isn't available; this usually
      indicates that dhelp is not configured yet.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: