[SCM] Konversation packaging for Debian branch, master, updated. debian/1.3-beta1-2

Modestas Vainius modax at alioth.debian.org
Sun May 23 19:35:53 UTC 2010


The following commit has been merged in the master branch:
commit 4e87b463d6d562d3ce410b92d256bfc858cdf2d3
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun May 23 21:45:10 2010 +0300

    Split off data files to a new konversation-data package.
---
 debian/changelog                 |    5 +++++
 debian/control                   |   13 +++++++++++--
 debian/konversation-data.install |    5 +++++
 debian/konversation.install      |    7 -------
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61c6e88..8d825ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 konversation (1.3~beta1-2) UNRELEASED; urgency=low
 
   * Improve konversation-dbg description a bit.
+  * Split off data files to a new konversation-data package:
+    - make konversation Depend on konversation-data;
+    - add previous konversation to konversation-data Replaces;
+    - move python Recommends to konversation-data;
+    - move ${perl:Depends} from konversation Depends to konversation-data.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 23 May 2010 21:32:53 +0300
 
diff --git a/debian/control b/debian/control
index c176cb3..4938786 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/konversation.git;a=summ
 
 Package: konversation
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, konversation-data (= ${source:Version})
 Provides: irc
-Recommends: python
 Description: user friendly Internet Relay Chat (IRC) client for KDE
  Konversation is a client for the Internet Relay Chat (IRC) protocol.
  It is easy to use and well-suited for novice IRC users, but novice
@@ -34,6 +33,16 @@ Description: user friendly Internet Relay Chat (IRC) client for KDE
        * Traditional or enhanced-shell-style nick completion
        * DCC file transfer with resume support
 
+Package: konversation-data
+Architecture: all
+Depends: ${misc:Depends}, ${perl:Depends}
+Recommends: konversation (>= ${source:Version}), python
+Replaces: konversation (<< 1.3~beta1-2)
+Description: data files for Konversation
+ Konversation is a client for the Internet Relay Chat (IRC) protocol. This
+ package contains data files for Konversation. It is probably of no use if
+ `konversation' package is not installed.
+
 Package: konversation-dbg
 Section: debug
 Architecture: any
diff --git a/debian/konversation-data.install b/debian/konversation-data.install
new file mode 100644
index 0000000..be3d442
--- /dev/null
+++ b/debian/konversation-data.install
@@ -0,0 +1,5 @@
+usr/share/doc/kde4/*
+usr/share/icons/hicolor/*
+usr/share/kde4/apps/kconf_update/konversation*
+usr/share/kde4/apps/konversation/*
+usr/share/locale/*
diff --git a/debian/konversation.install b/debian/konversation.install
index 3f24f10..039f01b 100644
--- a/debian/konversation.install
+++ b/debian/konversation.install
@@ -1,12 +1,5 @@
-# Debian menu XPM icons
 debian/*.xpm usr/share/pixmaps
-
 usr/bin/konversation
 usr/share/applications/kde4/konversation.desktop
-usr/share/doc/kde4/*
-usr/share/icons/hicolor/*
-usr/share/kde4/apps/kconf_update/konversation*
-usr/share/kde4/apps/konversation/*
 usr/share/kde4/services/konvirc.protocol
 usr/share/kde4/services/konvirc6.protocol
-usr/share/locale/*

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list