[SCM] KDE Network module packaging branch, squeeze, updated. debian/4.4.5-1-9-g451c043

Modestas Vainius modax at alioth.debian.org
Sun Nov 28 15:48:45 UTC 2010


The following commit has been merged in the squeeze branch:
commit f5e4af82f30b215b47ef47e53cf1efd25645abef
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Nov 28 17:24:22 2010 +0200

    Solve circular kopete <=> libkopete4 dependencies.
    
    Downgrade kopete Depends to Recommends for libkopete4
    (Closes: #580044)
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |    2 ++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3fff7b..c5933a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kdenetwork (4:4.4.5-2) UNRELEASED; urgency=low
   * Point debian/control Vcs fields to the new Git repository.
   * Add patch 03_kopete_icq_login_fix.diff to change ICQ login server address.
     (Closes: #603661)
+  * Solve circular dependencies by downgrading kopete Depends to Recommends
+    for libkopete4. (Closes: #580044)
 
  -- Modestas Vainius <modax at debian.org>  Mon, 26 Jul 2010 23:24:36 +0300
 
diff --git a/debian/control b/debian/control
index 447fa87..95de11a 100644
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,7 @@ Package: libkopete4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libjasper-runtime
+Recommends: libjasper-runtime, kopete (= ${binary:Version})
 Replaces: kopete (<< 4:4.1.86)
 Description: main Kopete library
  Kopete is an instant messaging and chat application with support for a wide
diff --git a/debian/rules b/debian/rules
index be07468..b9817c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,8 @@ DEB_FIXPERMS_EXCLUDE := usr/bin/kppp
 #DEB_DH_MAKESHLIBS_ARGS_libkopete4 := -V'libkopete4 (>= 4:4.1.86)'
 DEB_DH_MAKESHLIBS_ARGS_libkopete4 := -V
 
+DEB_DH_SHLIBDEPS_ARGS_libkopete4 := -- -xkopete
+
 binary-install/kppp::
 	chown root:dip debian/kppp/usr/bin/kppp
 	chmod 4754 debian/kppp/usr/bin/kppp

-- 
KDE Network module packaging



More information about the pkg-kde-commits mailing list