[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/3.0.3-42-ga494a4c

[Thomas Mueller]

The following commit has been merged in the master branch:
commit a494a4c5a44c7626f83458670fe758f39f24c887
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Sat May 12 21:08:41 2012 +0200

    some todos marked as done upstream + removing textfiles

diff --git a/debian/TODO b/debian/TODO
index a75b194..bd9d76d 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -2,6 +2,7 @@
 * get non-minified version for:
   - apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
   - apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
+  [fixed upstream for OC4 - patch to OC3 will follow]
 * build pdf.js based on source contained and remove the source
 * files_texteditor: 
   - minify js
@@ -14,11 +15,10 @@
   but erroneously containing text about having the same license as SabreDAV
 * write patch to prefent installation of 3rd party apps via the internet, 
   because this is risky. Bad code can be injected.
-* remove 3rdparty/fullcalendar/changelog.txt
 * 3rdparty/timepicker/css/include/ contains jquery lib - analyse it and removeAllListeners
-* remove 3rdparty/timepicker/releases.txt
 * apps/contacts/js/jquery.inview.txt - copyright and remove
 * apps/media/getID3/ - read all *.txt - respect copyright and dependencies
 * blame apps/remoteStorage/oauth_ro_auth.php - correct file header
+  [done for UC4 - fixed upstream]
 
 
diff --git a/debian/rules b/debian/rules
index 1edcb62..7a01691 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,10 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/media/getID3/license*.txt
 	rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
 
+	# remove other stuff
+	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
+	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/changelog.txt
+
 	# Remove an unused script and minified JavaScript files.
 	rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl # not really of any useScriptTags
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.6.4.min.js
@@ -52,7 +56,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js
-	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/changelog.txt
 
 	# Minify ace in app_texteditor
 	find debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor -type f | grep -v 'ace-uncompressed' | xargs -exec rm

-- 
owncloud.git