Rework how symlinks work. The only directory to use is

/var/lib/roundcube. We use symlink from /usr/share/roundcube to
/var/lib/roundcube and not the other way. Moreover, plugins and skins
are also symlinked. A user should be able to add plugins and skins in
/var/lib/roundcube while default ones are in
/usr/share/roundcube. Closes: #612553.

diff --git a/debian/changelog b/debian/changelog
index c5004c85d18327ce51852b011612ba610bed52b7..fd8d1af826d3fe1bf8c143c90a6c4921df73924d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ roundcube (0.5-3) UNRELEASED; urgency=low
     dbconfig-common. We do not ship UPGRADING file any more since it is
     misleading. Closes: #612511.
   * Fix MySQL indexes if upgrading from 0.5-2 or lesser. Closes: #610725.
+  * Rework how symlinks work. The only directory to use is
+    /var/lib/roundcube. We use symlink from /usr/share/roundcube to
+    /var/lib/roundcube and not the other way. Moreover, plugins and skins
+    are also symlinked. A user should be able to add plugins and skins in
+    /var/lib/roundcube while default ones are in
+    /usr/share/roundcube. Closes: #612553.
 
  -- Vincent Bernat <bernat@debian.org>  Wed, 09 Feb 2011 07:32:42 +0100
 

diff --git a/debian/roundcube-core.dirs b/debian/roundcube-core.dirs
index a008a6e149cd6ac9bf67722778828a19c6341231..0b78331c9e47ed26ea59d7d9539facf6339705ca 100644 (file)
--- a/debian/roundcube-core.dirs
+++ b/debian/roundcube-core.dirs
@@ -7,4 +7,6 @@ etc/roundcube
 var/log/roundcube
 var/lib/roundcube/config
 var/lib/roundcube/plugins
+var/lib/roundcube/skins
+var/lib/roundcube/temp
 etc/default

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

diff --git a/debian/roundcube-core.links b/debian/roundcube-core.links
index fa13d4300a49289630cb1deec82aedf4582294fe..11be6ca85742e078a78ed863035d8d2bae90c94d 100644 (file)
--- a/debian/roundcube-core.links
+++ b/debian/roundcube-core.links
@@ -1,8 +1,8 @@
 etc/roundcube/main.inc.php var/lib/roundcube/config/main.inc.php
-var/lib/roundcube/temp usr/share/roundcube/temp
-var/lib/roundcube/plugins usr/share/roundcube/plugins
-var/lib/roundcube/skins usr/share/roundcube/skins
-var/lib/roundcube/config usr/share/roundcube/config
+usr/share/roundcube/index.php var/lib/roundcube/index.php
+usr/share/roundcube/robots.txt var/lib/roundcube/robots.txt
+usr/share/roundcube/program var/lib/roundcube/program
+usr/share/roundcube/skins/default var/lib/roundcube/skins/default
+usr/share/roundcube/plugins/filesystem_attachments var/lib/roundcube/plugins/filesystem_attachments
 var/log/roundcube var/lib/roundcube/logs
-var/lib/roundcube/logs usr/share/roundcube/logs
 usr/share/roundcube/main.inc.php.dist usr/share/doc/roundcube/main.inc.php.dist

diff --git a/debian/rules b/debian/rules
index e7322f5d708077c22450870791aa8f8b3474c539..49ef123b5624e3fd7fa87998910e8a2f7ff44775 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,17 +5,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG
 
 binary-install/roundcube-core::
-       # Remove plugins
-       rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/plugins
-
-       # Symlink all that is in /usr/share/roundcube to /var/lib/roundcube
-       find debian/roundcube-core/usr/share/roundcube -maxdepth 1 -mindepth 1 | \
-       while read i; do \
-               if [ ! -L "$$i" ]; then \
-                 dh_link -proundcube-core "`echo "$$i" | sed -e s#debian/roundcube-core/##`" \
-                 "`echo "$$i" | sed -e s#debian/roundcube-core/usr/share/roundcube/#var/lib/roundcube/#`"; \
-               fi \
-       done
        # Install config files
        install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube-core/etc/roundcube/db.inc.php
        install -m 0640 $(CURDIR)/config/main.inc.php.dist $(CURDIR)/debian/roundcube-core/usr/share/roundcube