[SCM] marble packaging branch, kde4.11, updated. debian/4.10.5-1-8-gfa440c3

[Maximiliano Curia]

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

The following commit has been merged in the kde4.11 branch:
commit fa440c3de769e84dec99f5b3f1e9967fc5a5dbdf
Merge: b891f78482dbb9c239baee432ae5f85b2604b932 4575944fc2f6bbb07ed2db05bd3a47825b2d6fb9
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Sep 27 22:52:57 2013 +0200

    Merge branch 'master' into kde4.11
    
    Conflicts:
    	debian/changelog

 debian/changelog |    8 +++++++-
 debian/control   |    1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 2b7e387,39b3591..16b4bd2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,18 @@@
- marble (4:4.11.1-0r0) UNRELEASED; urgency=low
 -marble (4:4.10.5-2) UNRELEASED; urgency=low
++marble (4:4.11.1-0r1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
++
++  [ Maximiliano Curia ]
 +  * Bump libmarblewidget package soname.
 +  * Update install files.
 +  * Update not-installed.
 +  * Add symbols for libmarblewidget16.
  
+   [ Pino Toscano ]
+   * Add the libqextserialport-dev build dependency, to bring back serial input
+     in APRS plugin.
+ 
 - -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Sep 2013 13:19:39 +0200
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Sep 2013 20:26:46 +0200
  
  marble (4:4.10.5-1) unstable; urgency=low
  

-- 
marble packaging