[SCM] blinken packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-14-g2a3e312

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 53df22fd711aec0093fff7e97bc5a06bc0c62fb1
Merge: 8eba4d65f09ed76cda519d36f5b65c4ae3a6b43c 14d7bc6c092d1934e88feee2b56a57e18fa6eafc
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Sep 6 11:57:54 2015 +0200

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

 debian/blinken.install |  2 +-
 debian/changelog       | 25 +++++++++++++++++++++++++
 debian/not-installed   |  4 ++--
 debian/watch           |  1 +
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/blinken.install
index 358d6c4,1b9145f..695258a
--- a/debian/blinken.install
+++ b/debian/blinken.install
@@@ -3,7 -3,8 +3,7 @@@
  usr/games/blinken
  usr/share/appdata/blinken.appdata.xml
  usr/share/applications/org.kde.blinken.desktop
 -usr/share/blinken/images/
 -usr/share/blinken/sounds/
 -usr/share/config.kcfg/*
 -usr/share/doc/*
 -usr/share/icons/*
 +usr/share/blinken/
 +usr/share/config.kcfg/blinken.kcfg
- usr/share/doc/HTML/en/blinken/
++usr/share/doc/HTML/*/blinken/
 +usr/share/icons/hicolor/*/apps/blinken.*
diff --cc debian/changelog
index c514acb,7eb7d4e..d8a63f4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,28 +1,41 @@@
 +blinken (4:15.08.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (15.04.0).
 +  * New upstream release (15.08.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 06 Sep 2015 11:51:39 +0200
 +
+ blinken (4:15.08.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Ubuntu <ubuntu at ip-10-170-33-178.ec2.internal>  Wed, 26 Aug 2015 16:12:34 +0100
+ 
+ blinken (4:15.07.90-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+   * new upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 08:56:02 +0100
+ 
+ blinken (4:15.04.2-0ubuntu1) wily; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+   * New upstream release
+   * Vivid backport
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:20:57 +0200
+ 
 +blinken (4:14.12.3-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 29 Mar 2015 15:13:27 +0200
 +
  blinken (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
blinken packaging