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

[Pino Toscano]

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

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

    Drop debian_set_library_version.diff patch, not needed anymore.
---
 debian/changelog                               |    1 +
 debian/patches/debian_set_library_version.diff |   22 ----------------------
 debian/patches/series                          |    1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1878a73..209f8ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ kdepim (4:4.8.4-0r0) UNRELEASED; urgency=low
   * Move kdepim-dbg to the bottom of debian/control.
   * Drop ${perl:Depends} from kdepim-groupware Depends.
   * Add ${perl:Depends} to libkpgp4 Depends.
+  * Drop debian_set_library_version.diff patch, not needed anymore.
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
diff --git a/debian/patches/debian_set_library_version.diff b/debian/patches/debian_set_library_version.diff
deleted file mode 100644
index 616281c..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
-@@ -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 f6065f9..70ba408 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 debianize_akregator_default.diff
-debian_set_library_version.diff
 upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
 upstream_Build-with-clang.patch
 upstream_Fix-crash-in-Folder-destructor.patch

-- 
KDE PIM module packaging