[SCM] okteta packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-47-g75fb8a0

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d95f0cdcae91199447aa830b13e9d419f9b5251c
Merge: 85c63ea2dbb279ee78839a8dfed327682921290e c38a09b409e460ee52a937e07518753e082bd789
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Sep 9 09:53:40 2015 +0200

    Merge tag 'ubuntu/4%15.08.0-0ubuntu1'
    
    'okteta Ubuntu release 4:15.08.0-0ubuntu1'

 debian/changelog            | 66 +++++++++++++++++++++++++++++++++++++++++++++
 debian/okteta.install       |  6 +++--
 debian/source/local-options |  1 -
 debian/watch                |  1 +
 4 files changed, 71 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 2c6cb7a,39b4fb6..8bec044
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,69 +1,90 @@@
 +okteta (4:15.08.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (15.04.0).
 +  * Add missing dev dependency (thanks to acc headers check)
 +  * New patch: install_missing_header
 +  * Update symbols files.
 +  * New upstream release (15.04.1).
 +  * Update symbols files.
 +  * New upstream release (15.04.2).
 +  * New upstream release (15.04.3).
 +  * New upstream release (15.08.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 31 Aug 2015 12:14:39 +0200
 +
+ okteta (4:15.08.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 18:19:59 +0100
+ 
+ okteta (4:15.07.90-0ubuntu1) wily; urgency=medium
+ 
+   [ José Manuel Santamaría Lema ]
+   * Update symbols files:
+     - Remove the .amd64 suffix allowing to use the files for other architectures
+     - Mark as optional the symbols gone after building with GCC 5
+ 
+   [ Jonathan Riddell ]
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 12:25:28 +0100
+ 
+ okteta (4:15.04.2-0ubuntu3) wily; urgency=medium
+ 
+   * Fix version number for symbols file updates.
+ 
+  -- Matthias Klose <doko at ubuntu.com>  Wed, 12 Aug 2015 19:45:31 +0200
+ 
+ okteta (4:15.04.2-0ubuntu2) wily; urgency=medium
+ 
+   * Update symbols files.
+ 
+  -- Matthias Klose <doko at ubuntu.com>  Wed, 12 Aug 2015 19:21:29 +0200
+ 
+ okteta (4:15.04.2-0ubuntu1) wily; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+ 
+   [ José Manuel Santamaría Lema ]
+   * Delete upstream_cmake-IconThemes.diff, applied upstream.
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+   * Vivid backport
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 22:34:19 +0200
+ 
 +okteta (4:14.12.3-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 29 Mar 2015 15:13:45 +0200
 +
+ 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
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 15 Apr 2015 21:01:07 +0200
+ 
+ okteta (4:14.12.3-0ubuntu2) vivid; urgency=medium
+ 
+   * Add upstream_cmake-IconThemes.diff to fix compile
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 15 Apr 2015 16:27:07 +0200
+ 
  okteta (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    [ Scarlett Clark ]
diff --cc debian/okteta.install
index 42fa6f7,2d393b3..de82792
--- a/debian/okteta.install
+++ b/debian/okteta.install
@@@ -3,12 -3,22 +3,14 @@@ usr/bin/oktet
  usr/bin/struct2osd
  usr/lib/*/qt5/plugins/designer/oktetadesignerplugin.so
  usr/lib/*/qt5/plugins/oktetapart.so
- usr/share/appdata/okteta.appdata.xml
+ usr/share/appdata/org.kde.okteta.appdata.xml
  usr/share/applications/org.kde.okteta.desktop
  usr/share/config.kcfg/structviewpreferences.kcfg
 -usr/share/doc/HTML/en/okteta/index.cache.bz2
 -usr/share/doc/HTML/en/okteta/index.docbook
 -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/doc/HTML/*/okteta/
 +usr/share/icons/hicolor/*/apps/okteta.png
  usr/share/kxmlgui5/okteta/oktetaui.rc
+ usr/share/kxmlgui5/oktetapart/oktetapartbrowserui.rc
+ usr/share/kxmlgui5/oktetapart/oktetapartreadonlyui.rc
+ usr/share/kxmlgui5/oktetapart/oktetapartreadwriteui.rc
  usr/share/mime/packages/okteta.xml
 -usr/share/okteta/structures/elf/main.osd
 -usr/share/okteta/structures/elf/metadata.desktop
 -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/okteta/
- usr/share/oktetapart/

-- 
okteta packaging