Author: avdyk
Date: 2006-10-09 14:44:05 +0000 (Mon, 09 Oct 2006)
New Revision: 2573
Modified:
trunk/tomcat5.5/debian/NEWS
trunk/tomcat5.5/debian/changelog
trunk/tomcat5.5/debian/control
trunk/tomcat5.5/debian/tomcat5.5.default
trunk/tomcat5.5/debian/tomcat5.5.init
trunk/tomcat5.5/debian/tomcat5.5.postinst
trunk/tomcat5.5/debian/tomcat5.5.postrm
Log:
tomcat5.5 (5.5.17-2) unstable; urgency=low
* debian/control: removed apache-utils version and added alternative
apache2-utils (that provide the virtual apache-utils package)
* debian/tomcat5.init: added Sun's jdk path as provided by sun-java5-bin
package. (closes: #388617).
* debian/control: updated apache2-common to apache2.2-common (closes:
#391006) (thanks to Andrew Meaden and Luk Claes).
* debian/control (depends): removed -webapps and -admin from Depends
field and move them to Suggest to avoid circular dependencies, thanks
to Bill Allombert. (closes: #387362).
* tomcat5.5 has now the user tomcat55 and remove user tomcat5 if package
tomcat5 is marked as purge or if it's never been installed (closes:
#386831).
-- Arnaud Vandyck <[EMAIL PROTECTED]> Mon, 9 Oct 2006 16:36:25 +0200
Modified: trunk/tomcat5.5/debian/NEWS
===================================================================
--- trunk/tomcat5.5/debian/NEWS 2006-10-09 13:54:23 UTC (rev 2572)
+++ trunk/tomcat5.5/debian/NEWS 2006-10-09 14:44:05 UTC (rev 2573)
@@ -1,3 +1,9 @@
+tomcat5.5 (5.5.17-2) unstable; urgency=low
+
+ Tomcat5.5 has a new user: tomcat55.
+
+ -- Arnaud Vandyck <[EMAIL PROTECTED]> Mon, 9 Oct 2006 16:03:21 +0200
+
tomcat5 (5.0.30-6) unstable; urgency=low
Tomcat5 has a new context file handling. The xml files with the context of
@@ -8,4 +14,4 @@
the old conf/Standalone/localhost directory you have to move them into the
new directory. Afterwards you may delete the old Standalone directory.
- -- Wolfgang Baer <[EMAIL PROTECTED]> Wed, 07 Sep 2005 17:25:44 +0200
\ No newline at end of file
+ -- Wolfgang Baer <[EMAIL PROTECTED]> Wed, 07 Sep 2005 17:25:44 +0200
Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog 2006-10-09 13:54:23 UTC (rev 2572)
+++ trunk/tomcat5.5/debian/changelog 2006-10-09 14:44:05 UTC (rev 2573)
@@ -1,15 +1,20 @@
-tomcat5.5 (5.5.17-2) UNRELEASED; urgency=low
+tomcat5.5 (5.5.17-2) unstable; urgency=low
- * Arnaud Vandyck <[EMAIL PROTECTED]>:
+ * debian/control: removed apache-utils version and added alternative
+ apache2-utils (that provide the virtual apache-utils package)
+ * debian/tomcat5.init: added Sun's jdk path as provided by sun-java5-bin
+ package. (closes: #388617).
+ * debian/control: updated apache2-common to apache2.2-common (closes:
+ #391006) (thanks to Andrew Meaden and Luk Claes).
+ * debian/control (depends): removed -webapps and -admin from Depends
+ field and move them to Suggest to avoid circular dependencies, thanks
+ to Bill Allombert. (closes: #387362).
+ * tomcat5.5 has now the user tomcat55 and remove user tomcat5 if package
+ tomcat5 is marked as purge or if it's never been installed (closes:
+ #386831).
- + debian/control: removed apache-utils version and added alternative
- apache2-utils (that provide the virtual apache-utils package) (closes:
- #361277)
- + debian/tomcat5.init: added Sun's jdk path as provided by
- sun-java5-bin package (closes: #386394).
+ -- Arnaud Vandyck <[EMAIL PROTECTED]> Mon, 9 Oct 2006 16:36:25 +0200
- --
-
tomcat5.5 (5.5.17-1) unstable; urgency=low
* New upstream release.
Modified: trunk/tomcat5.5/debian/control
===================================================================
--- trunk/tomcat5.5/debian/control 2006-10-09 13:54:23 UTC (rev 2572)
+++ trunk/tomcat5.5/debian/control 2006-10-09 14:44:05 UTC (rev 2573)
@@ -9,8 +9,8 @@
Package: tomcat5.5
Architecture: all
-Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) |
java2-runtime, libtomcat5.5-java (>= ${Source-Version}), tomcat5.5-webapps (>=
${Source-Version}), tomcat5.5-admin (>= ${Source-Version}), adduser (>= 3.34),
apache2-utils | apache-utils | apache2-common, ecj-bootstrap
-Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk
+Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) |
java2-runtime, libtomcat5.5-java (>= ${Source-Version}), adduser (>= 3.34),
apache2-utils | apache-utils | apache2.2-common, ecj-bootstrap
+Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk,
tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version})
Description: Java Servlet 2.4 engine with JSP 2.0 support
Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
and JavaServer Pages (JSP) 2.0 specification from the Apache Jakarta project.
Modified: trunk/tomcat5.5/debian/tomcat5.5.default
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.default 2006-10-09 13:54:23 UTC (rev
2572)
+++ trunk/tomcat5.5/debian/tomcat5.5.default 2006-10-09 14:44:05 UTC (rev
2573)
@@ -1,6 +1,6 @@
-# Run Tomcat 5 as this user ID (default: tomcat5.5). Set this to an empty
string
+# Run Tomcat 5 as this user ID (default: tomcat55). Set this to an empty string
# to prevent Tomcat from starting.
-#TOMCAT5_USER=tomcat5.5
+#TOMCAT5_USER=tomcat55
# The home directory of the Java development kit (JDK). You need at least
# JDK version 1.4. If JAVA_HOME is not set, some common directories for
Modified: trunk/tomcat5.5/debian/tomcat5.5.init
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.init 2006-10-09 13:54:23 UTC (rev
2572)
+++ trunk/tomcat5.5/debian/tomcat5.5.init 2006-10-09 14:44:05 UTC (rev
2573)
@@ -16,7 +16,7 @@
# The following variables can be overwritten in $DEFAULT
# Run Tomcat 5 as this user ID
-TOMCAT5_USER=tomcat5
+TOMCAT5_USER=tomcat55
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
Modified: trunk/tomcat5.5/debian/tomcat5.5.postinst
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.postinst 2006-10-09 13:54:23 UTC (rev
2572)
+++ trunk/tomcat5.5/debian/tomcat5.5.postinst 2006-10-09 14:44:05 UTC (rev
2573)
@@ -2,12 +2,12 @@
case "$1" in
configure)
- if ! id tomcat5 > /dev/null 2>&1 ; then
+ if ! id tomcat55 > /dev/null 2>&1 ; then
adduser --system --home /usr/share/tomcat5.5 --no-create-home \
--ingroup nogroup --disabled-password --shell /bin/false \
- tomcat5
+ tomcat55
fi
- chown tomcat5:adm /var/log/tomcat5.5 /var/cache/tomcat5.5 \
+ chown tomcat55:adm /var/log/tomcat5.5 /var/cache/tomcat5.5 \
/var/lib/tomcat5.5/conf
chmod 750 /var/log/tomcat5.5 /var/lib/tomcat5.5/conf
chmod 700 /var/cache/tomcat5.5
@@ -19,7 +19,7 @@
fi
if [ ! -f /var/lib/tomcat5.5/conf/tomcat-users.xml ]; then
echo "Installing /var/lib/tomcat5.5/conf/tomcat-users.xml."
- install -o tomcat5 -g adm -m 600 \
+ install -o tomcat55 -g adm -m 600 \
/usr/share/tomcat5.5/.debian/tomcat-users.xml \
/var/lib/tomcat5.5/conf/
fi
Modified: trunk/tomcat5.5/debian/tomcat5.5.postrm
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.postrm 2006-10-09 13:54:23 UTC (rev
2572)
+++ trunk/tomcat5.5/debian/tomcat5.5.postrm 2006-10-09 14:44:05 UTC (rev
2573)
@@ -9,14 +9,21 @@
purge)
# Remove user and log files (don't remove everything under
# /var/lib/tomcat5.5 because there might be user-installed webapps)
- userdel tomcat5.5 || true
- rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 /var/lib/tomcat5.5/conf
+ userdel tomcat55 || true
+ rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 /var/lib/tomcat5.5/conf
rm -f /var/lib/tomcat5.5/webapps/ROOT/WEB-INF/web.xml
rmdir --ignore-fail-on-non-empty \
/var/lib/tomcat5.5/webapps/ROOT/WEB-INF \
/var/lib/tomcat5.5/webapps/ROOT /var/lib/tomcat5.5/webapps \
/var/lib/tomcat5.5 2>/dev/null || true
rmdir --ignore-fail-on-non-empty /etc/tomcat5.5/policy.d /etc/tomcat5.5
+ # remove user tomcat5 if package tomcat5 is
+ # mardek as purged or has never been installed
+ if [ -n "$(dpkg -l tomcat5 | grep pn)" -o -n "$(dpkg -l tomcat5 | grep un)" ]
+ then
+ userdel tomcat55 || true
+ fi
+
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
