[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.5_rc1+dfsg-1-5-gee32112

[David Prévot]

The following commit has been merged in the master branch:
commit ee3211298dfe079fb20d0c9f32d0d39fd4e654d3
Author: David Prévot <taffit at debian.org>
Date:   Sun May 5 22:49:28 2013 -0400

    Depend on libjs-pdf

diff --git a/debian/control b/debian/control
index 352e8eb..1a11fbe 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Depends: apache2 | httpd,
          libjs-jquery (>= 1.7.2-1),
          libjs-jquery-jplayer,
          libjs-jquery-ui,
+         libjs-pdf,
          libphp-phpmailer,
          mediawiki (>= 1:1.19),
          owncloud-doc,
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 6e7ae18..f1604af 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -14,3 +14,11 @@ usr/share/javascript/jquery-jplayer/jquery.jplayer.min.js usr/share/owncloud/app
 usr/share/javascript/jquery-jplayer/add-on usr/share/owncloud/apps/media/js/add-on
 usr/share/javascript/jquery-ui/jquery-ui.min.js	usr/share/owncloud/core/js/jquery-ui-1.10.0.custom.js
 usr/share/php/Zend usr/share/owncloud/apps/search_lucene/3rdparty/Zend
+
+# pdf.js is mostly taken from the external package
+usr/share/javascript/pdf/compatibility.js	usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/compatibility.js
+usr/share/javascript/pdf/images			usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images
+usr/share/javascript/pdf/l10n.js		usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/l10n.js
+usr/share/javascript/pdf/locale			usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale
+usr/share/javascript/pdf/pdf.js			usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/pdf.js
+usr/share/javascript/pdf/viewer.css		usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.css
diff --git a/debian/postinst b/debian/postinst
index d647c5d..3ff8ed1 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -50,6 +50,19 @@ case "$1" in
             chown www-data:www-data /etc/owncloud/htaccess
             chmod 0640 /etc/owncloud/htaccess
         fi
+	# Replace directory with symlink [ Can be removed before Jessie ]
+	dir="/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images"
+	if [ -d $dir ] && [ ! -L $dir ]; then
+		if rmdir $dir 2>/dev/null; then
+			ln -sf /usr/share/javascript/pdf/images $dir
+		fi
+	fi
+	dir="/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale"
+	if [ -d $dir ] && [ ! -L $dir ]; then
+		if rmdir $dir 2>/dev/null; then
+			ln -sf /usr/share/javascript/pdf/locale $dir
+		fi
+	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/rules b/debian/rules
index d519607..11a392b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,9 +85,11 @@ override_dh_install:
 	# Move the MDB2 Sqlite driver to owncloud-sqlite.
 	mv debian/owncloud/usr/share/owncloud/lib/MDB2 debian/owncloud-sqlite/usr/share/php # php-mdb2-driver-sqlite (not yet)
 
-	# Clean up the media and search_lucene apps so that jquery-jplayer and zenframework be linked.
+	# Clean up apps to link external third parties.
 	rm -r debian/owncloud/usr/share/owncloud/apps/media/js/jQuery.jPlayer.2.2.0.source
 	rm -r debian/owncloud/usr/share/owncloud/apps/search_lucene/3rdparty/Zend
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale
 
 	# Remove the Updater app since upgrade must be made via the package
 	rm -r debian/owncloud/usr/share/owncloud/apps/updater

-- 
owncloud.git