-
Committer:
Bazaar Package Importer
-
Author(s):
Bhavani Shankar
-
Date:
2010-10-31 10:41:45 UTC
-
mfrom:
(0.1.5 sid)
-
Revision ID:
james.westby@ubuntu.com-20101031104145-zqnubwkmlkj8hu7q
Tags: 0.5.1-5.2ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/control:
- Replace gvim dependency with vim-gtk as gvim no longer exists
in Ubuntu and add an alternate dependency on emacs (LP: #504754)
- Add ${misc:Depends} to Depends to placate lintian
- debian/compat: Update to compatibility level 7 as 4 is pretty old
- debian/rules: Remove obsolete call to dh_desktop
* Dropped change (Superceeded in debian in a different way)
- Remove dependency on obsolete python-gtkhtml2 (LP: #538773)