Hi, 

current okteta doesn't build from git's kubuntu_vivid_backports branch,

I have pushed the proposed change to this repository:
https://gitlab.com/siduction-kde-applications/okteta

in the kubuntu_vivid_backports_tmp branch:
https://gitlab.com/siduction-kde-applications/okteta/commits/kubuntu_vivid_backports_tmp

Also I'm attaching the patch retrieved with git format-patch.
From 89ce37faef3d629cb8181219122c34ee80fb1cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
 <panfa...@gmail.com>
Date: Thu, 16 Apr 2015 18:59:21 +0200
Subject: [PATCH] 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(-)
 delete mode 100644 debian/patches/upstream_cmake-IconThemes.diff

diff --git a/debian/changelog b/debian/changelog
index e41910d..c43d1a3 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 <sgcl...@kubuntu.org>  Wed, 15 Apr 2015 12:33:01 -0700
 
 okteta (4:14.12.3-0ubuntu4) 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
-- 
2.1.4

Attachment: signature.asc
Description: This is a digitally signed message part.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel

Reply via email to