~ubuntu-branches/ubuntu/trusty/driconf/trusty

Viewing all changes in revision 7.

  • Committer: Bazaar Package Importer
  • Author(s): Arthur Loiret
  • Date: 2007-06-27 12:20:58 UTC
  • mfrom: (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20070627122058-lwfy2y61r4f3semp
Tags: 0.9.1-2ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  + Fix FTBFS, build-depend on python-dev
  + debian/rules: include simple-patchsys.mk to patch the desktop file
    (#57993)
  + 01_fix-desktop-file.patch: update patch part-applied in Debian
  + Update Maintainer field to match Debian-Maintainer-Spec
* debian/rules: keep debian changes to install desktop file

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: