[SCM] Calligra suite packaging branch, experimental, updated. debian/2.6.1-1-18-gdb055e0

Adrien Grellier adrien-guest at alioth.debian.org
Wed May 15 16:33:34 UTC 2013


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

The following commit has been merged in the experimental branch:
commit e01aceb9cf085eb8579755810f53d4afcdfb1688
Author: Adrien Grellier <perso at adrieng.fr>
Date:   Tue May 14 22:22:22 2013 +0200

    create calligrastage-data for arch-independant files
---
 ...grastage.install => calligrastage-data.install} |   37 ++++-------------
 debian/calligrastage.install                       |   43 --------------------
 debian/changelog                                   |    2 +
 debian/control                                     |   17 +++++++-
 4 files changed, 26 insertions(+), 73 deletions(-)

diff --git a/debian/calligrastage.install b/debian/calligrastage-data.install
similarity index 73%
copy from debian/calligrastage.install
copy to debian/calligrastage-data.install
index 52f7534..de19ab8 100644
--- a/debian/calligrastage.install
+++ b/debian/calligrastage-data.install
@@ -1,43 +1,22 @@
-usr/bin/calligrastage
-usr/lib/kde4/Filterkpr2odf.so
-usr/lib/kde4/calligrastageeventactions.so
-usr/lib/kde4/calligrastagepart.so
-usr/lib/kde4/calligrastagetoolanimation.so
-usr/lib/kde4/kpr_pageeffect_barwipe.so
-usr/lib/kde4/kpr_pageeffect_clockwipe.so
-usr/lib/kde4/kpr_pageeffect_edgewipe.so
-usr/lib/kde4/kpr_pageeffect_fade.so
-usr/lib/kde4/kpr_pageeffect_iriswipe.so
-usr/lib/kde4/kpr_pageeffect_matrixwipe.so
-usr/lib/kde4/kpr_pageeffect_slidewipe.so
-usr/lib/kde4/kpr_pageeffect_spacerotation.so
-usr/lib/kde4/kpr_pageeffect_swapeffect.so
-usr/lib/kde4/kpr_shapeanimation_example.so
-usr/lib/kde4/kprvariables.so
-usr/lib/kde4/powerpointimport.so
-usr/lib/kde4/pptximport.so
-usr/lib/libcalligrastageprivate.so.11
-usr/lib/libcalligrastageprivate.so.11.0.0
-usr/lib/libkdeinit4_calligrastage.so
 usr/share/applications/kde4/stage.desktop
 usr/share/doc/kde/HTML/en/stage
+usr/share/icons/hicolor/1024x1024/apps/calligrastage.png
+usr/share/icons/hicolor/128x128/apps/calligrastage.png
 usr/share/icons/hicolor/16x16/actions/black.png
 usr/share/icons/hicolor/16x16/actions/highlight.png
 usr/share/icons/hicolor/16x16/actions/pen.png
 usr/share/icons/hicolor/16x16/apps/calligrastage.png
 usr/share/icons/hicolor/22x22/apps/calligrastage.png
+usr/share/icons/hicolor/256x256/apps/calligrastage.png
 usr/share/icons/hicolor/32x32/apps/calligrastage.png
 usr/share/icons/hicolor/48x48/apps/calligrastage.png
-usr/share/icons/hicolor/64x64/apps/calligrastage.png
-usr/share/icons/hicolor/128x128/apps/calligrastage.png
-usr/share/icons/hicolor/256x256/apps/calligrastage.png
 usr/share/icons/hicolor/512x512/apps/calligrastage.png
-usr/share/icons/hicolor/1024x1024/apps/calligrastage.png
+usr/share/icons/hicolor/64x64/apps/calligrastage.png
 usr/share/icons/hicolor/scalable/apps/calligrastage.svgz
 usr/share/kde4/apps/stage
 usr/share/kde4/config/stagerc
 usr/share/kde4/services/Filterkpr2odf.desktop
-usr/share/kde4/services/stage_kpr_thumbnail.desktop
+usr/share/kde4/services/ServiceMenus/stage_print.desktop
 usr/share/kde4/services/calligrastageeventactions.desktop
 usr/share/kde4/services/calligrastagetoolanimation.desktop
 usr/share/kde4/services/kpr_pageeffect_barwipe.desktop
@@ -51,13 +30,13 @@ usr/share/kde4/services/kpr_pageeffect_spacerotation.desktop
 usr/share/kde4/services/kpr_pageeffect_swapeffect.desktop
 usr/share/kde4/services/kpr_shapeanimation_example.desktop
 usr/share/kde4/services/kpresenter_powerpoint_import.desktop
-usr/share/kde4/services/stage_powerpoint_thumbnail.desktop
 usr/share/kde4/services/kpresenter_pptx_import.desktop
+usr/share/kde4/services/kprvariables.desktop
+usr/share/kde4/services/stage_kpr_thumbnail.desktop
 usr/share/kde4/services/stage_odp_thumbnail.desktop
+usr/share/kde4/services/stage_powerpoint_thumbnail.desktop
 usr/share/kde4/services/stage_pptx_thumbnail.desktop
-usr/share/kde4/services/kprvariables.desktop
 usr/share/kde4/services/stagepart.desktop
-usr/share/kde4/services/ServiceMenus/stage_print.desktop
 usr/share/kde4/servicetypes/kpr_pageeffect.desktop
 usr/share/kde4/servicetypes/kpr_shapeanimation.desktop
 usr/share/templates/.source/Presentation.odp
diff --git a/debian/calligrastage.install b/debian/calligrastage.install
index 52f7534..0809fb3 100644
--- a/debian/calligrastage.install
+++ b/debian/calligrastage.install
@@ -19,46 +19,3 @@ usr/lib/kde4/pptximport.so
 usr/lib/libcalligrastageprivate.so.11
 usr/lib/libcalligrastageprivate.so.11.0.0
 usr/lib/libkdeinit4_calligrastage.so
-usr/share/applications/kde4/stage.desktop
-usr/share/doc/kde/HTML/en/stage
-usr/share/icons/hicolor/16x16/actions/black.png
-usr/share/icons/hicolor/16x16/actions/highlight.png
-usr/share/icons/hicolor/16x16/actions/pen.png
-usr/share/icons/hicolor/16x16/apps/calligrastage.png
-usr/share/icons/hicolor/22x22/apps/calligrastage.png
-usr/share/icons/hicolor/32x32/apps/calligrastage.png
-usr/share/icons/hicolor/48x48/apps/calligrastage.png
-usr/share/icons/hicolor/64x64/apps/calligrastage.png
-usr/share/icons/hicolor/128x128/apps/calligrastage.png
-usr/share/icons/hicolor/256x256/apps/calligrastage.png
-usr/share/icons/hicolor/512x512/apps/calligrastage.png
-usr/share/icons/hicolor/1024x1024/apps/calligrastage.png
-usr/share/icons/hicolor/scalable/apps/calligrastage.svgz
-usr/share/kde4/apps/stage
-usr/share/kde4/config/stagerc
-usr/share/kde4/services/Filterkpr2odf.desktop
-usr/share/kde4/services/stage_kpr_thumbnail.desktop
-usr/share/kde4/services/calligrastageeventactions.desktop
-usr/share/kde4/services/calligrastagetoolanimation.desktop
-usr/share/kde4/services/kpr_pageeffect_barwipe.desktop
-usr/share/kde4/services/kpr_pageeffect_clockwipe.desktop
-usr/share/kde4/services/kpr_pageeffect_edgewipe.desktop
-usr/share/kde4/services/kpr_pageeffect_fade.desktop
-usr/share/kde4/services/kpr_pageeffect_iriswipe.desktop
-usr/share/kde4/services/kpr_pageeffect_matrixwipe.desktop
-usr/share/kde4/services/kpr_pageeffect_slidewipe.desktop
-usr/share/kde4/services/kpr_pageeffect_spacerotation.desktop
-usr/share/kde4/services/kpr_pageeffect_swapeffect.desktop
-usr/share/kde4/services/kpr_shapeanimation_example.desktop
-usr/share/kde4/services/kpresenter_powerpoint_import.desktop
-usr/share/kde4/services/stage_powerpoint_thumbnail.desktop
-usr/share/kde4/services/kpresenter_pptx_import.desktop
-usr/share/kde4/services/stage_odp_thumbnail.desktop
-usr/share/kde4/services/stage_pptx_thumbnail.desktop
-usr/share/kde4/services/kprvariables.desktop
-usr/share/kde4/services/stagepart.desktop
-usr/share/kde4/services/ServiceMenus/stage_print.desktop
-usr/share/kde4/servicetypes/kpr_pageeffect.desktop
-usr/share/kde4/servicetypes/kpr_shapeanimation.desktop
-usr/share/templates/.source/Presentation.odp
-usr/share/templates/Presentation.desktop
diff --git a/debian/changelog b/debian/changelog
index 42fcb1c..ef98602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ calligra (1:2.6.3-1) experimental; urgency=low
   * Add a manpage for calligraauthor, as requested by lintian
   * Add a Readme.source to document the Debian packaging
   * update to Debian policy 3.9.4 
+  * create calligrastage-data, for arch-independant files 
+    (lintian: arch-dep-package-has-big-usr-share 7564kB 63%)
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Make calligra-libs recommend libqca2-plugin-ossl for encryption
diff --git a/debian/control b/debian/control
index c7c1cba..e3588e9 100644
--- a/debian/control
+++ b/debian/control
@@ -404,7 +404,8 @@ Architecture: any
 Section: kde
 Replaces: kpresenter (<< 1:2.4), calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
 Breaks: kpresenter (<< 1:2.4), calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
-Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version}), 
+ calligra-data (>=${source:Version})
 Suggests: khelpcenter4
 Homepage: http://www.calligra-suite.org/stage/
 Description: presentation program for the Calligra Suite
@@ -423,6 +424,20 @@ Description: presentation program for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
+Package: calligrastage-data
+Architecture: all
+Section: kde
+Depends: ${misc:Depends}
+Breaks: calligrastage (<< 1:2.6.3)
+Replaces: calligrastage (<< 1:2.6.3)
+Description: data files for Calligra Stage
+ This package contains architecture-independent data files for Stage,
+ the presentation program shipped with the Calligra Suite.
+ .
+ See the calligrastage package for further information.
+ .
+ This package is part of the Calligra Suite.
+
 Package: calligraflow
 Architecture: any
 Section: graphics

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list