[SCM] xbmc/master: Stop shipping minified iscroll.js

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 20ef795fb3fe554a7934cb8de7e341a0cc1636d2
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Apr 2 14:11:06 2014 +0200

    Stop shipping minified iscroll.js
    
    Dependency on libjs-iscroll is disabled for the time being since
    it is not packaged yet. This makes web interface partially broken
    but users can download the JavaScript file manually as a workaround.

diff --git a/debian/control b/debian/control
index 8b05bb6..dd6de6f 100644
--- a/debian/control
+++ b/debian/control
@@ -123,6 +123,7 @@ Depends: xbmc-bin (>= ${source:Version}),
          fonts-dejavu-core | ttf-dejavu-core,
          fonts-roboto,
          libjs-jquery,
+#        libjs-iscroll,
          python-imaging,
          ${python:Depends},
          ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 0e7fc85..7a68221 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,7 +131,7 @@ override_dh_install:
 		-XLicence.txt -XLicense.txt -XLiberationSans-Regular.ttf \
 		-XDejaVuSans.ttf -XDejaVuSans-Bold.ttf -XLICENSE.txt \
 		-XRoboto-Bold.ttf -XRoboto-Regular.ttf -XNOTICE.txt \
-		-Xjquery-1.8.2.min.js
+		-Xjquery-1.8.2.min.js -Xiscroll-min.js
 
 override_dh_makeshlibs:
 	# We don't install shared libraries in standard locations so don't run
@@ -217,6 +217,7 @@ get-orig-source:
 		$(ORIG_SRC_DIR)/*/lib/taglib \
 		$(ORIG_SRC_DIR)/*/lib/win32 \
 		$(ORIG_SRC_DIR)/*/addons/addons/service.xbmc.versioncheck \
+		$(ORIG_SRC_DIR)/*/addons/webinterface.default/js/iscroll-min.js \
 		$(ORIG_SRC_DIR)/*/addons/webinterface.default/js/jquery-1.8.2.min.js \
 		$(ORIG_SRC_DIR)/*/addons/skin.confluence/fonts/Roboto-*.ttf \
 		$(ORIG_SRC_DIR)/*/media/Fonts/arial.ttf \
diff --git a/debian/xbmc.links b/debian/xbmc.links
index a34b25e..ac1b311 100644
--- a/debian/xbmc.links
+++ b/debian/xbmc.links
@@ -2,4 +2,5 @@ usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf usr/share/xbmc/addons/sk
 usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/xbmc/addons/skin.confluence/fonts/DejaVuSans.ttf
 usr/share/fonts/truetype/roboto/Roboto-Bold.ttf usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
 usr/share/fonts/truetype/roboto/Roboto-Regular.ttf usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf
-usr/share/javascript/jquery/jquery.min.js /usr/share/xbmc/addons/webinterface.default/js/jquery-1.8.2.min.js
\ No newline at end of file
+usr/share/javascript/jquery/jquery.min.js /usr/share/xbmc/addons/webinterface.default/js/jquery-1.8.2.min.js
+usr/share/javascript/iscroll/iscroll.min.js /usr/share/xbmc/addons/webinterface.default/js/iscroll-min.js
\ No newline at end of file

-- 
xbmc packaging