[SCM] xbmc/master: Refresh 04-differentiate-from-vanilla-XBMC.patch

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e353b70b2a2432220b15c0fa42c9395ee5465b16
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Apr 2 02:45:46 2014 +0200

    Refresh 04-differentiate-from-vanilla-XBMC.patch

diff --git a/debian/patches/04-differentiate-from-vanilla-XBMC.patch b/debian/patches/04-differentiate-from-vanilla-XBMC.patch
index a44c8f3..5b449c6 100644
--- a/debian/patches/04-differentiate-from-vanilla-XBMC.patch
+++ b/debian/patches/04-differentiate-from-vanilla-XBMC.patch
@@ -1,5 +1,3 @@
-diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
-index f4aaf56..cb6c51d 100644
 --- a/addons/skin.confluence/720p/Home.xml
 +++ b/addons/skin.confluence/720p/Home.xml
 @@ -19,7 +19,7 @@
@@ -11,8 +9,6 @@ index f4aaf56..cb6c51d 100644
  			<height>100</height>
  			<aspectratio aligny="top" align="left">keep</aspectratio>
  			<texture>xbmc-logo.png</texture>
-diff --git a/addons/skin.confluence/720p/LoginScreen.xml b/addons/skin.confluence/720p/LoginScreen.xml
-index 9ced61e..5f4eba5 100644
 --- a/addons/skin.confluence/720p/LoginScreen.xml
 +++ b/addons/skin.confluence/720p/LoginScreen.xml
 @@ -24,7 +24,7 @@
@@ -24,11 +20,9 @@ index 9ced61e..5f4eba5 100644
  				<height>100</height>
  				<aspectratio aligny="top" align="left">keep</aspectratio>
  				<texture>xbmc-logo.png</texture>
-diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
-index 265881f..e00ff39 100644
 --- a/xbmc/Application.cpp
 +++ b/xbmc/Application.cpp
-@@ -692,7 +692,7 @@ bool CApplication::Create()
+@@ -693,7 +693,7 @@
    CProfilesManager::Get().Load();
  
    CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
@@ -37,11 +31,9 @@ index 265881f..e00ff39 100644
        g_sysinfo.GetBuildTargetPlatformName().c_str(), g_sysinfo.GetXbmcBitness());
  
  /* Expand macro before stringify */
-diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
-index 346388e..050200f 100644
 --- a/xbmc/GUIInfoManager.cpp
 +++ b/xbmc/GUIInfoManager.cpp
-@@ -4208,7 +4208,7 @@ CStdString CGUIInfoManager::GetVersion()
+@@ -4208,7 +4208,7 @@
    if (GetXbmcGitRevision())
      tmp = StringUtils::Format("%d.%d%s Git:%s", VERSION_MAJOR, VERSION_MINOR, VERSION_TAG, GetXbmcGitRevision());
    else
@@ -50,8 +42,6 @@ index 346388e..050200f 100644
    return tmp;
  }
  
-diff --git a/xbmc/GitRevision.cpp b/xbmc/GitRevision.cpp
-index d100477..d449b14 100644
 --- a/xbmc/GitRevision.cpp
 +++ b/xbmc/GitRevision.cpp
 @@ -29,7 +29,7 @@

-- 
xbmc packaging