[SCM] Calligra suite packaging branch, experimental, updated. debian/2.7.5-1-16-g0d05992

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=ae6cc4f

The following commit has been merged in the experimental branch:
commit ae6cc4fb6e364d6d08b72fd33a907f4603de0804
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 13 08:55:30 2013 +0100

    Revert "Move libcalligrakdgantt to calligra-libs from calligraplan."
    
    libcalligrakdgantt is used only by calligraplan, so it makes no sense
    to ship it in calligra-libs (which is needed by any an calligra
    application). Let's save a bit of space/dependencies, if we can to.
    
    This reverts commit 39c09efb373181055e3f8cbd8cab64b8fbf71272.
    
    Conflicts:
    	debian/changelog
---
 debian/calligra-libs.install | 2 --
 debian/calligraplan.install  | 2 ++
 debian/changelog             | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/calligra-libs.install b/debian/calligra-libs.install
index ba56b0c..8860b7d 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -36,8 +36,6 @@ usr/lib/libcalligradb.so.12
 usr/lib/libcalligradb.so.12.0.0
 usr/lib/libcalligrakdchart.so.12
 usr/lib/libcalligrakdchart.so.12.0.0
-usr/lib/libcalligrakdgantt.so.12
-usr/lib/libcalligrakdgantt.so.12.0.0
 usr/lib/libchartshapelib.so.12
 usr/lib/libchartshapelib.so.12.0.0
 usr/lib/libflake.so.12
diff --git a/debian/calligraplan.install b/debian/calligraplan.install
index 2b14823..24dcd89 100644
--- a/debian/calligraplan.install
+++ b/debian/calligraplan.install
@@ -9,6 +9,8 @@ usr/lib/kde4/planmpxjimport.so
 usr/lib/kde4/planpart.so
 usr/lib/kde4/plantjscheduler.so
 usr/lib/kde4/planworkpart.so
+usr/lib/libcalligrakdgantt.so.12
+usr/lib/libcalligrakdgantt.so.12.0.0
 usr/lib/libkdeinit4_calligraplan.so
 usr/lib/libkdeinit4_calligraplanwork.so
 usr/lib/libkplatokernel.so.12
diff --git a/debian/changelog b/debian/changelog
index f317621..73e227f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 calligra (1:2.7.5-1r1) UNRELEASED; urgency=low
 
   [ Raúl Sánchez Siles ]
-  * Move libcalligrakdgantt to calligra-libs from calligraplan.
   * Added kexidb-relax_pqxx_version.patch to make pqxx driver build with
     libpqxx >= 0.4
 

-- 
Calligra suite packaging