-
Committer:
Bazaar Package Importer
-
Author(s):
Dustin Kirkland
-
Date:
2008-06-04 13:18:56 UTC
-
Revision ID:
james.westby@ubuntu.com-20080604131856-7m7o2n5xy28fk8s2
Tags: 3.2-12ubuntu1
* Merge from debian unstable, remaining changes:
- init-functions:
+ Debian has a "return 0" that should be "return 3" per LSB spec
+ Make pidof call "set -e safe", LP: #204594
+ Add status_of_proc() function, LP: #203169
- debian/control:
+ Remove python from conflicts
+ Keep Ubuntu's Depends and Suggests