[SCM] KDE Network module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdenetwork.git;a=commitdiff;h=086a736

The following commit has been merged in the master branch:
commit 086a7364c1b1ed7e0a7cb637514f19e5a14ed4c3
Merge: 8582f07a0b3bffb790bee7250ac7537ef1b6bb71 22fca7adbc756a85a0d11bbcb3974638eafe8e26
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jul 1 13:26:39 2013 +0200

    Merge branch 'kde4.10' of git://git.debian.org/pkg-kde/kde-sc/kdenetwork into kde4.10
    
    Conflicts:
    	debian/control

 debian/changelog |    1 +
 1 file changed, 1 insertion(+)

diff --cc debian/changelog
index 0b4a191,0c60420..4975fdf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,12 -2,9 +2,13 @@@ kdenetwork (4:4.10.4-2) UNRELEASED; urg
  
    [ Maximiliano Curia ]
    * Merge 4:4.8.4-2 from sid.
 +  * Merge 4:4.8.4-3 from sid.
 +  * Add libtelepathy-qt4-dev as a build-dep.
 +  * Add nepomuk-core-dev as a build-dep.
 +  * Add kde-workspace-dev as a build-dep.
  
    [ Pino Toscano ]
+   * Merge 4:4.8.4-3 from sid.
    * 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

-- 
KDE Network module packaging