← Back to branch summary

~ubuntu-branches/ubuntu/karmic/ogmrip/karmic

Viewing all changes in revision 4.

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2008-10-03 17:43:54 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20081003174354-els5gm1kr90zli0q
Tags: 0.12.2-0.0ubuntu1
https://launchpad.net/bugs/268063
https://launchpad.net/bugs/204448
https://launchpad.net/bugs/247826
* Merge from debian-multimedia (LP: #268063), remaining changes:
 - debian/libogmrip0.install & debian/install:
  + Don't install the .desktop file in the library package (LP: #204448)
 - debian/rules:
  + Drop configure flag --with-ocr=ocrad (introduced to fix LP #200600), 
    as ogmrip now detect at runtime the ocr.
 - debian/control:
  + Set Depends for ocr to tesseract | ocrad | gocr . (LP: #247826)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: