[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.2-2-11-ge500aa7
Modestas Vainius
modax at alioth.debian.org
Wed May 25 20:02:33 UTC 2011
The following commit has been merged in the master branch:
commit 998c5da33c1fee0b1c87abff94cdba961c5e1fb4
Author: Modestas Vainius <modax at debian.org>
Date: Wed May 25 15:55:15 2011 +0300
Add DLRestriction "REJECT:OTHERSOVERSION" to all libs on Debian.
This was implemented in (patch enable_dlrestrcitions.diff. Feature requires
kdelibs5-dev 4.6.3 and libdlrestrictions-dev 0.14 at build time.
---
debian/changelog | 3 +++
debian/control | 2 +-
debian/patches/enable_dlrestrcitions.diff | 13 +++++++++++++
debian/patches/series | 1 +
4 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f987589..0614a84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ kdebase-workspace (4:4.6.3-0r1) UNRELEASED; urgency=low
[ Modestas Vainius ]
* Make kdebase-workspace-bin break polkit-kde-1 (<< 0.99).
+ * Add DLRestriction "REJECT:OTHERSOVERSION" to all libs on Debian (patch
+ enable_dlrestrcitions.diff). Requires kdelibs5-dev 4.6.3 and
+ libdlrestrictions-dev 0.14.
[ Pino Toscano ]
* Make plasma-scriptengine-python recommend python-qt4-dbus, as Python
diff --git a/debian/control b/debian/control
index 43c1836..7c1802a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin
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), dpkg-dev (>= 1.15.5),
- kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6),
+ libdlrestrictions-dev (>= 0.14), kdelibs5-dev (>= 4:4.6.3), kdepimlibs5-dev (>= 4:4.6),
libstrigiqtdbusclient-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3),
libqimageblitz-dev (>= 1:0.0.4-2),
zlib1g-dev,
diff --git a/debian/patches/enable_dlrestrcitions.diff b/debian/patches/enable_dlrestrcitions.diff
new file mode 100644
index 0000000..67e81f1
--- /dev/null
+++ b/debian/patches/enable_dlrestrcitions.diff
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,3 +244,10 @@ install(EXPORT kdeworkspaceLibraryTarget
+
+ # Add support for DebianABIManager
+ 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")
diff --git a/debian/patches/series b/debian/patches/series
index 5ffad7e..4d4b684 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ qguiplatformplugin_kde_NULL_check.diff
fix_target_link_libraries.diff
enable_debianabimanager.diff
initialize_variables_crashfix.diff
+enable_dlrestrcitions.diff
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list