=== modified file 'debian/changelog'
--- debian/changelog	2011-02-09 21:49:33 +0000
+++ debian/changelog	2011-03-07 08:24:50 +0000
@@ -1,3 +1,10 @@
+tomcat6 (6.0.28-10ubuntu1) natty; urgency=low
+
+  * tomcat6-instance-create should accept -1 as the value of -c option
+    as per http://tomcat.apache.org/tomcat-6.0-doc/config/server.html (LP: #707405)
+  
+ -- Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com>  Mon, 07 Mar 2011 13:38:05 +0530
+
 tomcat6 (6.0.28-10) unstable; urgency=medium
 
   * Team upload.

=== modified file 'debian/tomcat6-instance-create'
--- debian/tomcat6-instance-create	2010-05-21 13:51:15 +0000
+++ debian/tomcat6-instance-create	2011-03-07 08:24:50 +0000
@@ -23,11 +23,23 @@
   type=$1
   port=$2
   # Fail if port is non-numeric
-  num=`expr ${port} + 1 2> /dev/null`
-  if [ $? != 0 ] || [ $num -lt 2 ]; then
+  num=`expr ${port} + 2 2> /dev/null`
+  if [ $? != 0 ]; then
     echo "Error: ${type} port '${port}' is not a valid TCP port number."
     exit 1
   fi
+  
+  # If Control port is -1 , no need to check any further. 
+  if [ "$type" = "Control" ] && [ $port -eq -1 ]; then
+  	echo "Warning: Control port disabled. You will have to shutdown the server manually, by using OS signals."
+  	return
+  fi
+  
+  # Fail if port is 0 or negative 
+  if [ $port -le 0 ]; then
+  	echo "Error: ${type} port '${port}' is not a valid TCP port number."
+  	exit 1
+  fi
 
   # Fail if port is above 65535
   if [ ${port} -gt 65535 ]; then