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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 2c880551a3409b69efc98890fc9a64dbb0410528
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue Jun 5 00:29:12 2012 +0200

    Removed redundant script; changed htaccess owner to www-data (for now)

diff --git a/debian/TODO b/debian/TODO
index d72c04c..b0280e7 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -17,3 +17,4 @@ ownCloud packaging TODO list
 * lib/MDB2/Driver contains the MDB2 SQLite3 driver that should be released
   separately, then packaged and used as depend for owncloud-sqlite.
 * Package more stuff under 3rdparty/ separately (php-cloudfiles, phpass, etc.)
+* Patch so that /etc/owncloud/htaccess doesn't need to be owned by www-data.
diff --git a/debian/rules b/debian/rules
index 5b311b6..4530c81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,7 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.7.2.min.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-ui-1.8.16.custom.min.js
 	rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl
+	rm debian/owncloud/usr/share/owncloud/l10n/init.sh
 
 	# Minify JavaScript files and remove the source.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
@@ -105,6 +106,7 @@ override_dh_install:
 override_dh_fixperms:
 	dh_fixperms -X var/lib/owncloud
 	chown www-data:www-data debian/owncloud/etc/owncloud/
+	chown www-data:www-data debian/owncloud/etc/owncloud/htaccess
 	chown www-data:www-data debian/owncloud/var/lib/owncloud/data/
 	chmod 2770 debian/owncloud/var/lib/owncloud/data/
 	chown www-data:www-data debian/owncloud/var/lib/owncloud/backup/

-- 
owncloud.git