[SCM] kodi/master: Revert the webinterface.default addon to old web interface from beta5

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b6fade2dda58c2edda89b4246e6e389ec842b6d5
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri Dec 16 18:21:42 2016 +0100

    Revert the webinterface.default addon to old web interface from beta5

diff --git a/debian/README.source b/debian/README.source
index 05bf249..28535f3 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -17,6 +17,10 @@ when building the package next to the build directory. Gbp is set up to extract
 them to the source tree or you can do it manually using debian/rules'
 extract-components target.
 
+Kodi replaced the default webinterface in 17.0 beta6 but the new interface contains
+many generated files without providing the source for them. The web interface
+is temporarily reverted to the one included in beta5 to restore GPL compliance.
+
 [1] http://metadata.ftp-master.debian.org/changelogs/main/libk/libkaz/unstable_copyright
 
- -- Balint Reczey <balint at balintreczey.hu>, Thu,  4 Aug 2016 01:32:27 +0200
+ -- Balint Reczey <rbalint at chaos.sz13.dyndns.org>, Fri, 16 Dec 2016 18:18:09 +0100
diff --git a/debian/rules b/debian/rules
index 5609364..e78f1e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,6 +91,7 @@ override_dh_clean:
 		-d $(DVDNAV_COMPONENT) || true
 	ls $(CURDIR)/debian/patches/libdvdread-* | tac | xargs cat | patch -R --no-backup-if-mismatch -r - -s -p1 \
 		-d $(DVDREAD_COMPONENT) || true
+	rm -f addons/webinterface.default
 	rm -f debian/dh-addon/*.1
 
 override_dh_auto_clean:
@@ -108,6 +109,7 @@ endif
 override_dh_auto_configure: configure
 	cat $(CURDIR)/debian/patches/libdvdnav-* | patch -p1 -d $(DVDNAV_COMPONENT)
 	cat $(CURDIR)/debian/patches/libdvdread-* | patch -p1 -d $(DVDREAD_COMPONENT)
+	cp -r $(CURDIR)/webinterface-default $(CURDIR)/addons/webinterface.default
 	sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/Application.cpp xbmc/utils/SystemInfo.cpp
 	fontforge -script $(CURDIR)/debian/mergefonts.ff \
 		/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf \
@@ -203,9 +205,10 @@ override_dh_gencontrol-arch:
 override_dh_gencontrol-indep:
 	dh_gencontrol -i
 
-# extract and patch customized libdvdread and libdvdnav
+# extract and patch customized libdvdread and libdvdnav and webinterface from 17.0 beta5
 extract-components:
 	tar -xf $(CURDIR)/../kodi_"$(UPSTREAM_VERSION)".orig-$(DVDNAV_COMPONENT).tar.bz2 && \
 		mv libdvdnav-* $(CURDIR)/$(DVDNAV_COMPONENT)
 	tar -xf $(CURDIR)/../kodi_"$(UPSTREAM_VERSION)".orig-$(DVDREAD_COMPONENT).tar.bz2 && \
 		mv libdvdread-* $(CURDIR)/$(DVDREAD_COMPONENT)
+	tar -xf $(CURDIR)/../kodi_"$(UPSTREAM_VERSION)".orig-webinterface-default.tar.xz

-- 
kodi packaging