[SCM] KDE Network module packaging branch, master, updated. debian/4.10.5-1
Pino Toscano
pino at alioth.debian.org
Sat Jul 13 13:15:56 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdenetwork.git;a=commitdiff;h=97bdcab
The following commit has been merged in the master branch:
commit 97bdcabd0d999222bcd0580d267369bda38ef8b3
Merge: 54e41cf20aceee1e2882d41b7b4049e55ef974bd c636c6ae6f5f5960df897cbfa2018d9e6a556f59
Author: Pino Toscano <pino at debian.org>
Date: Mon Jul 1 12:33:38 2013 +0200
Merge remote-tracking branch 'origin/master' into kde4.10
Conflicts:
debian/changelog
debian/control
debian/patches/series
debian/changelog | 12 ++++++++++++
debian/kppp.NEWS | 8 ++++++++
debian/kppp.README.Debian | 9 +++++++++
debian/kppp.lintian-overrides | 3 ++-
debian/patches/add_libpthread_to_krfb.diff | 13 +++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
7 files changed, 46 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index 8e51c03,d8dd6d2..b1bf8f8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,15 +1,46 @@@
+kdenetwork (4:4.10.4-2) UNRELEASED; urgency=low
+
+ [ Maximiliano Curia ]
+ * Merge 4:4.8.4-2 from sid.
+
+ [ Pino Toscano ]
+ * Drop patch upstream_r1353735.diff, backported from upstream.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 15 Jun 2013 08:48:17 +0200
+
+kdenetwork (4:4.10.4-1) experimental; urgency=low
+
+ * New upstream release.
+ * Bump debhelper build-dep and compat to 9.
+ * Bump Standards-Version to 3.9.4.
+ * Update vcs fields.
+ * Add myself to uploaders.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 14 Jun 2013 20:21:28 +0200
+
+kdenetwork (4:4.10.2-1) experimental; urgency=low
+
+ * New upstream.
+ * Update symbols file.
+ * Update install files.
+ * Bump build-deps
+ * Temporarily remove kde-workspace build-dep to get the package built on
+ autobuilders.
+
+ -- Sune Vuorela <sune at debian.org> Fri, 12 Apr 2013 21:32:12 +0000
+
+ kdenetwork (4:4.8.4-3) unstable; urgency=low
+
+ * Remove setiud bit to the kppp binary. (Closes: #709972)
+ * Bump debhelper build-dep and compat to 9.
+ * Update uploaders.
+ * Add myself to uploaders.
+ * Bump Standards-Version to 3.9.4, no changes needed.
+ * New patch: add_libpthread_to_krfb.diff. (Closes: #713770)
+ * Update kppp lintian-overrides.
+
+ -- Maximiliano Curia <maxy at debian.org> Sun, 30 Jun 2013 18:54:50 +0200
+
kdenetwork (4:4.8.4-2) unstable; urgency=low
* Team upload.
diff --cc debian/patches/series
index b64f8fb,d041f73..1549db4
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,3 +1,2 @@@
kdenetwork-4.7.97-fix-for-g++47.patch
-upstream_r1353735.diff
+ add_libpthread_to_krfb.diff
--
KDE Network module packaging
More information about the pkg-kde-commits
mailing list