Merge branch 'bug_8816' into 3.12-master

diff --git a/debian/control b/debian/control
index be19e0c..fe69e1e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,9 @@ Maintainer: Robin Sheat <robin@catalyst.net.nz>
 Section: web
 Priority: optional
 Standards-Version: 3.8.4
+# WARNING: The "control" file is automatically generated from the "control.in" file.
+# Do not manually edit "control" or your changes will be clobbered when you
+# run update-control
 # NOTA BENE: Build dependencies end up as runtime dependencies as well.
 # See debian/rules, the override_dh_gencontrol rules. 
 # There are some exceptions.

diff --git a/debian/control.in b/debian/control.in
index a30aeed..0fd9d44 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,6 +3,9 @@ Maintainer: Robin Sheat <robin@catalyst.net.nz>
 Section: web
 Priority: optional
 Standards-Version: 3.8.4
+# WARNING: The "control" file is automatically generated from the "control.in" file.
+# Do not manually edit "control" or your changes will be clobbered when you
+# run update-control
 # NOTA BENE: Build dependencies end up as runtime dependencies as well.
 # See debian/rules, the override_dh_gencontrol rules. 
 # There are some exceptions.