[SCM] KOffice packaging branch, koffice2.3, updated. debian/2.2.1-3-54-g2654cb2

[Raúl Sánchez Siles]

The following commit has been merged in the koffice2.3 branch:
commit a433ac74040864ba77a9f3e21b4afcedb65e1d33
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Mon Nov 15 20:53:42 2010 +0100

    Added patch 16_kformula_kdeinit4 to make kformula kdeinit library name compliant.
---
 debian/changelog                    |    4 +++-
 debian/kformula.install             |    2 +-
 debian/patches/16_kformula_kdeinit4 |   11 +++++++++++
 debian/patches/series               |    1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8ff604..a905c99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ koffice (1:2.2.83-1) UNRELEASED; urgency=low
   * Replace and conflict koffice-lib with older kchart packages.
   * Move menu icons to application binary package.
   * Prevent building Google docs support.
+  * Added patch 16_kformula_kdeinit4 to make kformula kdeinit library 
+    name compliant.
 
- -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Fri, 12 Nov 2010 08:35:42 +0100
+ -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Tue, 16 Nov 2010 20:11:28 +0100
 
 koffice (1:2.2.1-3) unstable; urgency=low
 
diff --git a/debian/kformula.install b/debian/kformula.install
index 8d218f3..43069c1 100644
--- a/debian/kformula.install
+++ b/debian/kformula.install
@@ -5,7 +5,7 @@ usr/lib/libkformulalib.so.8
 usr/lib/libkformulalib.so.8.0.0
 usr/lib/libkformulaprivate.so.8
 usr/lib/libkformulaprivate.so.8.0.0
-usr/lib/libkdeinit_kformula.so
+usr/lib/libkdeinit4_kformula.so
 usr/share/applications/kde4/kformula.desktop
 usr/share/icons/hicolor/16x16/apps/kformula.png
 usr/share/icons/hicolor/22x22/apps/kformula.png
diff --git a/debian/patches/16_kformula_kdeinit4 b/debian/patches/16_kformula_kdeinit4
new file mode 100644
index 0000000..79cb483
--- /dev/null
+++ b/debian/patches/16_kformula_kdeinit4
@@ -0,0 +1,11 @@
+--- a/kformula/CMakeLists.txt
++++ b/kformula/CMakeLists.txt
+@@ -54,7 +54,7 @@
+ 
+ install(TARGETS kdeinit_kformula_bin  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-set_target_properties(kdeinit_kformula_bin PROPERTIES OUTPUT_NAME kdeinit_kformula)
++set_target_properties(kdeinit_kformula_bin PROPERTIES OUTPUT_NAME kdeinit4_kformula)
+ 
+ target_link_libraries( kformula_bin kdeinit_kformula_bin )
+ set_target_properties( kformula_bin PROPERTIES OUTPUT_NAME kformula)
diff --git a/debian/patches/series b/debian/patches/series
index c9d013b..61ffba9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10_nokcharpart
+16_kformula_kdeinit4

-- 
KOffice packaging