[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-110-g4ad8b69
Modestas Vainius
modax at alioth.debian.org
Mon Mar 28 22:11:45 UTC 2011
The following commit has been merged in the master branch:
commit d3b2cd3768f152fcb5f4e4868975fc8dc641fd8a
Author: Modestas Vainius <modax at debian.org>
Date: Tue Mar 29 00:17:03 2011 +0300
DebianABIManager: include DebianABIManager.cmake in the main CMakeLists.txt.
(patch enable_debianabimanager.diff)
---
debian/changelog | 3 +++
debian/patches/enable_debianabimanager.diff | 18 ++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 895cacf..8a63641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -123,6 +123,9 @@ kdebase-workspace (4:4.6.1-0r2) UNRELEASED; urgency=low
* Add shebang to the kwin/data/kwin_blacklist.sh script
(patch upstream_kwin_blacklist_add_shebang.diff).
* Override plasma-desktop: postinst-must-call-ldconfig usr/lib/libkickoff.so.
+ * Enable DebianABIManager:
+ - include DebianABIManager.cmake at the bottom of the main CMakeLists.txt
+ (patch enable_debianabimanager.diff);
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 31 Jul 2010 16:41:50 +0300
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
new file mode 100644
index 0000000..0a3b386
--- /dev/null
+++ b/debian/patches/enable_debianabimanager.diff
@@ -0,0 +1,18 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Use DebianABIManager for this source package. It's Debian-specific.
+Forwarded: not-needed
+
+For more information about DebianABIManager, refer to
+/usr/share/doc/pkg-kde-tools/README.DebianABIManager (pkg-kde-tools (>= 0.12)).
+
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -241,3 +241,6 @@ install(EXPORT kdeworkspaceLibraryTarget
+ NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX}
+ DESTINATION ${_KDE4WorkspaceConfig_INSTALL_DIR}
+ FILE KDE4WorkspaceLibraryTargets.cmake )
++
++# Add support for DebianABIManager
++include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/series b/debian/patches/series
index 295ae62..e5e4b6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
33_qguiplatformplugin_kde_NULL_check.diff
97_fix_target_link_libraries.diff
upstream_kwin_blacklist_add_shebang.diff
+enable_debianabimanager.diff
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list