[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.11.1+l10n-1-3-gdf3a2c3

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit df3a2c374e0096e94d9f1852bfe5e1898c6f1fe7
Author: Pino Toscano <pino at debian.org>
Date:   Tue Apr 17 16:52:18 2012 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 5c5394d..c4c3f27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kdepim (4:4.4.11.1+l10n-2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * debianize_akregator_default.diff: switch from news.debian.net (no more
     active) to the official news feed @ debian.org. (Closes: #665985)
+  * Override GENERIC_LIB_VERSION KDE_NON_GENERIC_LIB_VERSION to not depend on
+    the kdelibs version. (Closes: #665083)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Apr 2012 14:21:49 +0200
 
diff --git a/debian/patches/debian_set_library_version.diff b/debian/patches/debian_set_library_version.diff
new file mode 100644
index 0000000..616281c
--- /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
+@@ -40,6 +40,10 @@
+ include(MacroBoolTo01)
+ find_package(KdepimLibs 4.4.1 REQUIRED)
+ 
++# temporarly override them to not depend on kdelibs
++set(GENERIC_LIB_VERSION "4.6.0")
++set(KDE_NON_GENERIC_LIB_VERSION "5.6.0")
++
+ 
+ ############### search Boost ###############
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1d7a426..04bbd1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 debianize_akregator_default.diff
 kdepim_l10n.diff
 displaying_only_unread_issue.diff
+debian_set_library_version.diff

-- 
KDE PIM module packaging