From: Don Armstrong Date: Tue, 2 Dec 2014 19:40:14 +0000 (+0000) Subject: Add changes from 1.0.2-3 X-Git-Tag: debian/1.0.2-5~12 X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Flibapache-gallery-perl.git;a=commitdiff_plain;h=c53d4d77fccfdd4da51b57d78d86e3347df79dfb Add changes from 1.0.2-3 git-svn-id: file:///srv/don_svn/deb_pkgs/libapache-gallery-perl/trunk@725 8f7917da-ec0b-0410-a553-b9b0e350d17e --- diff --git a/debian/libapache-gallery-perl.postinst b/debian/libapache-gallery-perl.postinst new file mode 100644 index 0000000..dc7b375 --- /dev/null +++ b/debian/libapache-gallery-perl.postinst @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +cachedir="/var/cache/www" +user="www-data" + +if [ "x$1" = "xconfigure" ]; then + if ! [ -d "$cachedir" ]; then + (mkdir "$cachedir" && chown "$user" "$cachedir") || exit 0; + fi; +fi; + + +#DEBHELPER# diff --git a/lib/Apache/Gallery.pm b/lib/Apache/Gallery.pm index c9a78d2..10b4381 100644 --- a/lib/Apache/Gallery.pm +++ b/lib/Apache/Gallery.pm @@ -189,7 +189,8 @@ sub handler { unless ($doc_pattern) { $doc_pattern = '\.(mpe?g|avi|mov|asf|wmv|doc|mp3|mp4|ogg|pdf|rtf|wav|dlt|txt|html?|csv|eps)$' } - my $img_pattern = $r->dir_config('GalleryImgFile') unless ($img_pattern) { + my $img_pattern = $r->dir_config('GalleryImgFile'); + unless ($img_pattern) { $img_pattern = '\.(jpe?g|png|tiff?|ppm)$' } @@ -1832,7 +1833,10 @@ Pattern matching the files you want Apache::Gallery to view in the index as normal files. All other filetypes will still be served by Apache::Gallery but are not visible in the index. -The default is '\.(mpe?g|avi|mov|asf|wmv|doc|mp3|mp4|ogg|pdf|rtf|wav|dlt|txt|html?|csv|eps)$' +The default is + + '\.(mpe?g|avi|mov|asf|wmv|doc|mp3|mp4 + |ogg|pdf|rtf|wav|dlt|txt|html?|csv|eps)$' =item B