[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-rc-76-gce30abe

[Thomas Mueller]

The following commit has been merged in the master branch:
commit ce30abe18c66a84ff8eeecda9f8865f039c68a29
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Sat May 19 20:26:30 2012 +0200

    New upstream 4.0.0

diff --git a/debian/TODO b/debian/TODO
index bee684d..63cbce9 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,7 +1,6 @@
 ownCloud packaging TODO list
 ============================
 
-* Build pdf.js based on source contained and remove the source.
 * Write patch to prevent installation of 3rd-party apps via the internet, 
   because this is risky. Bad code can be injected.
 
diff --git a/debian/changelog b/debian/changelog
index 3d35406..28d9d5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-owncloud (4.0.0~rc-1) UNRELEASED; urgency=low
+owncloud (4.0.0-1) UNRELEASED; urgency=low
 
   [ Thomas Mueller ]
-  * New upstream release 4.0.0-rc as of May 14th.
+  * New upstream release 4.0.0
 
   [ Paul van Tilburg ]
   * debian/control:
diff --git a/debian/rules b/debian/rules
index a1ea61f..c927f0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,6 @@ 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/files_pdfviewer/js/pdfjs/src
 	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
@@ -74,23 +73,26 @@ override_dh_install:
 	# Minify JavaScript files and remove the source.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js
+	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
-	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js
+	rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js
 
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js -o debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js -o debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js
+	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js -o debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js -o debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js -o debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
-	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js -o debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js
+	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js -o debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js -o debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js
 
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js
+	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
-	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js
+	rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js
 
 	# Minify ace in app_texteditor

-- 
owncloud.git