Viewing all changes in revision 7.
- Committer: Bazaar Package Importer
- Date: 2007-11-11 19:39:57 UTC
- Revision ID: james.westby@ubuntu.com-20071111193957-h9tf29d9jqsd6gy2
* Merge from Debian unstable, remaining Ubuntu changes:
- Adhere to DebianMaintainerField
- debian/control: add versioned conflict on xfce-terminal, since it no longer
ships /usr/bin/Terminal. (LP: #119934).
* debian/control: bump the conflict on xfce4-terminal to (<< 0.2.6-5ubuntu1),
since previous versions ship Terminal.desktop too.
- Adhere to DebianMaintainerField
- debian/control: add versioned conflict on xfce-terminal, since it no longer
ships /usr/bin/Terminal. (LP: #119934).
* debian/control: bump the conflict on xfce4-terminal to (<< 0.2.6-5ubuntu1),
since previous versions ship Terminal.desktop too.
- files added:
- debian/Terminal.desktop
- files modified:
- debian/changelog
expand all
collapse all
added
removed
