[libembperl-perl] 01/01: Don't try to enable mod_perl upon libembperl-perl installation

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository libembperl-perl.

commit c8a322b285c09b2dc9807f990b4c4c33b2095fa2
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Jan 14 01:49:57 2016 +0100

    Don't try to enable mod_perl upon libembperl-perl installation
    
    When libapache2-mod-perl2 is being installed, it enables mod_perl by
    default. This also is the case if pulled in by libembperl-perl via
    Recommends.
    
    So if libapache2-mod-perl2 but not enabled, that's a local
    administrator decision which should be honoured (and actually is
    honoured by apache2_invoke, so the removed lines were defacto a no-op
    anyways).
    
    Closes: #810655 (properly and with minimal changes)
---
 debian/changelog                | 5 ++---
 debian/libembperl-perl.postinst | 6 ------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8306fa1..b58d133 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,8 @@ libembperl-perl (2.5.0-5) UNRELEASED; urgency=medium
 
   * debian/rules: use find -perm /xxx instead of +xxx.
     Thanks to Andreas Metzler for the bug report. (Closes: #803024)
-  * Drop hard a2enmod dependency on mod_perl in zembperl.load, call
-    "apache2_invoke perl" in postinst if mod_perl seems
-    installed. (Closes: #810655)
+  * Drop hard a2enmod dependency on mod_perl in zembperl.load. mod_perl is
+    enabled by default anyways if installed. (Closes: #810655)
 
  -- gregor herrmann <gregoa at debian.org>  Thu, 29 Oct 2015 22:29:31 +0100
 
diff --git a/debian/libembperl-perl.postinst b/debian/libembperl-perl.postinst
index 9ce3aee..3223cfd 100644
--- a/debian/libembperl-perl.postinst
+++ b/debian/libembperl-perl.postinst
@@ -11,17 +11,11 @@ if [ "$1" = "configure" ]; then
         # mod_embperl is not thread-safe, requires the prefork MPM
         if [ $(a2query -M) != 'prefork' ] ; then
             if apache2_switch_mpm prefork ; then
-                if [ -e /etc/apache2/mods-available/perl.load ]; then
-                    apache2_invoke enmod perl
-                fi
                 apache2_invoke enmod zembperl
             else
                 apache2_msg err "Could not switch to prefork, not enabling mod_embperl (you must use cgi or offline mode to use Embperl)"
             fi
         else
-            if [ -e /etc/apache2/mods-available/perl.load ]; then
-                apache2_invoke enmod perl
-            fi
             apache2_invoke enmod zembperl
         fi
     fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libembperl-perl.git