[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=3eea781

The following commit has been merged in the master branch:
commit 3eea781e4b006cbe4ad866904d88805721ea6e9c
Author: Diane Trout <diane at ghic.org>
Date:   Sat Sep 20 11:30:09 2014 -0700

    Remove add-cmake-copying.patch, now provided upstream.
---
 debian/changelog                       |  1 +
 debian/patches/add-cmake-copying.patch | 28 ----------------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fc3ee3..da45f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,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.
 
  -- Diane Trout <diane at ghic.org>  Sat, 20 Sep 2014 10:58:21 -0700
 
diff --git a/debian/patches/add-cmake-copying.patch b/debian/patches/add-cmake-copying.patch
deleted file mode 100644
index d767e83..0000000
--- a/debian/patches/add-cmake-copying.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Diane Trout <diane at ghic.org>
-Description: Add the KDE cmake BSD license.
- Pushed upstream as commit d06bcdef33801c86d9fd27317e9bf14f86c7b7de 
---- /dev/null
-+++ b/cmake/COPYING-CMAKE-SCRIPTS
-@@ -0,0 +1,22 @@
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+
-+1. Redistributions of source code must retain the copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. The name of the author may not be used to endorse or promote products 
-+   derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/patches/series b/debian/patches/series
index 8f3d33e..f0e0c31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-add-cmake-copying.patch
 library_startswith_soname.patch

-- 
libkpeople packaging