[pkg-java] r13035 - trunk/tomcat6/debian

[Tony Mancill]

Author: tmancill
Date: 2010-10-27 03:55:31 +0000 (Wed, 27 Oct 2010)
New Revision: 13035

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/control
   trunk/tomcat6/debian/tomcat6.postrm
Log:
bugs 599458 and 600590

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-10-24 23:14:37 UTC (rev 13034)
+++ trunk/tomcat6/debian/changelog	2010-10-27 03:55:31 UTC (rev 13035)
@@ -1,9 +1,18 @@
 tomcat6 (6.0.28-8) UNRELEASED; urgency=low
 
+  * Team upload.
+
+  [ Thierry Carrez (ttx) ]
   * Do not fail to purge if /etc/tomcat6 was manually removed (LP: #648619)
 
- -- Thierry Carrez (ttx) <thierry.carrez at ubuntu.com>  Fri, 15 Oct 2010 14:23:23 +0200
+  [ tony mancill ]
+  * Use debconf to determine tomcat6 user and group to delete upon purge.
+    Thanks to Misha Koshelev.  (Closes: #599458)
+  * Add tomcat-native to Suggests: for tomcat6 binary pacakge. 
+    Thanks to Eddy Petrisor  (Closes: #600590)
 
+ -- tony mancill <tmancill at debian.org>  Tue, 26 Oct 2010 20:45:11 -0700
+
 tomcat6 (6.0.28-7) unstable; urgency=low
 
   * Team upload.

Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control	2010-10-24 23:14:37 UTC (rev 13034)
+++ trunk/tomcat6/debian/control	2010-10-27 03:55:31 UTC (rev 13035)
@@ -31,7 +31,8 @@
 Suggests: tomcat6-docs (>= ${source:Version}),
 	tomcat6-admin (>= ${source:Version}),
 	tomcat6-examples (>= ${source:Version}),
-	tomcat6-user (>= ${source:Version})
+	tomcat6-user (>= ${source:Version}),
+  tomcat-native
 Description: Servlet and JSP engine
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web

Modified: trunk/tomcat6/debian/tomcat6.postrm
===================================================================
--- trunk/tomcat6/debian/tomcat6.postrm	2010-10-24 23:14:37 UTC (rev 13034)
+++ trunk/tomcat6/debian/tomcat6.postrm	2010-10-27 03:55:31 UTC (rev 13035)
@@ -59,8 +59,11 @@
         chown -Rhf root:root /etc/tomcat6/ || true
         # Remove user/group and log files (don't remove everything under
         # /var/lib/tomcat6 because there might be user-installed webapps)
-        deluser tomcat6
-        delgroup tomcat6
+        db_get tomcat6/username && TOMCAT6_USER="$RET" || TOMCAT6_USER="tomcat6"
+        db_get tomcat6/groupname && TOMCAT6_GROUP="$RET" || TOMCAT6_GROUP="tomcat6"
+        deluser $TOMCAT6_USER
+        delgroup $TOMCAT6_GROUP
+
         set -e
     ;;