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

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdenetwork.git;a=commitdiff;h=4eefd57

The following commit has been merged in the master branch:
commit 4eefd57379236694f539eb7f4f2afc50beae2577
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jul 15 20:47:42 2013 +0200

    build kppp only on Linux
    
    ... as it was in previous versions
---
 debian/changelog                    |    3 +++
 debian/patches/kppp-linux-only.diff |   20 ++++++++++++++++++++
 debian/patches/series               |    1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6177263..97bf833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdenetwork (4:4.10.5-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Build kppp only on Linux, as it was in previous versions; patch
+    kppp-linux-only.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Jul 2013 20:45:46 +0200
 
diff --git a/debian/patches/kppp-linux-only.diff b/debian/patches/kppp-linux-only.diff
new file mode 100644
index 0000000..a11748a
--- /dev/null
+++ b/debian/patches/kppp-linux-only.diff
@@ -0,0 +1,20 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Compile kppp only on Linux
+ This mimics (in a simplier way) the exclusion it existed in previous
+ kdenetwork releases.
+Last-Update: 2013-07-15
+Forwarded: not-needed
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,9 @@ set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_
+ 
+ macro_optional_add_subdirectory( kdenetwork-strigi-analyzers )
+ macro_optional_add_subdirectory( kdenetwork-filesharing )
+-macro_optional_add_subdirectory( kppp )
++if( CMAKE_SYSTEM_NAME MATCHES Linux )
++  macro_optional_add_subdirectory( kppp )
++endif()
+ macro_optional_add_subdirectory( kdnssd )
+ macro_optional_add_subdirectory( krdc )
+ macro_optional_add_subdirectory( krfb )
diff --git a/debian/patches/series b/debian/patches/series
index 011adda..f58c5f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kdenetwork-4.7.97-fix-for-g++47.patch
 add_libpthread_to_krfb.diff
 fix-kget-doc.patch
+kppp-linux-only.diff

-- 
KDE Network module packaging