[SCM] rocs packaging branch, master, updated. debian/4.7.4-2-6-g84531b1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/rocs.git;a=commitdiff;h=84531b1

The following commit has been merged in the master branch:
commit 84531b1eacf4179b7280419fab85c0193e853a24
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 16 15:20:31 2012 +0200

    upstream_enable_exceptions.diff: drop, backported upstream
---
 debian/changelog                               |    1 +
 debian/patches/series                          |    1 -
 debian/patches/upstream_enable_exceptions.diff |   26 ------------------------
 3 files changed, 1 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1728eb..65dcb01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ rocs (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Bump kdelibs5-dev build dependency to 4.8.
   * Bump Standards-Version to 3.9.3, no changes required.
   * Add watch file.
+  * Drop patch upstream_enable_exceptions.diff, backported from upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 16 Jun 2012 15:08:14 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a099933..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_enable_exceptions.diff
diff --git a/debian/patches/upstream_enable_exceptions.diff b/debian/patches/upstream_enable_exceptions.diff
deleted file mode 100644
index 9a40f10..0000000
--- a/debian/patches/upstream_enable_exceptions.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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