[SCM] okteta packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-80-g63348a1

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 63348a17e954b42c6f0cc33306a48cfcd2245376
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Aug 18 12:25:00 2015 +0100

    wrap-and-sort
---
 debian/changelog      | 4 ++--
 debian/okteta.install | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 018d6b3..9bbc266 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-okteta (4:15.07.90-0ubuntu1) UNRELEASED; urgency=medium
+okteta (4:15.07.90-0ubuntu1) wily; urgency=medium
 
   [ José Manuel Santamaría Lema ]
   * Update symbols files:
@@ -8,7 +8,7 @@ okteta (4:15.07.90-0ubuntu1) UNRELEASED; urgency=medium
   [ Jonathan Riddell ]
   * New upstream beta release
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 13 Aug 2015 22:47:44 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:29:17 +0100
 
 okteta (4:15.04.2-0ubuntu3) wily; urgency=medium
 
diff --git a/debian/okteta.install b/debian/okteta.install
index 4d1a524..8d505ff 100644
--- a/debian/okteta.install
+++ b/debian/okteta.install
@@ -12,9 +12,6 @@ usr/share/icons/hicolor/16x16/apps/okteta.png
 usr/share/icons/hicolor/32x32/apps/okteta.png
 usr/share/icons/hicolor/48x48/apps/okteta.png
 usr/share/kxmlgui5/okteta/oktetaui.rc
-usr/share/oktetapart/oktetapartbrowserui.rc
-usr/share/oktetapart/oktetapartreadonlyui.rc
-usr/share/oktetapart/oktetapartreadwriteui.rc
 usr/share/mime/packages/okteta.xml
 usr/share/okteta/structures/elf/main.osd
 usr/share/okteta/structures/elf/metadata.desktop
@@ -22,3 +19,6 @@ usr/share/okteta/structures/gccxml-to-osd.xsl
 usr/share/okteta/structures/png/main.osd
 usr/share/okteta/structures/png/metadata.desktop
 usr/share/okteta/structures/uuid.js
+usr/share/oktetapart/oktetapartbrowserui.rc
+usr/share/oktetapart/oktetapartreadonlyui.rc
+usr/share/oktetapart/oktetapartreadwriteui.rc

-- 
okteta packaging