[SCM] amor packaging branch, kubuntu_vivid_archive, updated. debian/4.13.3-1-4-g97f4313

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 97f4313233b9f7a09756d7935c05bc6ecf78ede1
Merge: 60227858a4a075e2b28cfff11f7a589e9ac4e671 17ed34660ddf5c10545cb1f9bb7c79cc76b1eb51
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Tue Dec 2 09:27:41 2014 -0800

      * New upstream release candidate
    
     * New upstream Release candidate. * Fix VCS entries to reflect new git location.
    
    -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 24 Nov 2014 07:06:22 -0800
    
     * New upstream Release candidate.
     * Fix VCS entries to reflect new git location.
    -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 24 Nov 2014 07:06:22 -0800

 debian/changelog | 8 ++++++++
 debian/control   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 35e4013,bc2ecdb..679472f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
 +amor (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 02 Dec 2014 09:21:24 -0800
 +
+ amor (4:14.11.95-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream Release candidate.
+   * Fix VCS entries to reflect new git location. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 24 Nov 2014 07:06:22 -0800
+ 
++
  amor (4:14.11.90-0ubuntu1) vivid; urgency=medium
  
    * Initial release for KDE applications 14.12 series 

-- 
amor packaging