[SCM] kapidox packaging branch, master, updated. debian/5.37.0-2-85-gb2e06c9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kapidox.git;a=commitdiff;h=ea9a47a

The following commit has been merged in the master branch:
commit ea9a47a4ae28b96f2c37a50a0ebba5edc8a45602
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Sep 29 14:40:39 2015 -0700

    Copyright shortname change again.
---
 debian/changelog | 5 +++--
 debian/copyright | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ef9537..b2a9e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kapidox (5.14.0-0ubuntu1) wily; urgency=medium
+kapidox (5.14.0-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Clive Johnston ]
   * new upstream release
@@ -7,8 +7,9 @@ kapidox (5.14.0-0ubuntu1) wily; urgency=medium
   * Vivid backport. 
   * Fix copyright shortname.
   * Fix Vcs entries to point to git.
+  * Copyright shortname change again. 
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 14:23:40 +0200   
+ -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 14:23:40 +0200
 
 kapidox (5.13.0-0ubuntu1) wily; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 7cad1ce..21fc3c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Copyright: 2014  Alex Merry <alex.merry at kdemail.net>
            2014  Alex Turbov <i.zaufi at gmail.com>
            2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
            2014 Scott Kitterman <scott at kitterman.com>
-License: BSD_2_Clause
+License: BSD-2-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:

-- 
kapidox packaging