-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Casadevall
-
Date:
2009-05-06 17:18:20 UTC
-
mfrom:
(1.1.15 upstream)
(2.2.1 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090506171820-e99yzmt7q3rd8ut2
Tags: 4.6.1-1ubuntu1
* Merge from debian unstable, remaining changes:
- debian/control: add our Vcs-* fields
- debian/patches/xubuntu-fix-desktop-file.patch: add "OnlyShowIn=XFCE;"
and make desktop-file-validate happy.
* Updated VCS info for karmic