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

diff --git a/Changes b/Changes
index 61946a6da13ef31eed3c300201c8398ca80752e2..f72b901a4b0d538c91cf0a6b5a1462c2db3d0b22 100644 (file)
--- 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 dcbc89da496c17e31cba130425aed381e632688e..85690f5dd990af1139f2990d549295f575952993 100644 (file)
--- 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 b2d467beb620c161d261d3418322364839c4e533..fdb6aba3a2ce928713a84751b6eb392fddea9a74 100644 (file)
--- 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 <don@debian.org>  Wed, 28 Sep 2011 12:34:55 -0700
 

diff --git a/htdocs/text-html.png b/htdocs/text-html.png
new file mode 100644 (file)
index 0000000..63f3c95
Binary files /dev/null and b/htdocs/text-html.png differ

diff --git a/htdocs/text-txt.png b/htdocs/text-txt.png
new file mode 100644 (file)
index 0000000..bfe4bad
Binary files /dev/null and b/htdocs/text-txt.png differ

diff --git a/lib/Apache/Gallery.pm b/lib/Apache/Gallery.pm
index 8826d4a4e1ed553de2ce223f21a469e9f7c93fe4..6e62182ff1cb3ac538792eb0ba7f988b2c6ad168 100644 (file)
--- 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<GalleryTTFDir>