[SCM] rocs packaging branch, master, updated. debian/4.7.2-1-4-g35073a5

[Pino Toscano]

The following commit has been merged in the master branch:
commit 35073a5855afcfeb03fb62e04dbd3c1f78b1aed5
Author: Pino Toscano <pino at debian.org>
Date:   Mon Dec 19 10:10:59 2011 +0100

    backport two upstream commits to enable the use of C++ exceptions
    
    this fixes the build with newer boost releases
---
 debian/changelog                               |    3 ++
 debian/patches/series                          |    1 +
 debian/patches/upstream_enable_exceptions.diff |   26 ++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a4b876..891a0d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 rocs (4:4.7.4-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport two upstream commits to enable the use of C++ exceptions.
+    This fixes the build with newer boost releases.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 19 Dec 2011 10:08:06 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a099933
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_enable_exceptions.diff
diff --git a/debian/patches/upstream_enable_exceptions.diff b/debian/patches/upstream_enable_exceptions.diff
new file mode 100644
index 0000000..9a40f10
--- /dev/null
+++ b/debian/patches/upstream_enable_exceptions.diff
@@ -0,0 +1,26 @@
+Author: Andreas Cord-Landwehr<cola at uni-paderborn.de>
+Author: Kevin Kofler<kevin.kofler at chello.at>
+Description: Build Rocs by default with Boost Exceptions.
+ This solves the common build issues with many Boost releases.
+Applied-Upstream: 4.8, commit:43b6ccf22174629ebec0a0579365c4269cf0fb58
+Applied-Upstream: 4.8, commit:a2f525ffd6f28a635ba3231734bdba9747c8ef29
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,8 @@ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ remove_definitions(-DQT_NO_STL)
+ 
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
++
+ include_directories(
+   ${KDE4_INCLUDES}
+   ${QT_INCLUDES}
+@@ -15,7 +17,6 @@ include_directories(
+ 
+ if(${CMAKE_BUILD_TYPE} MATCHES coverage)
+   set (CMAKE_CXX_COMPILER cov++)
+-  set (CMAKE_CXX_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" )
+ endif()
+ 
+ find_package(Boost REQUIRED)

-- 
rocs packaging