[SCM] Calligra suite packaging. branch, master, updated. 966d13fa929f16192d2d11793156a84800a5bfd6

[Pino Toscano]

The following commit has been merged in the master branch:
commit 966d13fa929f16192d2d11793156a84800a5bfd6
Author: Pino Toscano <pino at debian.org>
Date:   Sat Sep 17 17:37:18 2011 +0200

    backport upstream patch to fix the libkexidataviewcommon SOVERSION
    
    update kexi install files and lintian overrides accordingly
---
 debian/kexi.install                                |    3 +-
 debian/kexi.lintian-overrides                      |    2 +-
 debian/patches/series                              |    1 +
 ...FICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch |   23 ++++++++++++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/debian/kexi.install b/debian/kexi.install
index dd322e2..a00b955 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -20,7 +20,8 @@ usr/lib/libkexicore.so.8
 usr/lib/libkexicore.so.8.0.0
 usr/lib/libkexidatatable.so.8
 usr/lib/libkexidatatable.so.8.0.0
-usr/lib/libkexidataviewcommon.so.SOVERSION
+usr/lib/libkexidataviewcommon.so.8
+usr/lib/libkexidataviewcommon.so.8.0.0
 usr/lib/libkexidb.so.8
 usr/lib/libkexidb.so.8.0.0
 usr/lib/libkexiextendedwidgets.so.8
diff --git a/debian/kexi.lintian-overrides b/debian/kexi.lintian-overrides
index a1799cd..2dc36d8 100644
--- a/debian/kexi.lintian-overrides
+++ b/debian/kexi.lintian-overrides
@@ -1,2 +1,2 @@
-kexi: package-name-doesnt-match-sonames libkexicore8 libkexidatatable8 libkexidataviewcommonSOVERSION libkexidb8 libkexiextendedwidgets8 libkexiformutils8 libkexiguiutils8 libkeximain8 libkeximigrate8 libkexirelationsview8 libkexiutils8 libkformdesigner8
+kexi: package-name-doesnt-match-sonames libkexicore8 libkexidatatable8 libkexidataviewcommon8 libkexidb8 libkexiextendedwidgets8 libkexiformutils8 libkexiguiutils8 libkeximain8 libkeximigrate8 libkexirelationsview8 libkexiutils8 libkformdesigner8
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e10ddba
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_GENERIC_KOFFICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch
diff --git a/debian/patches/upstream_GENERIC_KOFFICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch b/debian/patches/upstream_GENERIC_KOFFICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch
new file mode 100644
index 0000000..5df47e4
--- /dev/null
+++ b/debian/patches/upstream_GENERIC_KOFFICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch
@@ -0,0 +1,23 @@
+From a56abd9bb8d370c9f28d15a09b6c435fef04fdd6 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Thu, 15 Sep 2011 22:41:54 +0200
+Subject: [PATCH] GENERIC_KOFFICE_LIB_{,SO}VERSION -> GENERIC_CALLIGRA_LIB_{,SO}VERSION
+
+---
+ kexi/widget/dataviewcommon/CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/kexi/widget/dataviewcommon/CMakeLists.txt b/kexi/widget/dataviewcommon/CMakeLists.txt
+index 262299e..1376aa2 100644
+--- a/kexi/widget/dataviewcommon/CMakeLists.txt
++++ b/kexi/widget/dataviewcommon/CMakeLists.txt
+@@ -29,5 +29,5 @@ target_link_libraries(
+     ${QT_QT3SUPPORT_LIBRARY}
+ )
+ 
+-set_target_properties(kexidataviewcommon PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
++set_target_properties(kexidataviewcommon PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
+ install(TARGETS kexidataviewcommon  ${INSTALL_TARGETS_DEFAULT_ARGS})
+-- 
+1.7.1
+

-- 
Calligra suite packaging.