[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-76-g3f3fe82
Paul van Tilburg
paulvt at debian.org
Sat May 19 18:56:25 UTC 2012
The following commit has been merged in the master branch:
commit 3f3fe8212d9678ad2493503b95c27ced93d1d8a0
Author: Paul van Tilburg <paulvt at debian.org>
Date: Sat May 19 20:56:22 2012 +0200
Several updates for new upstream release
diff --git a/debian/config/apache/htaccess b/debian/config/apache/htaccess
index 358537f..ffb45c1 100644
--- a/debian/config/apache/htaccess
+++ b/debian/config/apache/htaccess
@@ -1,9 +1,5 @@
ErrorDocument 403 /owncloud/core/templates/403.php
ErrorDocument 404 /owncloud/core/templates/404.php
-Redirect 301 /owncloud/apps/calendar/caldav.php /owncloud/remote.php/caldav/
-Redirect 301 /owncloud/apps/contacts/carddav.php /owncloud/remote.php/carddav/
-Redirect 301 /owncloud/apps/files/webdav.php /owncloud/remote.php/webdav/
-Redirect 301 /owncloud/files/webdav.php /owncloud/remote.php/webdav/
<IfModule mod_php5.c>
php_value upload_max_filesize 512M
php_value post_max_size 512M
@@ -18,6 +14,8 @@ RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteRule ^/owncloud/.well-known/host-meta /owncloud/public.php?service=host-meta [QSA,L]
RewriteRule ^/owncloud/.well-known/carddav /owncloud/remote.php/carddav/ [R]
RewriteRule ^/owncloud/.well-known/caldav /owncloud/remote.php/caldav/ [R]
+RewriteRule ^/owncloud/apps/calendar/caldav.php /owncloud/remote.php/caldav/ [QSA,L]
+RewriteRule ^/owncloud/apps/contacts/carddav.php /owncloud/remote.php/carddav/ [QSA,L]
RewriteRule ^/owncloud/apps/([^/]*)/(.*\.(css|php))$ /owncloud/index.php?app=$1&getfile=$2 [QSA,L]
RewriteRule ^/owncloud/remote/(.*) /owncloud/remote.php [QSA,L]
</IfModule>
diff --git a/debian/copyright b/debian/copyright
index 470b93b..7938a79 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -128,6 +128,39 @@ Copyright: 2010-2011, Francois Gelinas
License: Expat or GPL-2
Comment: Expat license referred to as MIT license
+Files: 3rdparty/timepicker/css/include/*.js (FIXME: missing source)
+Copyright: 2011, John Resig
+License: Expat or GPL
+Comment: Expat license referred to as MIT license
+
+Files: 3rdparty/timepicker/css/include/jquery.ui*.js (FIXME: missing source, contains Sizzle.js)
+Copyright: 2011, Paul Bakaus (ui.jquery.com)
+ Brandon Aaron
+ David Bolter
+ Rich Caloggero
+ Chi Cheng (cloudream at gmail.com)
+ Colin Clark (http://colin.atrc.utoronto.ca/)
+ Michelle D'Souza
+ Aaron Eisenberger (aaronchi at gmail.com)
+ Ariel Flesler
+ Bohdan Ganicky
+ Scott González
+ Marc Grabanski (m at marcgrabanski.com)
+ Klaus Hartl (stilbuero.de)
+ Scott Jehl
+ Cody Lindley
+ Eduardo Lundgren (eduardolundgren at gmail.com)
+ Todd Parker
+ John Resig
+ Patty Toland
+ Ca-Phun Ung (yelotofu.com)
+ Keith Wood (kbwood at virginbroadband.com.au)
+ Maggie Costello Wachs
+ Richard D. Worth (rdworth.org)
+ Jörn Zaefferer (bassistance.de)
+License: Expat or GPL-2
+Comment: Expat license referred to as MIT license
+
Files: 3rdparty/when/*
Copyright: 2010, Tomhas Planer <tplaner at gmail.com>
License: Expat
@@ -215,7 +248,7 @@ Copyright: 2010, Brandon Aaron
License: Expat
Comment: Expat license referred to as MIT license
-Files: apps/files_odfviewer/js/webodf.js
+Files: apps/files_odfviewer/js/webodf*.js
apps/files_odfviewer/src/webodf/*
Copyright: 2011, KO GmbH
License: AGPL-3+ with HTML-reference exception
diff --git a/debian/rules b/debian/rules
index c927f0b..e53606a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ override_dh_install:
rm -r debian/owncloud/usr/share/owncloud/3rdparty/PEAR/ # php-pear
rm -r debian/owncloud/usr/share/owncloud/3rdparty/Sabre # php-sabre (not yet)
rm -r debian/owncloud/usr/share/owncloud/3rdparty/XML/ # php-xml-parser / php-xml-rpc
+ rm -r debian/owncloud/usr/share/owncloud/3rdparty/simpletest # not used
rm debian/owncloud/usr/share/owncloud/3rdparty/MDB2.php # php-mdb2
rm debian/owncloud/usr/share/owncloud/3rdparty/PEAR*.php # php-pear
rm debian/owncloud/usr/share/owncloud/3rdparty/Sabre.includes.php # php-sabre (not yet)
@@ -35,7 +36,6 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
rm debian/owncloud/usr/share/owncloud/3rdparty/getid3/license*.txt
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
- rm debian/owncloud/usr/share/owncloud/3rdparty/simpletest/LICENSE
rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/*-LICENSE.txt
rm debian/owncloud/usr/share/owncloud/3rdparty/when/MIT-LICENSE.txt
rm debian/owncloud/usr/share/owncloud/apps/calendar/img/Icon\ License
@@ -53,22 +53,21 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
rm debian/owncloud/usr/share/owncloud/core/img/filetypes/readme*.txt
rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
- rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
rm -r debian/owncloud/usr/share/owncloud/apps/files_archive/tests
rm -r debian/owncloud/usr/share/owncloud/apps/files_encryption/tests
rm -r debian/owncloud/usr/share/owncloud/apps/files_external/tests
+ rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
rm -r debian/owncloud/usr/share/owncloud/l10n/templates # translation templates are not needed to run the app
# Remove an unused scripts, source and minified JavaScript files.
rm -r debian/owncloud/usr/share/owncloud/3rdparty/phpass/c
rm debian/owncloud/usr/share/owncloud/3rdparty/phpass/test.php
- rm -r debian/owncloud/usr/share/owncloud/3rdparty/simpletest
rm -r debian/owncloud/usr/share/owncloud/3rdparty/timepicker/css/include
rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.inview.txt
rm -r debian/owncloud/usr/share/owncloud/apps/files_odfviewer/src
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 # not really of any use
+ rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl
# Minify JavaScript files and remove the source.
rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
@@ -109,11 +108,3 @@ override_dh_fixperms:
dh_fixperms -X var/lib/owncloud
chown www-data:www-data debian/owncloud/var/lib/owncloud/data/
chmod 2770 debian/owncloud/var/lib/owncloud/data/
- chmod -x debian/owncloud/usr/share/owncloud/3rdparty/when/When.php
- find debian/owncloud/usr/share/owncloud/apps -type f -exec chmod -x {} \;
- chmod -x debian/owncloud/usr/share/owncloud/core/css/jquery-ui*.css
- chmod -x debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel*.js
- chmod -x debian/owncloud/usr/share/owncloud/lib/archive/tar.php
- chmod -x debian/owncloud/usr/share/owncloud/lib/archive/zip.php
- chmod -x debian/owncloud/usr/share/owncloud/settings/img/log.svg
- chmod -x debian/owncloud/usr/share/owncloud/settings/personal.php
--
owncloud.git
More information about the Pkg-owncloud-commits
mailing list