[SCM] kate packaging branch, kubuntu_unstable_utopic, updated. debian/4.14.2-2-38-g026b832
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Tue Dec 9 12:38:30 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/kate.git;a=commitdiff;h=84fb89a
The following commit has been merged in the kubuntu_unstable_utopic branch:
commit 84fb89ab947c790c9aa041ca5415550b28befe71
Merge: 6d4f4d251bf12ad3bb89ab0f3d7ef2f96fc8ec2b b153a7c72f995b72cd1dd6d4a0d2164c1837519e
Author: Harald Sitter <sitter at kde.org>
Date: Tue Dec 9 13:28:56 2014 +0100
Merge branch 'kubuntu_unstable' into kubuntu_unstable_utopic
Conflicts:
debian/control
debian/changelog | 1 +
debian/control | 4 ++--
debian/kate-data.install | 22 ----------------------
debian/kate.install | 1 -
debian/kate5-data.install | 8 +++-----
debian/kwrite.install | 1 -
6 files changed, 6 insertions(+), 31 deletions(-)
diff --cc debian/control
index 286acd9,b76fda7..a3d711f
--- a/debian/control
+++ b/debian/control
@@@ -65,8 -64,8 +65,8 @@@ Description: powerful text edito
Package: kate5-data
Architecture: all
Depends: ${misc:Depends}
- Breaks: kdelibs5-data (<< 4:4.6.90)
- Replaces: kdelibs5-data (<< 4:4.6.90)
-Replaces: kate-data (<< 4.14.3-0ubuntu4)
-Breaks: kate-data (<< 4.14.3-0ubuntu4)
++#Replaces: kate-data (<< 4.14.3-0ubuntu4)
++#Breaks: kate-data (<< 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
More information about the pkg-kde-commits
mailing list