-
Committer:
Bazaar Package Importer
-
Author(s):
Kees Cook
-
Date:
2006-11-29 16:08:37 UTC
-
mfrom:
(1.1.7 upstream)
-
Revision ID:
james.westby@ubuntu.com-20061129160837-dxltavowy55r109a
Tags: 1.6.3-1ubuntu1
* Merge from debian unstable. Remaining Ubuntu changes:
- debian/control:
+ php5 by default.
+ Add postgresql-client-8.1 to Depends.
+ Update Recommends alternate to postgresql-8.1.
- debian/templates: Ensure the default corresponds to the install-
time dependencies (apache2).