merged: r33538,r33539 from webinterface branch:

removing web folder and updating build scripts as contents is now part of plugin system; removing debug log info from WebServer.cpp
changed: addon.xml summary information updated. (cherry picked from commit e1aeeb7b46f588eb95cb18fecc5debb3521385cf)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33649 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 6 insertions, 14 deletions

diff --git a/Makefile.in b/Makefile.in
index b831c68e45..cd7e90d7f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -507,7 +507,7 @@ install-bin: xbmc.bin # developement convenience target
 ifeq ($(findstring osx,$(ARCH)), osx)
 	# TODO: add osx install
 else
-install: install-binaries install-arch install-datas install-web
+install: install-binaries install-arch install-datas
 
 install-binaries: install-scripts
 	@echo "Copying XBMC binary to $(DESTDIR)$(libdir)/xbmc/xbmc.bin"
@@ -551,11 +551,6 @@ install-livedatas:
 	@install -D tools/XBMCLive/runXBMC $(DESTDIR)$(bindir)/runXBMC
 	@install -D tools/XBMCLive/setAlsaVolumes $(DESTDIR)$(bindir)/setAlsaVolumes
 
-install-web:
-	@mkdir -p $(DESTDIR)$(datarootdir)/xbmc/web
-	@cp -r web/poc_jsonrpc/* $(DESTDIR)$(datarootdir)/xbmc/web
-	@find $(DESTDIR)$(datarootdir)/xbmc/web -depth -name .svn -exec rm -rf {} \;
-
 uninstall:
 	@echo "Removing XBMC..."
 	@rm -rf $(DESTDIR)$(libdir)/xbmc
diff --git a/addons/webinterface.default/addon.xml b/addons/webinterface.default/addon.xml
index 281fd33a88..d0b20fb32c 100644
--- a/addons/webinterface.default/addon.xml
+++ b/addons/webinterface.default/addon.xml
@@ -3,15 +3,15 @@
   id="webinterface.default"
   version="1.0.0"
   name="Default"
-  provider-name="Malard, Team XBMC">
+  provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.gui" version="2.11"/>
   </requires>
   <extension
     point="xbmc.gui.webinterface"/>
   <extension point="xbmc.addon.metadata">
-    <summary lang="en">Default web interface by Malard. (XBMC's default web interface)</summary>
-    <description lang="en">Blablabla look good, blablabla, work everywhere</description>
+    <summary lang="en">Team XBMC Web Interface. (XBMC's default web interface)</summary>
+    <description lang="en">Default web interface for XBMC; Designed for devices of all resolutions</description>
     <platform>all</platform>
   </extension>
-</addon>
+</addon>
\ No newline at end of file
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index 3d46f9623c..935424dd71 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -201,7 +201,6 @@ IF %comp%==vs2008 (
   xcopy ..\..\system BUILD_WIN32\Xbmc\system /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL

   xcopy ..\..\media BUILD_WIN32\Xbmc\media /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL

   xcopy ..\..\sounds BUILD_WIN32\Xbmc\sounds /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL

-  xcopy "..\..\web\poc_jsonrpc" BUILD_WIN32\Xbmc\web /E /Q /I /Y /EXCLUDE:exclude.txt  > NUL

   

   SET skinpath=%CD%\Add_skins

   SET scriptpath=%CD%\Add_scripts

@@ -326,4 +325,4 @@ IF %comp%==vs2008 (
   IF %promptlevel% NEQ noprompt (

   ECHO Press any key to exit...

   pause > NUL

-  )
\ No newline at end of file
+  )

diff --git a/tools/Linux/packaging/debian/rules.hardy b/tools/Linux/packaging/debian/rules.hardy
index d77ef53f2c..74ca818b2f 100755
--- a/tools/Linux/packaging/debian/rules.hardy
+++ b/tools/Linux/packaging/debian/rules.hardy
@@ -51,8 +51,6 @@ binary-indep:
 	cp $(CURDIR)/tools/Linux/xbmc.desktop $(CURDIR)/debian/tmp/usr/share/applications/
 	# xbmc Live files 
 	dh_install -i --sourcedir=$(CURDIR)/debian/tmp -XLICENCE -XLiberationSans-Regular.ttf -XLicence.txt -XLicense.txt
-	# XBMC WEB POC
-	dh_install -pxbmc-web ../../web/poc_jsonrpc usr/share/xbmc/web
 	dh_installdocs -i
 	dh binary-indep --after dh_installdocs