[open-ils-commits] [GIT] Evergreen ILS branch master updated. ad879d442931b33492cfbba07c5aad81a0ac5528

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  ad879d442931b33492cfbba07c5aad81a0ac5528 (commit)
       via  b94920234dc651652aee67955e4d633d04949eae (commit)
      from  3200c8d1282f9aa2d4be1454540be130a5369120 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ad879d442931b33492cfbba07c5aad81a0ac5528
Author: Josh Stompro <stomproj at larl.org>
Date:   Thu Apr 16 11:21:13 2015 -0500

    LP#1362260 - Email::Sender/libemail-send-perl change in Jessie
    
    libemail-send-perl no longer exists in Debian Jessie.  Change
    Makefile.debian-jessie to install cpan version instead of
    debian package.
    
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 83fbb97..862fde7 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-jessie
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -32,7 +32,6 @@ export DEBS = \
 	libdatetime-set-perl\
 	libdatetime-timezone-perl\
 	libdbd-pg-perl\
-	libemail-send-perl\
 	libemail-simple-perl\
 	libgd-graph3d-perl\
 	liblocale-maketext-lexicon-perl\
@@ -81,7 +80,8 @@ export DEB_APACHE_DISMODS = \
 export CPAN_MODULES = \
 	Business::OnlinePayment::PayPal \
 	Template::Plugin::POSIX \
-	Safe
+	Safe \
+	Email::Send
 
 export CPAN_MODULES_FORCE = \
 	Business::Stripe \

commit b94920234dc651652aee67955e4d633d04949eae
Author: Josh Stompro <stomproj at larl.org>
Date:   Thu Apr 16 14:55:25 2015 -0500

    LP#1445187 - Force disable of deflate
    
    Add the -f (force) flag to a2dismod to remove the chance of getting
    a confirmation prompt when removing deflate.
    
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian
index 8f6c499..4c0ee13 100644
--- a/Open-ILS/src/extras/install/Makefile.debian
+++ b/Open-ILS/src/extras/install/Makefile.debian
@@ -45,7 +45,7 @@ debian_sys_config:
 	# link the apache modules in
 	for m in $(DEB_APACHE_MODS); do a2enmod $$m; done;
 	# keep the bad apache modules away
-	for m in $(DEB_APACHE_DISMODS); do a2dismod $$m; done;
+	for m in $(DEB_APACHE_DISMODS); do a2dismod -f $$m; done;
 	# keep the bad apache configs away
 	for m in $(DEB_APACHE_DISCONF); do a2disconf $$m; done;
 	# refresh the dynamic library cache

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/install/Makefile.debian        |    2 +-
 Open-ILS/src/extras/install/Makefile.debian-jessie |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS