[SCM] KDE PIM Libraries module packaging branch, kde4.12, updated. debian/4.11.5-4-21-g0d6811a

[Maximiliano Curia]

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

The following commit has been merged in the kde4.12 branch:
commit 45c8337eec9c1b2668067592aa005e91943e145d
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Feb 12 15:34:37 2014 +0100

    Remove akonadi2xml and new patch: add_soname_to_xsd_file
---
 debian/changelog                      |  2 ++
 debian/libakonadi-xml4.install        |  3 +--
 debian/patches/add_soname_to_xsd_file | 31 +++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f62e2d2..d8627f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ kdepimlibs (4:4.12.2-1~2) UNRELEASED; urgency=medium
   * New patch: ship_knut
   * Add knut to the install files.
   * Bump kde-sc-dev-latest build dependency.
+  * Do not install akonadi2xml cmd.
+  * New patch: add_soname_to_xsd_file
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 30 Jan 2014 11:21:56 -0300
 
diff --git a/debian/libakonadi-xml4.install b/debian/libakonadi-xml4.install
index f201592..d20e350 100644
--- a/debian/libakonadi-xml4.install
+++ b/debian/libakonadi-xml4.install
@@ -1,4 +1,3 @@
-usr/bin/akonadi2xml
 usr/lib/libakonadi-xml.so.4
 usr/lib/libakonadi-xml.so.4.*
-usr/share/kde4/apps/akonadi/akonadi-xml.xsd
+usr/share/kde4/apps/akonadi/akonadi-xml4.xsd
diff --git a/debian/patches/add_soname_to_xsd_file b/debian/patches/add_soname_to_xsd_file
new file mode 100644
index 0000000..6e582c0
--- /dev/null
+++ b/debian/patches/add_soname_to_xsd_file
@@ -0,0 +1,31 @@
+Index: kdepimlibs/akonadi/xml/CMakeLists.txt
+===================================================================
+--- kdepimlibs.orig/akonadi/xml/CMakeLists.txt	2014-02-11 23:57:54.401487183 +0100
++++ kdepimlibs/akonadi/xml/CMakeLists.txt	2014-02-12 16:37:23.566636720 +0100
+@@ -36,10 +36,12 @@
+ )
+ 
+ set_target_properties(akonadi-xml PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
++set_target_properties(akonadi-xml PROPERTIES COMPILE_DEFINITIONS
++    SOVERSION="${GENERIC_LIB_SOVERSION}")
+ 
+ install(TARGETS akonadi-xml EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES ${akonadixml_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi/xml COMPONENT Devel)
+-install(FILES akonadi-xml.xsd DESTINATION ${DATA_INSTALL_DIR}/akonadi/)
++install(FILES akonadi-xml.xsd DESTINATION ${DATA_INSTALL_DIR}/akonadi RENAME akonadi-xml${GENERIC_LIB_SOVERSION}.xsd)
+ 
+ kde4_add_executable(akonadi2xml akonadi2xml.cpp)
+ target_link_libraries(akonadi2xml
+Index: kdepimlibs/akonadi/xml/xmldocument.cpp
+===================================================================
+--- kdepimlibs.orig/akonadi/xml/xmldocument.cpp	2014-02-11 23:57:54.401487183 +0100
++++ kdepimlibs/akonadi/xml/xmldocument.cpp	2014-02-12 15:33:03.126550050 +0100
+@@ -154,7 +154,7 @@
+     return false;
+   }
+ 
+-  const QString &schemaFileName = KGlobal::dirs()->findResource( "data", QLatin1String("akonadi/akonadi-xml.xsd") );
++  const QString &schemaFileName = KGlobal::dirs()->findResource( "data", QLatin1String("akonadi/akonadi-xml" SOVERSION ".xsd") );
+   XmlPtr<xmlDocPtr, xmlFreeDoc> schemaDoc( xmlReadFile( schemaFileName.toLocal8Bit(), 0, XML_PARSE_NONET ) );
+   if ( !schemaDoc ) {
+     d->lastError = i18n( "Schema definition could not be loaded and parsed." );
diff --git a/debian/patches/series b/debian/patches/series
index 5f48100..46cfb76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 ship_akonaditest
 ship_knut
+add_soname_to_xsd_file

-- 
KDE PIM Libraries module packaging