[libembperl-perl] 01/01: Drop dep. on mod_perl in zembperl.load, enable mod_perl in postinst if present

[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 bfc7efa2f0f67124331cd2865eb579ce102bc2a2
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Jan 14 00:51:44 2016 +0100

    Drop dep. on mod_perl in zembperl.load, enable mod_perl in postinst if present
    
    This should still enable mod_perl by default if libembperl-perl +
    Recommends are installed, but should also works if
    libapache2-mod-perl2 is not installed (as it's only recommended).
    
    While I believe that this should work and fix #810655, I'm currently
    unable to test it in Sid or Stretch. So please verify that it's
    working before uploading.
---
 debian/changelog                | 6 ++++++
 debian/libembperl-perl.postinst | 6 ++++++
 debian/zembperl.load.in         | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e9e94ed..eee7c5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 libembperl-perl (2.5.0-5) UNRELEASED; urgency=medium
 
+  TODO: Fix for #810655 is currently untested. Please verify before
+    uploading. Thanks, Axel.
+
   * 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)
 
  -- 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 3223cfd..9ce3aee 100644
--- a/debian/libembperl-perl.postinst
+++ b/debian/libembperl-perl.postinst
@@ -11,11 +11,17 @@ 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
diff --git a/debian/zembperl.load.in b/debian/zembperl.load.in
index ce9542b..91bb120 100644
--- a/debian/zembperl.load.in
+++ b/debian/zembperl.load.in
@@ -1,6 +1,6 @@
 # The sucky "zembperl" name is so we load after perl
 
-# Depends: perl
+# Recommends: perl
 
 <IfModule mod_perl.c>
   LoadModule embperl_module @ARCHLIB@/auto/Embperl/Embperl.so

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