[SCM] KDE Network module packaging branch, master, updated. debian/4.6.2-1-2-g30855b6

[Pino Toscano]

The following commit has been merged in the master branch:
commit 30855b64d99ee43e357f35166f24e9122c136479
Author: Pino Toscano <pino at kde.org>
Date:   Thu Apr 28 21:33:35 2011 +0200

    new patch no_home_set.diff to not fail the cmake step if no $HOME envvar is set
---
 debian/changelog                |    3 +++
 debian/patches/no_home_set.diff |   24 ++++++++++++++++++++++++
 debian/patches/series           |    1 +
 3 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c9235c..9ee6205 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdenetwork (4:4.6.2-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Add patch no_home_set.diff to not fail the cmake step in kopete if no $HOME
+    environment variable is set.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 Apr 2011 21:29:24 +0200
 
diff --git a/debian/patches/no_home_set.diff b/debian/patches/no_home_set.diff
new file mode 100644
index 0000000..989ad89
--- /dev/null
+++ b/debian/patches/no_home_set.diff
@@ -0,0 +1,24 @@
+Author: Pino Toscano <pino at kde.org>
+Description: Do not bail if $HOME is not set.
+ In case there is no $HOME environment variable set (which can happen on
+ buildds, for example), do not make cmake error out due to the regexp
+ "^$ENV{HOME}.*$".
+Forwarded: no
+Last-Update: 2011-04-28
+
+--- a/kopete/protocols/skype/skypebuttons/CMakeLists.txt
++++ b/kopete/protocols/skype/skypebuttons/CMakeLists.txt
+@@ -2,7 +2,12 @@
+ 
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default" )
+ 
+-string( REGEX MATCHALL ^$ENV{HOME}.*$ IS_HOME ${CMAKE_INSTALL_PREFIX} )
++string( LENGTH "$ENV{HOME}" LENGTH_OF_HOME )
++if( LENGTH_OF_HOME GREATER 0 )
++	string( REGEX MATCHALL ^$ENV{HOME}.*$ IS_HOME ${CMAKE_INSTALL_PREFIX} )
++else( LENGTH_OF_HOME GREATER 0 )
++	set( IS_HOME FALSE )
++endif( LENGTH_OF_HOME GREATER 0 )
+ string( COMPARE EQUAL /usr ${CMAKE_INSTALL_PREFIX} IS_USR )
+ string( COMPARE EQUAL /usr/local ${CMAKE_INSTALL_PREFIX} IS_LOCAL )
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c1fe169
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no_home_set.diff

-- 
KDE Network module packaging