diff options
| author | Julien Valroff <julien@kirya.net> | 2010-08-18 10:13:45 +0200 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2010-08-18 10:13:45 +0200 |
| commit | f670126ff78e9c38088530793adb6895911a5032 (patch) | |
| tree | b7762e04dff4e0216145a06ddc778f09df1c6515 | |
| parent | b8efa8bc85b3bea8bc2aed9a09701cf8003b0b89 (diff) | |
Add the CSS directly into the CGI
| -rw-r--r-- | debian/README.Debian | 19 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/mailgraph.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 5 |
4 files changed, 7 insertions, 23 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index b49be51..f170614 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -22,24 +22,5 @@ Note for Lighttpd users: /etc/lighttpd/conf-available/50-mailgraph.conf -Note for Apache users: - - The default configuration of the Debian Apache packages is so that - everything in /usr/lib/cgi-bin will be handled as executable/CGI script. - - This leads to internal errors, eg: - (13)Permission denied: exec of '/usr/lib/cgi-bin/mailgraph.css' failed - Premature end of script headers: mailgraph.css - - To avoid this, you might want to add a handler to your configuration, eg: - AddHandler cgi-script .cgi - - This means only files with a .cgi extension are handled as executable/CGI scripts. - You can obviously add other extensions required by your configuration. - - The AddHandler requires mod_mime to be enabled. See the official Apache documentation - for more information: http://httpd.apache.org/docs/2.2/mod/mod_mime.html#addhandler - - -- Norbert Tretkowski <nobse@debian.org> Thu, 25 Dec 2003 23:50:13 +0100 -- Julien Valroff <julien@kirya.net> Fri, 17 Aug 2010 22:18:13 +0200 diff --git a/debian/changelog b/debian/changelog index 9370d3b..c1d66ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ mailgraph (1.14-4) unstable; urgency=low * Recommend apache2 instead of apache - * Explain in README.Debian how to avoid internal errors - when running Apache with the default configuration (Closes: #513527) + * Add the CSS directly into the CGI script (Closes: #513527) - -- Julien Valroff <julien@kirya.net> Tue, 17 Aug 2010 22:25:55 +0200 + -- Julien Valroff <julien@kirya.net> Wed, 18 Aug 2010 10:13:23 +0200 mailgraph (1.14-3) unstable; urgency=low diff --git a/debian/mailgraph.install b/debian/mailgraph.install index 68ca8c3..14f1685 100644 --- a/debian/mailgraph.install +++ b/debian/mailgraph.install @@ -1,3 +1,2 @@ mailgraph usr/sbin mailgraph.cgi usr/lib/cgi-bin -mailgraph.css usr/lib/cgi-bin diff --git a/debian/rules b/debian/rules index 76a9cb2..0e8172f 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,12 @@ override_dh_auto_configure: ln mailgraph.pl mailgraph + cp -f -a mailgraph.cgi mailgraph.cgi.orig + sed -e 's/^<link rel="stylesheet" href="mailgraph.css" type="text\/css" \/>$/<style type="text\/css\">/' \ + -e '/<style type="text\/css">/r mailgraph.css' \ + -e '/<\/head>/i <\/style>' mailgraph.cgi override_dh_auto_clean: rm -f mailgraph + mv -f mailgraph.cgi.orig mailgraph.cgi dh_auto_clean |