[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=e1c8c48

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

    Merge branch 'kubuntu_vivid_backports' of ssh://git.debian.org:/git/pkg-kde/kde-applications/okteta into kubuntu_vivid_backports
    merge

 debian/.gitattributes                                              | 1 -
 debian/changelog                                                   | 7 +++++++
 ...n3controllers3.symbols => libkasten3controllers3.symbols.amd64} | 0
 debian/{libkasten3core3.symbols => libkasten3core3.symbols.amd64}  | 0
 debian/{libkasten3gui3.symbols => libkasten3gui3.symbols.amd64}    | 0
 ...ollers1.symbols => libkasten3okteta1controllers1.symbols.amd64} | 0
 ...n3okteta1core1.symbols => libkasten3okteta1core1.symbols.amd64} | 0
 ...ten3okteta1gui1.symbols => libkasten3okteta1gui1.symbols.amd64} | 0
 debian/{libokteta2core2.symbols => libokteta2core2.symbols.amd64}  | 0
 debian/{libokteta2gui2.symbols => libokteta2gui2.symbols.amd64}    | 0
 debian/source/local-options                                        | 1 -
 11 files changed, 7 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index c62f5cc,e41910d..c43d1a3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,16 +1,20 @@@
  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-0ubuntu4) vivid; urgency=medium
+ 
+   * Move symbols files to amd64 only, I can't work out the other arches
+     alas
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 15 Apr 2015 23:11:10 +0200
+ 
  okteta (4:14.12.3-0ubuntu3) vivid; urgency=medium
  
    * Update symbols file

-- 
okteta packaging