[SCM] parley packaging branch, master, updated. debian/14.12.2-1-6-gabb5632

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit abb5632cff80c2e5bf7105bcc3ad082198110494
Merge: 2b3d5b5a050cef7cd776c4596694cd242a459b2e 7cb1b55d20b83a63edaa129dd6319ea297f5bd36
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 20:57:55 2015 +0100

    Merge commit '7cb1b55d20b83a63edaa129dd6319ea297f5bd36'
    
    Conflicts:
    	debian/control

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 4c5b771,679c908..6233958
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,9 +1,24 @@@
 +parley (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 12:56:20 +0100
 +
+ parley (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:27:50 -0700
+ 
 +parley (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.2).
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 23 Feb 2015 11:09:15 +0100
 +
  parley (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
parley packaging