[SCM] kwrited packaging branch, kubuntu_vivid_archive, updated. d63a4f7799eb92e1b1c2ffc18fb3770425d49135

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwrited.git;a=commitdiff;h=d63a4f7

The following commit has been merged in the kubuntu_vivid_archive branch:
commit d63a4f7799eb92e1b1c2ffc18fb3770425d49135
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Nov 5 18:37:08 2014 +0100

    Remove kwrited-data, it's needless
---
 debian/changelog            |  6 ++++++
 debian/control              | 14 +++-----------
 debian/kwrited-data.install |  2 --
 debian/kwrited.install      |  1 +
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18e068e..e97d4c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kwrited (4:5.1.0.1-0ubuntu2) vivid; urgency=medium
+
+  * Remove kwrited-data, it's needless
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 05 Nov 2014 18:36:43 +0100
+
 kwrited (4:5.1.0.1-0ubuntu1) vivid; urgency=medium
 
   [ Jonathan Riddell ]
diff --git a/debian/control b/debian/control
index c1ae6c2..41e8476 100644
--- a/debian/control
+++ b/debian/control
@@ -55,23 +55,15 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kwrited.git
 Package: kwrited
 Section: utils
 Architecture: any
-Depends: kwrited-data (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: kwrited-data
+Breaks: kwrited-data
 Description: Read and write console output to X.
  Kwrited captures console output (e.g. broadcast messages) and prints
  it in a X window.
  .
  This package is part of the KDE base workspace module.
 
-Package: kwrited-data
-Section: libs
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Read and write console output to X data files.
- Kwrited captures console output (e.g. broadcast messages) and prints
- it in a X window.
- .
- This package contains the data files
-
 Package: kwrited-dbg
 Section: debug
 Architecture: any
diff --git a/debian/kwrited-data.install b/debian/kwrited-data.install
deleted file mode 100644
index f7ce9f9..0000000
--- a/debian/kwrited-data.install
+++ /dev/null
@@ -1,2 +0,0 @@
-
-usr/share/*
diff --git a/debian/kwrited.install b/debian/kwrited.install
index 6dd87c1..e219cfd 100644
--- a/debian/kwrited.install
+++ b/debian/kwrited.install
@@ -1,2 +1,3 @@
 etc/*
 usr/bin/*
+usr/share/*

-- 
kwrited packaging