[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.6.2-1-5-g3fb2401

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 0789a4c2d063edd178de9545f359682dc0c0a470
Author: Modestas Vainius <modax at debian.org>
Date:   Thu May 26 02:52:21 2011 +0300

    Enable DLRestrictions for libraries in this package.
    
    Requires libdlrestrictions-dev 0.14 and kdelibs5-dev 4:4.6.3.
---
 debian/changelog                          |    6 +++++-
 debian/control                            |    4 ++--
 debian/libkonq5abi1.symbols               |    3 ++-
 debian/libkonqsidebarplugin4a.symbols     |    1 +
 debian/patches/enable_dlrestrictions.diff |   25 +++++++++++++++++++++++++
 debian/patches/series                     |    1 +
 6 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b07e681..8c11010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 kdebase (4:4.6.3-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
-  
+
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.6.3.
   * Bump Standards-Version to 3.9.2; no changes needed.
 
+  [ Modestas Vainius ]
+  * Enable DLRestrictions for libraries in this package. Requires
+    libdlrestrictions-dev 0.14 and kdelibs5-dev 4:4.6.3.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 03 May 2011 01:30:30 +0200
 
 kdebase (4:4.6.2-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 507daae..2f2fa2d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Ar
  Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
  José Manuel Santamaría Lema <panfaust at gmail.com>
 Build-Depends: kde-sc-dev-latest (>= 4:4.6.3),
- cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.6), libphonon-dev (>= 4:4.3.0),
+ cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), libdlrestrictions-dev (>= 0.14),
+ kdelibs5-dev (>= 4:4.6.3), libphonon-dev (>= 4:4.3.0),
  libqimageblitz-dev (>= 1:0.0.4-2), libxkbfile-dev,
  libstreamanalyzer-dev (>= 0.6.3),
  libxrender-dev, zlib1g-dev,
diff --git a/debian/libkonq5abi1.symbols b/debian/libkonq5abi1.symbols
index c800eee..bdda044 100644
--- a/debian/libkonq5abi1.symbols
+++ b/debian/libkonq5abi1.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.6.1 amd64
+# SymbolsHelper-Confirmed: 4:4.6.3 amd64
 libkonq.so.5abi1 libkonq5abi1 #MINVER#
  ABI_5_1 at ABI_5_1 4:4.6.1
  _ZN12KonqMimeData16populateMimeDataEP9QMimeDataRKN4KUrl4ListES5_b at ABI_5_1 4:4.6.1
@@ -255,6 +255,7 @@ libkonq.so.5abi1 libkonq5abi1 #MINVER#
  _ZTV25KonqNameAndUrlInputDialog at ABI_5_1 4:4.6.1
  _ZTV25KonqStatusBarMessageLabel at ABI_5_1 4:4.6.1
  _ZTV8KNewMenu at ABI_5_1 4:4.6.1
+ dlrestrictions_data at ABI_5_1 4:4.6.3
  (c++)"non-virtual thunk to KonqNameAndUrlInputDialog::~KonqNameAndUrlInputDialog()@ABI_5_1" 4:4.6.1
  (c++)"non-virtual thunk to KonqPopupMenu::~KonqPopupMenu()@ABI_5_1" 4:4.6.1
  (c++)"non-virtual thunk to KonqStatusBarMessageLabel::~KonqStatusBarMessageLabel()@ABI_5_1" 4:4.6.1
diff --git a/debian/libkonqsidebarplugin4a.symbols b/debian/libkonqsidebarplugin4a.symbols
index e261494..4b52683 100644
--- a/debian/libkonqsidebarplugin4a.symbols
+++ b/debian/libkonqsidebarplugin4a.symbols
@@ -43,3 +43,4 @@ libkonqsidebarplugin.so.4 libkonqsidebarplugin4a #MINVER#
  _ZTS17KonqSidebarPlugin at ABI_4_0 4:4.6.1
  _ZTV17KonqSidebarModule at ABI_4_0 4:4.6.1
  _ZTV17KonqSidebarPlugin at ABI_4_0 4:4.6.1
+ dlrestrictions_data at ABI_4_0 4:4.6.3
diff --git a/debian/patches/enable_dlrestrictions.diff b/debian/patches/enable_dlrestrictions.diff
new file mode 100644
index 0000000..6e77f19
--- /dev/null
+++ b/debian/patches/enable_dlrestrictions.diff
@@ -0,0 +1,25 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Enable DLRestrictions (REJECT:OTHERSOVERSION) support for all libraries
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2011-05-25
+
+Enable REJECT:OTHERSOVERSION for these libraries because their ABI is typically
+not stable and structures frequently conflict.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,6 +44,13 @@ macro_optional_add_subdirectory( doc )
+ 
+ include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
+ 
++# Enable DLResctrictions
++if (CMAKE_BUILD_TYPE STREQUAL "Debian")
++    find_package(DLRestrictions)
++    set(DEFAULT_DLRESTRICTIONS "REJECT:OTHERSOVERSION")
++    kde4deb_dlrestrictions_process_libraries()
++endif (CMAKE_BUILD_TYPE STREQUAL "Debian")
++
+ if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+     macro_display_feature_log()
+ endif(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
diff --git a/debian/patches/series b/debian/patches/series
index fc88d67..ab3c614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debian-T-addition.diff
 enable_debianabimanager.diff
+enable_dlrestrictions.diff

-- 
KDE Base Applications module packaging