[SCM] libkpeople packaging branch, master, updated. debian/0.2.2-2-11-g144267b

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkpeople.git;a=commitdiff;h=8303294

The following commit has been merged in the master branch:
commit 8303294b7f23ff38f59a4fa1e37b3d9e06257e2b
Author: Diane Trout <diane at ghic.org>
Date:   Sat Sep 20 11:32:03 2014 -0700

    Remove library_startswith_soname.patch applied upstream.
---
 debian/changelog                               |  1 +
 debian/patches/library_startswith_soname.patch | 26 --------------------------
 debian/patches/series                          |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da45f1f..dba7cb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libkpeople (0.2.2-3) UNRELEASED; urgency=medium
 
   * Remove nepomuk dependencies as we now use baloo.
   * Remove add-cmake-copying.patch, now provided upstream.
+  * Remove library_startswith_soname.patch applied upstream.
 
  -- Diane Trout <diane at ghic.org>  Sat, 20 Sep 2014 10:58:21 -0700
 
diff --git a/debian/patches/library_startswith_soname.patch b/debian/patches/library_startswith_soname.patch
deleted file mode 100644
index b16251b..0000000
--- a/debian/patches/library_startswith_soname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Diane Trout <diane at ghic.org>
-Description: Force libkpeople to conform to the convention that the library real name
- starts with the soname.
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -37,7 +37,7 @@
-                        ${KDEPIMLIBS_KABC_LIBS}
- )
- 
--set_target_properties (kpeople PROPERTIES VERSION ${KPEOPLE_VERSION} SOVERSION ${KPEOPLE_SOVERSION})
-+set_target_properties (kpeople PROPERTIES VERSION ${KPEOPLE_SOVERSION}.${KPEOPLE_VERSION} SOVERSION ${KPEOPLE_SOVERSION})
- 
- if (MSVC)
-     set_target_properties (kpeople PROPERTIES
---- a/src/widgets/CMakeLists.txt
-+++ b/src/widgets/CMakeLists.txt
-@@ -28,7 +28,7 @@
-                        kpeople
- )
- 
--set_target_properties (kpeoplewidgets PROPERTIES VERSION ${KPEOPLE_VERSION} SOVERSION ${KPEOPLE_SOVERSION})
-+set_target_properties (kpeoplewidgets PROPERTIES VERSION ${KPEOPLE_SOVERSION}.${KPEOPLE_VERSION} SOVERSION ${KPEOPLE_SOVERSION})
- 
- if (MSVC)
-     set_target_properties (kpeoplewidgets PROPERTIES
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f0e0c31..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-library_startswith_soname.patch

-- 
libkpeople packaging