[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.0debian-1-7-ga1d5ee6

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit a1d5ee64e8451b278eda1f93741374b370266fab
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri May 25 12:07:04 2012 +0200

    Have the theme dir solely in /var/lib/owncloud/themes; added README explanation

diff --git a/debian/owncloud.README.Debian b/debian/owncloud.README.Debian
index fb28d50..2f825ab 100644
--- a/debian/owncloud.README.Debian
+++ b/debian/owncloud.README.Debian
@@ -34,6 +34,12 @@ For the moment, you cannot override this behaviour by setting the
 writable by the ownCloud web application as the contents of
 /usr/share/owncloud/apps are part of this Debian package.
 
+Theming
+-------
+
+Themes can be dropped in /var/lib/owncloud/themes and then enabled through
+the admin interface.  See also /var/lib/owncloud/themes/README.
+
 Running on specific/single virtual host(s)
 ------------------------------------------
 
diff --git a/debian/owncloud.dirs b/debian/owncloud.dirs
index c42a86d..b9cb776 100644
--- a/debian/owncloud.dirs
+++ b/debian/owncloud.dirs
@@ -1,2 +1,3 @@
 /var/lib/owncloud/data
 /var/lib/owncloud/backup
+/var/lib/owncloud/themes
diff --git a/debian/owncloud.install b/debian/owncloud.install
index 5fd082e..b21e359 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -11,4 +11,5 @@ ocs /usr/share/owncloud
 search /usr/share/owncloud
 settings /usr/share/owncloud
 status.php /usr/share/owncloud
+themes/* /var/lib/owncloud/themes
 debian/config/apache/owncloud.conf /etc/apache2/conf.d
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 09c51a5..bc18483 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -12,7 +12,6 @@ usr/share/owncloud/remote.php var/lib/owncloud/remote.php
 usr/share/owncloud/search var/lib/owncloud/search
 usr/share/owncloud/settings var/lib/owncloud/settings
 usr/share/owncloud/status.php var/lib/owncloud/status.php
-usr/share/owncloud/themes var/lib/owncloud/themes
 usr/share/owncloud/webapps.php var/lib/owncloud/themes/webapps.php
 
 etc/owncloud var/lib/owncloud/config

-- 
owncloud.git