[SCM] jovie packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 1658c31abd824cc3ff1a596db9a6e7e6f576cd68
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sat Apr 6 10:35:24 2013 +0000

    New upstream.
    
    * Remove scroll-fix patch. Merged upstream
    * Bump build-deps to 4.10
---
 debian/changelog                          |    8 ++++++++
 debian/control                            |    4 ++--
 debian/jovie.install                      |    2 +-
 debian/patches/jovie_scroll_when_add.diff |   21 ---------------------
 debian/patches/series                     |    1 -
 5 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 762275d..489da4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jovie (4:4.10.2-1) UNRELEASED; urgency=low
+
+  * New upstream.
+  * Remove scroll-fix patch. Merged upstream
+  * Bump build-deps to 4.10
+
+ -- Sune Vuorela <sune at debian.org>  Sat, 06 Apr 2013 10:28:09 +0000
+
 jovie (4:4.8.4-2) unstable; urgency=low
 
   * Woops. Missing a epoch. reuploading with epoch.
diff --git a/debian/control b/debian/control
index bf4a341..e1ad4eb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <sune at debian.org>, Modestas Vainius <modax at debian.org>,
  Eshat Cakar <info at eshat.de>
-Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
+Build-Depends: kde-sc-dev-latest (>= 4:4.10),
  cmake, debhelper (>= 8.0), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.7),
+ kdelibs5-dev (>= 4:4.10),
  libspeechd-dev
 Standards-Version: 3.9.3
 Homepage: http://accessibility.kde.org/developer/kttsd
diff --git a/debian/jovie.install b/debian/jovie.install
index cc13535..37220b4 100644
--- a/debian/jovie.install
+++ b/debian/jovie.install
@@ -2,7 +2,7 @@ usr/bin/jovie
 usr/lib/kde4/jovie_*.so
 usr/lib/kde4/kcm_kttsd.so
 usr/lib/libkttsd.so.4
-usr/lib/libkttsd.so.4.8.0
+usr/lib/libkttsd.so.4.*.*
 usr/share/applications/kde4/jovieapp.desktop
 usr/share/doc/kde/HTML/en/jovie/*
 usr/share/icons/hicolor/16x16/actions/female.png
diff --git a/debian/patches/jovie_scroll_when_add.diff b/debian/patches/jovie_scroll_when_add.diff
deleted file mode 100644
index 12a4438..0000000
--- a/debian/patches/jovie_scroll_when_add.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Fix scrolling when adding a talker
-Last-Update: 2011-04-15
-Origin: vendor
-Forwarded: no
-
-This fixes the scrolling to a new talker row after adding a new one.
-
-Index: b/kcmkttsmgr/kcmkttsmgr.cpp
-===================================================================
---- a/kcmkttsmgr/kcmkttsmgr.cpp
-+++ b/kcmkttsmgr/kcmkttsmgr.cpp
-@@ -739,7 +739,7 @@
-         m_talkerListModel.appendRow (code);
- 
-         // Make sure visible.
--        const QModelIndex modelIndex = m_talkerListModel.index (m_talkerListModel.rowCount(),
-+        const QModelIndex modelIndex = m_talkerListModel.index (m_talkerListModel.rowCount()-1,
-                                        0, QModelIndex());
-         talkersView->scrollTo (modelIndex);
- 
diff --git a/debian/patches/series b/debian/patches/series
index df444c3..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-jovie_scroll_when_add.diff

-- 
jovie packaging