[SCM] okteta packaging branch, kubuntu_vivid_backports, updated. debian/4.14.2-1-47-ge1c8c48

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/okteta.git;a=commitdiff;h=0b5096b

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 0b5096b3ae0f9360144484ae595dc9740a05020c
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Mon Apr 20 09:52:48 2015 -0700

    Delete upstream_cmake-IconThemes.diff, applied upstream.
---
 debian/changelog                              |  4 ++++
 debian/patches/series                         |  1 -
 debian/patches/upstream_cmake-IconThemes.diff | 12 ------------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 06ce7d8..c62f5cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 okteta (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release
 
+  [ José Manuel Santamaría Lema ]
+  * Delete upstream_cmake-IconThemes.diff, applied upstream.
+
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 15 Apr 2015 12:33:01 -0700
 
 okteta (4:14.12.3-0ubuntu3) vivid; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 62c1ca8..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_cmake-IconThemes.diff
diff --git a/debian/patches/upstream_cmake-IconThemes.diff b/debian/patches/upstream_cmake-IconThemes.diff
deleted file mode 100644
index 5ec0c07..0000000
--- a/debian/patches/upstream_cmake-IconThemes.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: okteta-14.12.2/CMakeLists.txt
-===================================================================
---- okteta-14.12.2.orig/CMakeLists.txt
-+++ okteta-14.12.2/CMakeLists.txt
-@@ -41,6 +41,7 @@ find_package(KF5 REQUIRED
-     ConfigWidgets
-     DBusAddons
-     DocTools
-+    IconThemes
-     I18n
-     KCMUtils
-     KIO

-- 
okteta packaging