From fea4796b5c5e36a420008d53a5ce1c9efc08700f Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 12 Jan 2015 17:11:07 -0800 Subject: [PATCH] debian/gitweb: apache configuration requires mod_mime A configuration without mod_mime enabled fails to load: apache2_invoke: Enable configuration gitweb apache2_reload: Your configuration is broken. Not reloading Apache 2 apache2_reload: AH00526: Syntax error on line 15 of /etc/apache2/conf-enabled/gitweb.conf: apache2_reload: Invalid command 'AddHandler', perhaps misspelled or defined by a module not included in the server configuration Declare the dependency on mod_mime so the /gitweb site can be automatically disabled when mod_mime is disabled. Reported-by: Uwe Storbeck Signed-off-by: Jonathan Nieder --- debian/changelog | 2 ++ debian/gitweb.apache2.conf | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7df4eaf696..77db44857a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ git (1:2.1.4-2.1) unstable; urgency=medium to satisfy dependencies while the trigger is pending (thx Niels Thykier and Guillem Jover; closes: #774607). * gitweb: Pre-Depends: dpkg 1.16.1 for -noawait support. + * gitweb.apache2.conf: make configuration conditional on MIME + support (thx Uwe Storbeck; closes: #775236). -- Jonathan Nieder Mon, 12 Jan 2015 16:59:45 -0800 diff --git a/debian/gitweb.apache2.conf b/debian/gitweb.apache2.conf index abd288abce..cb914bcffd 100644 --- a/debian/gitweb.apache2.conf +++ b/debian/gitweb.apache2.conf @@ -1,9 +1,11 @@ - - Define ENABLE_GITWEB - - - Define ENABLE_GITWEB + + + Define ENABLE_GITWEB + + + Define ENABLE_GITWEB + -- 2.11.4.GIT