-
Committer:
Bazaar Package Importer
-
Author(s):
Cody A.W. Somerville
-
Date:
2008-07-12 05:45:57 UTC
-
mfrom:
(1.1.7 upstream)
(3.1.2 lenny)
-
Revision ID:
james.westby@ubuntu.com-20080712054557-5u4hizg2b1u4f1f3
Tags: 1.1.0.5-3ubuntu1
* Merge from debian unstable. (closes lp: #192034)
- dropped superflous removal of unused dpatch system and e-mailed
Debian maintainer to please make the change in Debian.
- install groupOfNames template to templates/creation/ instead of
templates/additional-templates/ so that users will be able to use it.
* Remaining Ubuntu changes:
- debian/additional-templates/*:
. added groupOfNames.xml (a commonly used object, see lp: #72779)
- debian/rules:
. added call to dh_install to install debian/additional-templates/*
- debian/control: Maintainer fields updated.