[Pkg-owncloud-commits] [owncloud] 108/111: Move fullcalendar to apps/calendar

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit c7312d7c242f6f29220a681f71de1e1de5ed3788
Author: David Prévot <taffit at debian.org>
Date:   Wed Nov 20 15:41:49 2013 -0400

    Move fullcalendar to apps/calendar
---
 debian/copyright |    1 +
 debian/install   |    1 -
 debian/rules     |    8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 777f750..c8df3f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -261,6 +261,7 @@ License: OFL
  OTHER DEALINGS IN THE FONT SOFTWARE.
 
 Files: 3rdparty/fullcalendar/*
+       apps/calendar/3rdparty/fullcalendar/*
 Copyright: 2009, 2013, Adam Shaw
 License: Expat or GPL-2
 
diff --git a/debian/install b/debian/install
index 35f46ef..ea975ac 100644
--- a/debian/install
+++ b/debian/install
@@ -13,7 +13,6 @@ themes		var/lib/owncloud
 3rdparty/PHPExcel/Classes	usr/share/owncloud/3rdparty/PHPExcel
 3rdparty/Pimple			usr/share/owncloud/3rdparty
 3rdparty/doctrine/dbal/lib	usr/share/owncloud/3rdparty/doctrine/dbal
-3rdparty/fullcalendar		usr/share/owncloud/3rdparty
 3rdparty/js/md5/md5.js		usr/share/owncloud/3rdparty/js/md5
 3rdparty/openid			usr/share/owncloud/3rdparty
 3rdparty/phpass			usr/share/owncloud/3rdparty
diff --git a/debian/rules b/debian/rules
index c09e1f0..674772e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_dh_install:
 	# Remove redundant license files as it is already captured in debian/copyright.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/MIT-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
-	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
+	rm debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/COPYING-README
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/css/DroidSansMono/Google\ Android\ License.txt
@@ -64,7 +64,7 @@ override_dh_install:
 
 	# Minify JavaScript files.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/js/jquery.Jcrop.min.js
-	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js
+	rm debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/activity/js/jquery.infinitescroll.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
 	rm debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/webodf/dojo-amalgamation.js
@@ -77,8 +77,8 @@ override_dh_install:
 		debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/js/jquery.Jcrop.min.js \
 		debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/js/jquery.Jcrop.js
 	uglifyjs -o \
-		debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js \
-		debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js
+		debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.min.js \
+		debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.js
 	uglifyjs -o \
 		debian/owncloud/usr/share/owncloud/3rdparty/js/md5/md5.min.js \
 		debian/owncloud/usr/share/owncloud/3rdparty/js/md5/md5.js

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git