[SCM] kiriki packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-20-g4bfb9d1

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit cb7adc5ba6a1c2ddef1c94fd1b0e70b3a828b870
Merge: b660b78dcac71d27526d25acaa0e278e7c82b347 4ced8e3b1110c73e136d80bdf43681f46b75d8c7
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Feb 5 11:11:22 2016 -0800

    Merge branch 'master' into kubuntu_xenial_archive

 debian/.gitattributes |  1 +
 debian/changelog      | 19 +++++++++++++++++++
 debian/control        | 25 ++++++++++++++++++-------
 debian/copyright      | 11 +++++------
 debian/kiriki.install |  1 +
 5 files changed, 44 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index 46aa863,e189d10..8382514
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,22 +1,47 @@@
+ kiriki (4:15.12.1-1) experimental; urgency=medium
+ 
+   * New upstream release (15.12.0).
+   * New upstream release (15.12.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:44 +0100
+ 
 +kiriki (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:58:15 +0000
 +
+ kiriki (4:15.08.3-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:39:26 +0100
+ 
 +kiriki (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:30:03 +0100
 +
 +kiriki (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:03:59 +0100
 +
+ kiriki (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 09 Sep 2015 21:22:17 +0200
+ 
 +kiriki (4:15.08.0-0ubuntu2) UNRELEASED; urgency=medium
 +
 +  * Add missing org.kde.kiriki.appdata.xml
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 08 Sep 2015 08:19:15 +0200
 +
  kiriki (4:15.08.0-0ubuntu1) wily; urgency=medium
  
    * new upstream release
diff --cc debian/kiriki.install
index 2ecfb91,002df54..823d7f2
--- a/debian/kiriki.install
+++ b/debian/kiriki.install
@@@ -1,8 -1,8 +1,9 @@@
  ../icons/kiriki-16.xpm /usr/share/pixmaps
  ../icons/kiriki.xpm /usr/share/pixmaps
  usr/games/kiriki
 +usr/share/appdata/org.kde.kiriki.appdata.xml
  usr/share/applications/org.kde.kiriki.desktop
+ usr/share/appdata/org.kde.kiriki.appdata.xml
  usr/share/doc/HTML/en/kiriki/
  usr/share/icons/hicolor/128x128/apps/kiriki.png
  usr/share/icons/hicolor/16x16/apps/kiriki.png

-- 
kiriki packaging