← Back to branch summary

~ttx/tomcat6/lucid-sru

« back to all changes in this revision

Viewing changes to debian/tomcat6.postrm

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez, Thierry Carrez, Niels Thykier, Ludovic Claude
  • Date: 2010-03-31 10:47:51 UTC
  • Revision ID: james.westby@ubuntu.com-20100331104751-b6fie3ajlyvpawgz
Tags: 6.0.24-2ubuntu1
https://launchpad.net/bugs/541520
http://bugs.debian.org/574084
http://bugs.debian.org/567548
http://bugs.debian.org/573539
https://launchpad.net/bugs/495505
[ Thierry Carrez ]
* Uploading what 6.0.24-5 should be (upload is blocked in Debian due to
  current infrastructure issues), in order to meet Beta2Freeze.

[ Niels Thykier ]
* Added optimised garbage collection options to tomcat6's default options.
  Thanks to Aaron J. Zirbes and Thierry Carrez for research and the patch.
  (Closes: LP: #541520)
* Updated the changelog to mention closed CVE's in the 6.0.24-1 release.
* Applied patch from Arto Jantunen fixing an issue with cleaning up the
  pid-file. (Closes: #574084)

[ Ludovic Claude ]
* debian/tomcat6.postrm: fix removal of Tomcat (Closes: #567548)
* Set UTF-8 as default character encoding - Patch by Thomas Koch
  (Closes: #573539)
* Set the major, minor and build versions when calling Ant
  (Closes: LP: #495505)
* Rebuild with a more recent version of maven-repo-helper which puts
  the javax jars at the correct location in the Maven repository.
  Fixes several FTBFS in other packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/tomcat6.postrm
20
20
                /var/lib/tomcat6/webapps \
21
21
                /var/lib/tomcat6 || true
22
22
        fi
23
 
        if [ -z "`(find var/lib/tomcat6/common/classes -type f)`" ] ; then
 
23
        if [ -d /var/lib/tomcat6/common ] && [ -z "`(find var/lib/tomcat6/common/classes -type f)`" ] ; then
24
24
            rmdir --ignore-fail-on-non-empty \
25
25
                /var/lib/tomcat6/common/classes \
26
26
                /var/lib/tomcat6/common || true
27
27
        fi
28
 
        if [ -z "`(find var/lib/tomcat6/server/classes -type f)`" ] ; then
 
28
        if [ -d /var/lib/tomcat6/server ] && [ -z "`(find var/lib/tomcat6/server/classes -type f)`" ] ; then
29
29
            rmdir --ignore-fail-on-non-empty \
30
30
                /var/lib/tomcat6/server/classes \
31
31
                /var/lib/tomcat6/server || true
32
32
        fi
33
 
        if [ -z "`(find var/lib/tomcat6/shared/classes -type f)`" ] ; then
 
33
        if [ -d /var/lib/tomcat6/shared ] && [ -z "`(find var/lib/tomcat6/shared/classes -type f)`" ] ; then
34
34
            rmdir --ignore-fail-on-non-empty \
35
35
                /var/lib/tomcat6/shared/classes \
36
36
                /var/lib/tomcat6/shared || true
41
41
    ;;
42
42
 
43
43
    purge)
 
44
        rm -rf /var/log/tomcat6 /var/lib/tomcat6/temp
 
45
        if [ -d "/var/lib/tomcat6" ] ; then
 
46
            rmdir --ignore-fail-on-non-empty /var/lib/tomcat6 || true
 
47
        fi
 
48
        rmdir --ignore-fail-on-non-empty /etc/tomcat6/policy.d \
 
49
          /etc/tomcat6/Catalina/localhost /etc/tomcat6/Catalina /etc/tomcat6 || true
 
50
                # Put all files owned by group tomcat6 back into root group before deleting
 
51
                # the tomcat6 user and group
 
52
                chown -Rh root:root /etc/tomcat6/
44
53
        # Remove user/group and log files (don't remove everything under
45
54
        # /var/lib/tomcat6 because there might be user-installed webapps)
46
55
        deluser tomcat6 || true
47
 
        rm -rf /var/log/tomcat6 /var/lib/tomcat6/temp
48
 
        if [ -d "/var/lib/tomcat6" ] ; then
49
 
            rmdir --ignore-fail-on-non-empty /var/lib/tomcat6 || true
50
 
        fi
51
 
        rmdir --ignore-fail-on-non-empty /etc/tomcat6/policy.d /etc/tomcat6 || true
 
56
        delgroup tomcat6 || true
52
57
    ;;
53
58
 
54
59
    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)