[SCM] KDE Network module packaging branch, master, updated. debian/4.4.5-2-21-gc85f4b1
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Fri Mar 4 16:18:20 UTC 2011
The following commit has been merged in the master branch:
commit d472d7edb884da0c30711ac20dc85ebf3d94c4bc
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Fri Feb 4 14:37:01 2011 +0100
Bump S-V to 3.9.1; add Breaks next to Replaces where needed.
---
debian/changelog | 1 +
debian/control | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4057b08..5359078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ kdenetwork (4:4.6.0-0r1) UNRELEASED; urgency=low
[ José Manuel Santamaría Lema ]
* Removed patch 03_kopete_icq_login_fix.diff, applied upstream.
* Bump kde-sc-dev-latest build dependency to 4:4.6.0.
+ * Bump S-V to 3.9.1; add Breaks next to Replaces where needed.
[ Pino Toscano ]
* Add build dependencies:
diff --git a/debian/control b/debian/control
index a16c265..03f7459 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.0),
shared-desktop-ontologies, libgpgme11-dev, libexpat-dev, libgif-dev,
libktorrent-dev, libkonq5-dev, kdebase-workspace-dev
Build-Conflicts: libmediastreamer-dev (= 3.3.0-1) [amd64]
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://www.kde.org/
Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdenetwork.git
Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdenetwork.git
@@ -69,6 +69,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: libjasper-runtime, kopete (= ${binary:Version})
Replaces: kopete (<< 4:4.1.86)
+Breaks: kopete (<< 4:4.1.86)
Description: main Kopete library
Kopete is an instant messaging and chat application with support for a wide
variety of services, such as AIM, Yahoo, ICQ, MSN, and Jabber. Advanced
@@ -98,7 +99,7 @@ Architecture: any
Depends: libkopete4 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:libkopete4},
${misc:Depends}
Replaces: kdenetwork-dev (<< 4:4.1.86)
-Conflicts: kdenetwork-dev (<< 4:4.1.86)
+Breaks: kdenetwork-dev (<< 4:4.1.86)
Description: development files for the Kopete instant messaging and chat application
Kopete is an instant messaging and chat application with support for a wide
variety of services, such as AIM, Yahoo, ICQ, MSN, and Jabber. Advanced
@@ -125,6 +126,7 @@ Section: net
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: kopete (<< 4:4.1.86)
+Breaks: kopete (<< 4:4.1.86)
Recommends: rdesktop
Suggests: khelpcenter4, krfb
Description: Remote Desktop Connection client
--
KDE Network module packaging
More information about the pkg-kde-commits
mailing list