[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=55f536c

The following commit has been merged in the master branch:
commit 55f536c0d02a41301d92d1316967ac350e641eaf
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 10 18:23:39 2012 +0300

    Fix up patches.
---
 debian/changelog                               |    1 +
 debian/patches/debian_set_library_version.diff |   22 ----------------------
 debian/patches/series                          |    1 +
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b31789..0bae4c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ kdepim-runtime (4:4.8.4-0r0) UNRELEASED; urgency=low
   * Add kde-l10n, kde-l10n-nopim to kdepim-runtime Conflicts.
   * Version kdepim-dbg Breaks/Replaces. Otherwise, kdepim-runtime-dbg is not
     co-installable with kdepim-dbg.
+  * Drop debian_set_library_version.diff patch, not needed.
 
   [ José Manuel Santamaría Lema ]
   * Bump shared-desktop-ontologies build depend to 0.6.50.
diff --git a/debian/patches/debian_set_library_version.diff b/debian/patches/debian_set_library_version.diff
deleted file mode 100644
index 5e1f851..0000000
--- a/debian/patches/debian_set_library_version.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: override GENERIC_LIB_VERSION & KDE_NON_GENERIC_LIB_VERSION
- Override the two cmake variables GENERIC_LIB_VERSION and
- KDE_NON_GENERIC_LIB_VERSION (set by KDE4Defaults.cmake, provided by kdelibs),
- to avoid adjusting .install files every time kdelibs is upgraded to a newer
- stable serie (e.g. 4.6.x -> 4.7.x).
-Forwarded: not-needed
-Last-Update: 2012-04-17
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,10 @@
- find_package(KDE4 REQUIRED)
- include(KDE4Defaults)
- 
-+# temporarly override them to not depend on kdelibs
-+set(GENERIC_LIB_VERSION "4.6.0")
-+set(KDE_NON_GENERIC_LIB_VERSION "5.6.0")
-+
- find_package(KdepimLibs 4.3.85 REQUIRED)
- 
- find_package(Boost 1.34.0)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5879913
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+hide_akonaditray.diff

-- 
KDE PIM Runtime module packaging