Ship back htaccess since it is needed to set some php_value

diff --git a/debian/changelog b/debian/changelog
index dfd65bc415c3bfd2ba005abe691a7219773b5420..98b46edb995ae9436c5e04e2fb065ce9cef92876 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ roundcube (0.3-1) UNRELEASED; urgency=low
     change. Thanks to Richard van den Berg for noticing this. Closes: #544579.
   * Depends on libjs-jquery (>= 1.3) since this is now used by roundcube.
   * Don't ship any plugins for now but ship an empty plugins directory.
+  * Ship main .htaccess since it is needed to setup correctly PHP (for
+    example, to disable PHP Suhosin cookie encryption).
 
  -- Vincent Bernat <bernat@debian.org>  Wed, 16 Sep 2009 22:32:29 +0200
 

diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
index 79e3d41b7df6e336d2960ac9d202a5aa29c90f2e..f4befee5512ec542e394d860f2b216991d9882e7 100644 (file)
--- a/debian/conf/apache.conf
+++ b/debian/conf/apache.conf
@@ -12,10 +12,12 @@
 </Directory>
 
 <Directory /var/lib/roundcube/>
-        Options +FollowSymLinks
-        AllowOverride All
-        order allow,deny
-        allow from all
+  Options +FollowSymLinks
+  # This is needed to parse /var/lib/roundcube/.htaccess. See its
+  # content before setting AllowOverride to None.
+  AllowOverride All
+  order allow,deny
+  allow from all
 </Directory>
 
 # Protecting basic directories:

diff --git a/debian/conf/lighttpd.conf b/debian/conf/lighttpd.conf
index 38c43d4bcde04639d392346a81f39a38b44ef6cb..46a12ae3462e29d597c2c376941100768df77d60 100644 (file)
--- a/debian/conf/lighttpd.conf
+++ b/debian/conf/lighttpd.conf
@@ -2,6 +2,9 @@
 # virtual host configuration. Do not forget to adapt the rest of the
 # configuration.
 
+# Look at /var/lib/roundcube/.htaccess. You may need to migrate some
+# of those php_flag/php_value to your setup.
+
 alias.url += ("/roundcube/program/js/tiny_mce" => "/usr/share/tinymce/www")
 alias.url += ("/roundcube" => "/var/lib/roundcube")
 

diff --git a/debian/roundcube-core.install b/debian/roundcube-core.install
index 7d1a04bb66fb1aff1b68b86f3465c99b82e57de4..ddeac9e97063bfc7d6a14cece39147e0307a85e2 100644 (file)
--- a/debian/roundcube-core.install
+++ b/debian/roundcube-core.install
@@ -1,4 +1,4 @@
-robots.txt index.php program/ bin/ usr/share/roundcube
+robots.txt index.php .htaccess program/ bin/ usr/share/roundcube
 skins temp var/lib/roundcube
 plugins/filesystem_attachments var/lib/roundcube/plugins
 debian/conf/* etc/roundcube

diff --git a/debian/rules b/debian/rules
index c76a5097753c32f2ac8f66b6cb9e8484b31fc5d6..752ed663cddf2f233756252bd6881cfae8d5931b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,6 @@ binary-install/roundcube-core::
        # Remove useless file
        rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/*.sh
        find $(CURDIR)/debian/roundcube-core -name '._*' -print0 | xargs -r0 rm
-       find $(CURDIR)/debian/roundcube-core -name '.htaccess' -print0 | xargs -r0 rm
        find $(CURDIR)/debian/roundcube-core -name '*.js.src' -print0 | xargs -r0 rm
        # Remove files shipped in tinymce package
        rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce