~ubuntu-branches/ubuntu/karmic/gkrellm/karmic

Viewing all changes in revision 18.

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-06-16 12:22:20 UTC
  • mfrom: (3.3.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090616122220-ujzs3gfho7nxizfj
Tags: 2.3.2-4ubuntu1
* Merge from debian unstable, remaining changes: LP: #387674
  + debian/control:
    - Adjust Conflicts/Replaces versions for Ubuntu.
  + debian/rules:
    - Add --no start option to DEB_DH_INSTALLINIT_ARGS to avoid errors
      during upgrade and removal phases.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: