[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.4.11.1-3-5-g553ed76

Pino Toscano pino at alioth.debian.org
Tue Apr 17 15:06:24 UTC 2012


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

The following commit has been merged in the master branch:
commit 553ed7655e7139e208627cf2a0ba0407793d71c0
Author: Pino Toscano <pino at debian.org>
Date:   Tue Apr 17 17:05:48 2012 +0200

    override {,KDE_NON_}GENERIC_LIB_VERSION (#665060)
    
    ... to not depend on the kdelibs version
---
 debian/changelog                               |    4 ++++
 debian/patches/debian_set_library_version.diff |   22 ++++++++++++++++++++++
 debian/patches/series                          |    1 +
 3 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a102dee..b1f6b1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ kdepim-runtime (4:4.4.11.1-4) UNRELEASED; urgency=low
   [ Michael Biebl ]
   * Hide akonaditray to not show up in the menu. (Closes: #613718)
 
+  [ Pino Toscano ]
+  * Override GENERIC_LIB_VERSION and KDE_NON_GENERIC_LIB_VERSION to not depend
+    on the kdelibs version. (Closes: #665060)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Dec 2011 07:42:17 +0100
 
 kdepim-runtime (4:4.4.11.1-3) unstable; urgency=low
diff --git a/debian/patches/debian_set_library_version.diff b/debian/patches/debian_set_library_version.diff
new file mode 100644
index 0000000..5e1f851
--- /dev/null
+++ b/debian/patches/debian_set_library_version.diff
@@ -0,0 +1,22 @@
+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
index b70ec1a..16cf3f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_ontology_vs_feeder_automoc_race_condition.diff
 hide_akonaditray.diff
+debian_set_library_version.diff

-- 
KDE PIM Runtime module packaging



More information about the pkg-kde-commits mailing list