From 91a9327d180cd9ce4b064614ede66a8bed3574c1 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 28 Sep 2011 19:39:43 +0000 Subject: [PATCH] Allow txt files to be used as plain files (Closes: #423004); include icons which are now upstream. Thanks to Luca Capello. git-svn-id: file:///srv/don_svn/deb_pkgs/libapache-gallery-perl/trunk@561 8f7917da-ec0b-0410-a553-b9b0e350d17e --- Changes | 5 ----- README | 2 +- debian/changelog | 2 ++ htdocs/text-html.png | Bin 0 -> 3104 bytes htdocs/text-txt.png | Bin 0 -> 2855 bytes lib/Apache/Gallery.pm | 4 ++-- 6 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 htdocs/text-html.png create mode 100644 htdocs/text-txt.png diff --git a/Changes b/Changes index 61946a6..f72b901 100644 --- a/Changes +++ b/Changes @@ -3,11 +3,6 @@ $Date: 2011-02-22 21:56:06 +0100 (Tue, 22 Feb 2011) $ Revision history for Perl extension Apache::Gallery. -1.0.2~1 Tue Mar 15 03:08:57 CET 2011 - - - Extended GalleryUnderscoresToSpaces to filenames as well. - (Debian bug #348724, Francesco Potortì) - 1.0.1 Wed Feb 23 20:45:38 CET 2011 - Added missing template files to MANIFEST diff --git a/README b/README index dcbc89d..85690f5 100644 --- a/README +++ b/README @@ -165,7 +165,7 @@ CONFIGURATION Apache::Gallery but are not visible in the index. The default is - '\.(mpe?g|avi|mov|asf|wmv|doc|mp3|ogg|pdf|rtf|wav|dlt|html?|csv|eps) + '\.(mpe?g|avi|mov|asf|wmv|doc|mp3|ogg|pdf|rtf|wav|dlt|txt|html?|csv|eps) $' GalleryTTFDir diff --git a/debian/changelog b/debian/changelog index b2d467b..fdb6aba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ libapache-gallery-perl (1.0.1-1) unstable; urgency=low * New upstream release * Change underscores to spaces for images too (Closes: #348724). Thanks to Francesco Portorti and Luca Capello. + * Allow txt files to be used as plain files (Closes: #423004); include + icons which are now upstream. Thanks to Luca Capello. -- Don Armstrong Wed, 28 Sep 2011 12:34:55 -0700 diff --git a/htdocs/text-html.png b/htdocs/text-html.png new file mode 100644 index 0000000000000000000000000000000000000000..63f3c9570c8ba21d675fb611f8709a1de573d9c9 GIT binary patch literal 3104 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 FV1jOyTQdLv literal 0 HcmV?d00001 diff --git a/lib/Apache/Gallery.pm b/lib/Apache/Gallery.pm index 8826d4a..6e62182 100644 --- a/lib/Apache/Gallery.pm +++ b/lib/Apache/Gallery.pm @@ -183,7 +183,7 @@ sub handler { my $doc_pattern = $r->dir_config('GalleryDocFile'); unless ($doc_pattern) { - $doc_pattern = '\.(mpe?g|avi|mov|asf|wmv|doc|mp3|ogg|pdf|rtf|wav|dlt|html?|csv|eps)$' + $doc_pattern = '\.(mpe?g|avi|mov|asf|wmv|doc|mp3|ogg|pdf|rtf|wav|dlt|txt|html?|csv|eps)$' } my $img_pattern = $r->dir_config('GalleryImgFile'); unless ($img_pattern) { @@ -1825,7 +1825,7 @@ 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|ogg|pdf|rtf|wav|dlt|html?|csv|eps)$' +The default is '\.(mpe?g|avi|mov|asf|wmv|doc|mp3|ogg|pdf|rtf|wav|dlt|txt|html?|csv|eps)$' =item B -- 2.39.2