[SCM] KDE Network module packaging branch, master, updated. debian/4.4.5-2-8-gf8185b0
Modestas Vainius
modax at alioth.debian.org
Sun Nov 28 16:56:19 UTC 2010
The following commit has been merged in the master branch:
commit f8185b0692b350099c948151ad417784f41780f0
Merge: b718033047dfb0475e86c58dc9f1cd910b8ced49 0f38166e6cf38cd5b5aaca2ae37c7b4516354a75
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sun Nov 28 18:55:53 2010 +0200
Merge remote branch 'origin/kde4.5'
Conflicts:
debian/changelog
debian/patches/series
debian/changelog | 14 +
debian/control | 7 +-
debian/kget.install | 6 +-
debian/kopete.install | 4 +-
debian/krdc.install | 2 +-
debian/krfb.install | 5 +-
debian/libkopete4.install | 2 +-
debian/libkopete4.symbols | 3 +-
.../01_backport_use_system_libktorrent.diff | 425 --------------------
debian/patches/02_debian_libktorrent_porting.diff | 333 ---------------
debian/patches/series | 2 -
11 files changed, 28 insertions(+), 775 deletions(-)
diff --cc debian/changelog
index 1dc6e8e,e5baddf..a3f2d00
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,20 +1,27 @@@
+ kdenetwork (4:4.5.1-0r1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
- [ Modestas Vainius ]
- * Point debian/control Vcs fields to the new Git repository.
-
+ [ George Kiagiadakis ]
+ * Add myself to uploaders.
+ * Update installed files.
+ * Remove all patches; applied upstream.
+ * Bump build dependencies on kdelibs5-dev and
+ kdepimlibs5-dev to version 4:4.5.
+ * Update libkopete symbols file.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 01 Sep 2010 18:14:10 +0300
+
+kdenetwork (4:4.4.5-2) unstable; 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> Sun, 28 Nov 2010 17:25:54 +0200
+
kdenetwork (4:4.4.5-1) unstable; urgency=low
[ Modestas Vainius ]
diff --cc debian/patches/series
index 899f203,0000000..b468021
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
- 01_backport_use_system_libktorrent.diff
- 02_debian_libktorrent_porting.diff
+03_kopete_icq_login_fix.diff
--
KDE Network module packaging
More information about the pkg-kde-commits
mailing list