[SCM] kate packaging branch, kubuntu_unstable_utopic, updated. debian/4.14.2-2-53-g268c4bb

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable_utopic branch:
commit 268c4bb5f6cb3d432beba251c30f3b6bbd6abacf
Merge: 8b348b2cec674f0cfdbc65e651d48a98c9f0102f 8ef88318a61e5c32d029ea7a9e8cce46d38bf58f
Author: Rohan Garg <rohan at kde.org>
Date:   Mon Jan 19 17:18:35 2015 +0100

    Merge branch 'kubuntu_unstable' into kubuntu_unstable_utopic
    
    Conflicts:
    	debian/control

 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/control
index a3d711f,ac179a5..bbd289e
--- a/debian/control
+++ b/debian/control
@@@ -65,8 -64,8 +65,8 @@@ Description: powerful text edito
  Package: kate5-data
  Architecture: all
  Depends: ${misc:Depends}
- #Replaces: kate-data (<< 4.14.3-0ubuntu4)
- #Breaks: kate-data (<< 4.14.3-0ubuntu4)
 -Replaces: kate-data (<< 4:4.14.3-0ubuntu4)
 -Breaks: kate-data (<< 4:4.14.3-0ubuntu4)
++#Replaces: kate-data (<< 4:4.14.3-0ubuntu4)
++#Breaks: kate-data (<< 4:4.14.3-0ubuntu4)
  Description: shared data files for Kate text editor
   This package contains the architecture-independent shared data files needed
   for Kate editor

-- 
kate packaging