[SCM] libkdegames packaging branch, kubuntu_unstable, updated. debian/15.08.3-1-29-g3ba226e

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 3ba226e6aab32aca803d7afa8ede72a25342704a
Merge: a6e5f6d763f5c7ed3f76453ad8a3feb18f00615a 153086e472a2f9ee851488c477abcd79f560fedc
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Mon Mar 7 16:47:37 2016 -0800

     * Merged with Debian * New upstream release
    -- Clive Johnston <clivejo at aol.com>  Sat, 13 Feb 2016 15:00:47 +0000 * New upstream release (15.12.0). * Follow upstream soversion bump * New patch: incomplete_header
    -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:32 +0100 * New upstream release (15.08.3). * Update symbols files from buildds logs (4:15.08.0-1).
    -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:39:20 +0100
    
     * Merged with Debian
     * New upstream release
    -- Clive Johnston <clivejo at aol.com>  Sat, 13 Feb 2016 15:00:47 +0000
     * New upstream release (15.12.0).
     * Follow upstream soversion bump
     * New patch: incomplete_header
    -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:32 +0100
     * New upstream release (15.08.3).
     * Update symbols files from buildds logs (4:15.08.0-1).
    -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:39:20 +0100

 debian/.gitattributes                 |   1 +
 debian/changelog                      |  63 +++++++-
 debian/control                        |  31 ++--
 debian/copyright                      | 282 ++++++++++++++++++++--------------
 debian/libkf5kdegames-dev.acc.in      |  21 +++
 debian/libkf5kdegames-dev.install     |   7 +-
 debian/libkf5kdegames7.symbols        |   6 +-
 debian/libkf5kdegamesprivate1.symbols |   8 +-
 debian/patches/incomplete_header      |  10 ++
 debian/patches/series                 |   1 +
 debian/rules                          |   6 +-
 debian/source/include-binaries        |   1 -
 debian/tests/acc                      |  18 +++
 debian/tests/control                  |   3 +
 debian/watch                          |   1 -
 15 files changed, 309 insertions(+), 150 deletions(-)

diff --cc debian/changelog
index 3bf66e9,76e4ba8..7048f81
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,25 +1,36 @@@
+ libkdegames (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
+ 
++  [ Clive Johnston ]
+   * Merged with Debian
+   * New upstream release
+ 
++  [ Scarlett Clark ]
++  * Fix merger. 
++
+  -- Clive Johnston <clivejo at aol.com>  Sat, 13 Feb 2016 15:00:47 +0000
+ 
+ libkdegames (4:15.12.0-1) experimental; urgency=medium
+ 
+   * New upstream release (15.12.0).
+   * Follow upstream soversion bump
+   * New patch: incomplete_header
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:32 +0100
+ 
 +libkdegames (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +  * Updating symbols 
 +
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:31:52 +0000
 +
+ libkdegames (4:15.08.3-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.3).
+   * Update symbols files from buildds logs (4:15.08.0-1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:39:20 +0100
+ 
  libkdegames (4:15.08.2-0ubuntu1) wily; urgency=medium
  
    * New upstream release

-- 
libkdegames packaging