[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-30-g4ddcaa6

Maximiliano Curia maxy at moszumanska.debian.org
Sun Jul 12 13:01:22 UTC 2015 

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

The following commit has been merged in the master branch:
commit 4ddcaa69fcdf93a8082eda7fa5d41143f917c32b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jun 17 09:28:14 2015 +0200

    wrap-and-sort
---
 debian/calligra-libs.install  |  4 ++--
 debian/calligraflow.install   |  4 ++--
 debian/calligraplan.install   |  4 ++--
 debian/calligrasheets.install | 10 +++++-----
 debian/control                | 28 +++++++++++++++++++++-------
 debian/copyright              | 24 ++++++++++++------------
 debian/karbon.install         | 10 +++++-----
 debian/krita-gemini.install   |  2 +-
 debian/krita-sketch.install   |  2 +-
 debian/krita.install          | 24 ++++++++++++------------
 10 files changed, 63 insertions(+), 49 deletions(-)

diff --git a/debian/calligra-libs.install b/debian/calligra-libs.install
index 52f06f2..565658c 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -33,8 +33,6 @@ usr/lib/libbasicflakes.so.1*
 usr/lib/libcalligradb.so.1*
 usr/lib/libcalligrakdchart.so.1*
 usr/lib/libflake.so.1*
-usr/lib/liblibglobal.so.1*
-usr/lib/liblibkispsd.so.1*
 usr/lib/libkformula.so.1*
 usr/lib/libkokross.so.1*
 usr/lib/libkomain.so.1*
@@ -53,4 +51,6 @@ usr/lib/libkovectorimage.so.1*
 usr/lib/libkowidgets.so.1*
 usr/lib/libkowidgetutils.so.1*
 usr/lib/libkundo2.so.1*
+usr/lib/liblibglobal.so.1*
+usr/lib/liblibkispsd.so.1*
 usr/lib/libpigmentcms.so.1*
diff --git a/debian/calligraflow.install b/debian/calligraflow.install
index 9ebde36..0fd9147 100644
--- a/debian/calligraflow.install
+++ b/debian/calligraflow.install
@@ -9,8 +9,8 @@ usr/share/applications/kde4/flow.desktop
 usr/share/kde4/services/ServiceMenus/calligra/flow_print.desktop
 usr/share/kde4/services/calligra/calligra_filter_vsdx2odg.desktop
 usr/share/kde4/services/calligra/calligra_filter_wpg2odg.desktop
-usr/share/kde4/services/flow_vsdx_thumbnail.desktop
-usr/share/kde4/services/flow_wpg_thumbnail.desktop
 usr/share/kde4/services/calligra/flowdockersplugin.desktop
 usr/share/kde4/services/calligra/flowpart.desktop
+usr/share/kde4/services/flow_vsdx_thumbnail.desktop
+usr/share/kde4/services/flow_wpg_thumbnail.desktop
 usr/share/kde4/servicetypes/flow_dock.desktop
diff --git a/debian/calligraplan.install b/debian/calligraplan.install
index f64b136..b5039f8 100644
--- a/debian/calligraplan.install
+++ b/debian/calligraplan.install
@@ -1,9 +1,9 @@
+##usr/lib/kde4/planconvert/PlanConvert.jar
 usr/bin/calligraplan
 usr/bin/calligraplanwork
 usr/lib/kde4/calligra_filter_mpxj2plan.so
 usr/lib/kde4/kplatorcpsscheduler.so
 usr/lib/kde4/krossmoduleplan.so
-##usr/lib/kde4/planconvert/PlanConvert.jar
 usr/lib/kde4/planicalexport.so
 usr/lib/kde4/plankplatoimport.so
 usr/lib/kde4/planpart.so
@@ -19,7 +19,7 @@ usr/lib/libplanprivate.so.1*
 usr/lib/libplanworkapp.so.1*
 usr/lib/libplanworkfactory.so.1*
 usr/lib/librcps_plan.so.1*
-usr/share/appdata/plan.appdata.xml 
+usr/share/appdata/plan.appdata.xml
 usr/share/applications/kde4/plan.desktop
 usr/share/applications/kde4/planwork.desktop
 usr/share/icons/hicolor/*/apps/calligraplan.png
diff --git a/debian/calligrasheets.install b/debian/calligrasheets.install
index 56adfe4..741b0ec 100644
--- a/debian/calligrasheets.install
+++ b/debian/calligrasheets.install
@@ -1,3 +1,5 @@
+#usr/lib/kde4/sheetspivottables.so
+#usr/share/kde4/services/sheetspivottables.desktop
 usr/bin/calligrasheets
 usr/lib/kde4/calligra_filter_applixspread2kspread.so
 usr/lib/kde4/calligra_filter_csv2sheets.so
@@ -31,7 +33,6 @@ usr/lib/kde4/kspreadreferencemodule.so
 usr/lib/kde4/kspreadstatisticalmodule.so
 usr/lib/kde4/kspreadtextmodule.so
 usr/lib/kde4/kspreadtrigonometrymodule.so
-#usr/lib/kde4/sheetspivottables.so
 usr/lib/kde4/sheetssolver.so
 usr/lib/libcalligrasheetscommon.so.1*
 usr/lib/libcalligrasheetsodf.so.1*
@@ -76,13 +77,12 @@ usr/share/kde4/services/calligra/kspreadreferencemodule.desktop
 usr/share/kde4/services/calligra/kspreadstatisticalmodule.desktop
 usr/share/kde4/services/calligra/kspreadtextmodule.desktop
 usr/share/kde4/services/calligra/kspreadtrigonometrymodule.desktop
-usr/share/kde4/services/sheets_excel_thumbnail.desktop
-usr/share/kde4/services/sheets_ods_thumbnail.desktop
-usr/share/kde4/services/sheets_xlsx_thumbnail.desktop
 usr/share/kde4/services/calligra/sheetspart.desktop
-#usr/share/kde4/services/sheetspivottables.desktop
 usr/share/kde4/services/calligra/sheetsscripting.desktop
 usr/share/kde4/services/calligra/sheetssolver.desktop
+usr/share/kde4/services/sheets_excel_thumbnail.desktop
+usr/share/kde4/services/sheets_ods_thumbnail.desktop
+usr/share/kde4/services/sheets_xlsx_thumbnail.desktop
 usr/share/kde4/servicetypes/sheets_plugin.desktop
 usr/share/kde4/servicetypes/sheets_viewplugin.desktop
 usr/share/templates/.source/SpreadSheet.ods
diff --git a/debian/control b/debian/control
index 27b2aed..d302439 100644
--- a/debian/control
+++ b/debian/control
@@ -93,7 +93,9 @@ Description: extensive productivity and creative suite
 Package: karbon
 Architecture: any
 Section: graphics
-Depends: calligra-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: calligra-libs (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: pstoedit
 Breaks: calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
 Replaces: calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
@@ -369,7 +371,9 @@ Replaces: calligra-data (<< 1:2.4.3-2),
 Breaks: calligra-data (<< 1:2.4.3-2),
         koffice-data (<< 1:2.4),
         kspread (<< 1:2.4)
-Depends: calligra-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: calligra-libs (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: khelpcenter4
 Homepage: http://www.calligra.org/sheets/
 Description: spreadsheet for the Calligra Suite
@@ -383,7 +387,9 @@ Package: calligraplan
 Architecture: any
 Replaces: kplato (<< 1:2.4)
 Breaks: kplato (<< 1:2.4)
-Depends: calligra-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: calligra-libs (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: default-jre, libapache-poi-java
 Suggests: khelpcenter4
 Homepage: http://www.calligra.org/plan/
@@ -501,7 +507,9 @@ Description: data files for Flow flowcharting program
 
 Package: braindump
 Architecture: any
-Depends: calligra-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: calligra-libs (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Homepage: http://www.calligra.org/braindump/
 Description: ideas organizer application for the Calligra Suite
  BrainDump is a tool to help to organize the ideas from your brain to your
@@ -511,7 +519,9 @@ Description: ideas organizer application for the Calligra Suite
 
 Package: calligraactive
 Architecture: any
-Depends: calligra-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: calligra-libs (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Tablet version of Calligra
  Calligra Active is a project to bring Calligra to the Plasma Active Desktop,
  designed for tablets, smartphones, and touching devices.
@@ -561,7 +571,9 @@ Description: common shared data for the Calligra Suite
 Package: okular-backend-odp
 Architecture: any
 Section: graphics
-Depends: calligra-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: calligra-libs (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: okular
 Enhances: okular
 Description: Okular backend for ODP documents
@@ -585,7 +597,9 @@ Description: debugging symbols for Calligra
 Package: calligraauthor
 Architecture: any
 Section: text
-Depends: calligra-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: calligra-libs (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: khelpcenter4
 Description: Authoring tool for the Calligra Suite
  A specialized tool for serious writers, like novelists or textbook writers,
diff --git a/debian/copyright b/debian/copyright
index 0aaede8..c885586 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1069,7 +1069,7 @@ Files:
  ./words/plugins/scripting/Messages.sh
  ./words/plugins/scripting/scripts/*
  ./words/templates/*
-Copyright: 
+Copyright:
 License: GPL-2+
 
 Files: ./filters/karbon/image/ImageExportOptionsWidget.cpp
@@ -7294,7 +7294,7 @@ Files: ./kexi/kexidb/drivers/oracle/oraclecursor.h
  ./plugins/chartshape/tests/odf/default-calligra-chart/*
  ./plugins/chartshape/tests/odf/me07_percentage_stacked_bar_chart/*
  ./plugins/chartshape/tests/odf/template/*
-Copyright: 
+Copyright:
 License: LGPL-2+
 
 Files: ./sheets/commands/LinkCommand.cpp
@@ -9139,7 +9139,7 @@ License: LGPL
 
 Files: ./krita/plugins/paintops/experiment/kis_experiment_shape_option.h
  ./krita/plugins/paintops/hairy/kis_hairy_ink_option.h
-Copyright: 
+Copyright:
 License: LGPL-2
 
 Files: ./krita/plugins/extensions/dockers/advancedcolorselector/kis_my_paint_shade_selector.cpp
@@ -10814,7 +10814,7 @@ Copyright: 2007-2008 Atomic Labs Inc. (http://www.atomiclabs.com)
 License: BSL-1.0
 
 Files: ./krita/plugins/extensions/gmic/CImg.h
-Copyright: 
+Copyright:
 License: CeCILL
 
 Files: ./plugins/colorengines/lcms2/compositeops/RgbCompositeOps.h
@@ -10823,7 +10823,7 @@ Copyright: 2002 GraphicsMagick Group an organization dedicated
 License: GPL LGPL-2+
 
 Files: ./plan/plugins/schedulers/tj/taskjuggler/Shift.h
-Copyright: 2001-2006 
+Copyright: 2001-2006
 License: GPL-2
 
 Files: ./plan/plugins/schedulers/tj/taskjuggler/Interval.cpp
@@ -10846,7 +10846,7 @@ Copyright: 2011 Shantanu Tushar <shaan7in at gmail.com>
 License: GPL-2+
 
 Files: ./krita/image/kis_rect_mask_generator.cpp
-Copyright: 
+Copyright:
 License: GPL-2+
 
 Files: ./krita/plugins/tools/selectiontools/kis_tool_select_magnetic.h
@@ -11502,7 +11502,7 @@ Copyright: 2014 Wojciech Kosowicz <pcellix at gmail.com>
 License: GPL-2+
 
 Files: ./krita/ui/kis_statusbar.h
-Copyright: 
+Copyright:
 License: GPL-2+
 
 Files: ./libs/kopageapp/tests/TestPAPageMoveCommand.cpp
@@ -11800,7 +11800,7 @@ Copyright: 2007, 2012 Dag Andersen <danders at get2net.dk>
 License: LGPL-2+
 
 Files: ./libs/vectorimage/libwmf/WmfStructs.h
-Copyright: 
+Copyright:
 License: LGPL-2+
 
 Files: ./plugins/formulashape/Dictionary.cpp
@@ -14237,7 +14237,7 @@ Copyright: 2008-2009 Hyves (Startphone Ltd.)
 License: MPL-1.1 GPL GPL-2+
 
 Files: ./kexi/migration/mdb/src/mdbtools/libmdb/dump.c
-Copyright: 
+Copyright:
 License: LGPL-2+
 
 Files: ./filters/words/msword-odf/paragraph.h
@@ -14848,7 +14848,7 @@ License: MPL-2.0
      means any form of the work other than Source Code Form.
  .
  1.7. "Larger Work"
-     means a work that combines Covered Software with other material, in 
+     means a work that combines Covered Software with other material, in
      a separate file or files, that is not Covered Software.
  .
  1.8. "License"
@@ -15315,7 +15315,7 @@ License: CeCILL
  The purpose of the Agreement is the grant by the Licensor to the
  Licensee of a non-exclusive, transferable and worldwide license for the
  Software as set forth in Article 5 hereinafter for the whole term of the
- protection granted by the rights over said Software. 
+ protection granted by the rights over said Software.
  .
  .
      Article 3 - ACCEPTANCE
@@ -15582,7 +15582,7 @@ License: CeCILL
  .
  9.3 The Licensee acknowledges that the Software is supplied "as is" by
  the Licensor without any other express or tacit warranty, other than
- that provided for in Article 9.2 and, in particular, without any warranty 
+ that provided for in Article 9.2 and, in particular, without any warranty
  as to its commercial value, its secured, safe, innovative or relevant
  nature.
  .
diff --git a/debian/karbon.install b/debian/karbon.install
index 01d945d..0399a0b 100644
--- a/debian/karbon.install
+++ b/debian/karbon.install
@@ -38,11 +38,6 @@ usr/share/kde4/services/calligra/calligra_filter_wmf2svg.desktop
 usr/share/kde4/services/calligra/calligra_filter_wpg2svg.desktop
 usr/share/kde4/services/calligra/calligra_filter_wps2odt.desktop
 usr/share/kde4/services/calligra/calligra_filter_xfig2odg.desktop
-usr/share/kde4/services/calligra_odg_thumbnail.desktop
-usr/share/kde4/services/karbon_karbon1x_thumbnail.desktop
-usr/share/kde4/services/karbon_wmf_thumbnail.desktop
-usr/share/kde4/services/karbon_wpg_thumbnail.desktop
-usr/share/kde4/services/karbon_xfig_thumbnail.desktop
 usr/share/kde4/services/calligra/karbonfiltereffects.desktop
 usr/share/kde4/services/calligra/karbonflattenpathplugin.desktop
 usr/share/kde4/services/calligra/karbonpart.desktop
@@ -50,6 +45,11 @@ usr/share/kde4/services/calligra/karbonrefinepathplugin.desktop
 usr/share/kde4/services/calligra/karbonroundcornersplugin.desktop
 usr/share/kde4/services/calligra/karbontools.desktop
 usr/share/kde4/services/calligra/karbonwhirlpinchplugin.desktop
+usr/share/kde4/services/calligra_odg_thumbnail.desktop
+usr/share/kde4/services/karbon_karbon1x_thumbnail.desktop
+usr/share/kde4/services/karbon_wmf_thumbnail.desktop
+usr/share/kde4/services/karbon_wpg_thumbnail.desktop
+usr/share/kde4/services/karbon_xfig_thumbnail.desktop
 usr/share/kde4/servicetypes/karbon_dock.desktop
 usr/share/kde4/servicetypes/karbon_viewplugin.desktop
 usr/share/templates/.source/Illustration.odg
diff --git a/debian/krita-gemini.install b/debian/krita-gemini.install
index 0e6f1d0..741490f 100644
--- a/debian/krita-gemini.install
+++ b/debian/krita-gemini.install
@@ -1,5 +1,5 @@
 #usr/bin/kritagemini
 #usr/share/applications/kde4/kritagemini.desktop
-usr/share/kde4/apps/kritagemini/
 #usr/share/kde4/config/kritageminipanelsrc
 #usr/share/kde4/config/kritageminirc
+usr/share/kde4/apps/kritagemini/
diff --git a/debian/krita-sketch.install b/debian/krita-sketch.install
index 6c28f42..f69698f 100644
--- a/debian/krita-sketch.install
+++ b/debian/krita-sketch.install
@@ -2,6 +2,6 @@
 #usr/lib/*/calligra/imports/org/krita/sketch/
 #usr/lib/libkritasketchlib.so.1*
 #usr/share/applications/kde4/kritasketch.desktop
-usr/share/kde4/apps/kritasketch/
 #usr/share/kde4/config/kritasketchpanelsrc
 #usr/share/kde4/config/kritasketchrc
+usr/share/kde4/apps/kritasketch/
diff --git a/debian/krita.install b/debian/krita.install
index 5dbe350..fd40016 100644
--- a/debian/krita.install
+++ b/debian/krita.install
@@ -1,14 +1,16 @@
-usr/lib/kde4/plugins/imageformats/kimg_kra.so
-usr/lib/kde4/plugins/imageformats/kimg_ora.so
-usr/share/kde4/services/qimageioplugins/kra.desktop
-usr/share/kde4/services/qimageioplugins/ora.desktop
+#usr/lib/libkdeinit4_krita.so
+#usr/share/applications/kde4/krita_flipbook.desktop
+#usr/share/kde4/services/calligra/krita_flipbook_import.desktop
+#usr/share/kde4/services/calligra/kritadropshadow.desktop
+#usr/share/kde4/services/calligra/kritapart.desktop
 usr/bin/gmicparser
 usr/bin/krita
 usr/lib/*/calligra/imports/org/krita/draganddrop/
 usr/lib/kde4/krita*.so
-#usr/lib/libkdeinit4_krita.so
-usr/lib/libkritacolord.so
+usr/lib/kde4/plugins/imageformats/kimg_kra.so
+usr/lib/kde4/plugins/imageformats/kimg_ora.so
 usr/lib/libkritacolor.so.1*
+usr/lib/libkritacolord.so
 usr/lib/libkritaimage.so.1*
 usr/lib/libkritalibbrush.so.1*
 usr/lib/libkritalibpaintop.so.1*
@@ -16,7 +18,6 @@ usr/lib/libkritaui.so.1*
 usr/share/applications/kde4/krita.desktop
 usr/share/applications/kde4/krita_bmp.desktop
 usr/share/applications/kde4/krita_exr.desktop
-#usr/share/applications/kde4/krita_flipbook.desktop
 usr/share/applications/kde4/krita_heightmap.desktop
 usr/share/applications/kde4/krita_jp2.desktop
 usr/share/applications/kde4/krita_jpeg.desktop
@@ -30,7 +31,6 @@ usr/share/applications/kde4/krita_raw.desktop
 usr/share/applications/kde4/krita_tga.desktop
 usr/share/applications/kde4/krita_tiff.desktop
 usr/share/applications/kde4/krita_xcf.desktop
-usr/share/kde4/servicetypes/krita_filefilter.desktop
 usr/share/kde4/services/ServiceMenus/calligra/krita_print.desktop
 usr/share/kde4/services/calligra/krita_artisticcolorselector.desktop
 usr/share/kde4/services/calligra/krita_bmp_export.desktop
@@ -42,12 +42,10 @@ usr/share/kde4/services/calligra/krita_compositiondocker.desktop
 usr/share/kde4/services/calligra/krita_digitalmixer.desktop
 usr/share/kde4/services/calligra/krita_exr_export.desktop
 usr/share/kde4/services/calligra/krita_exr_import.desktop
-#usr/share/kde4/services/calligra/krita_flipbook_import.desktop
 usr/share/kde4/services/calligra/krita_jp2_export.desktop
 usr/share/kde4/services/calligra/krita_jp2_import.desktop
 usr/share/kde4/services/calligra/krita_jpeg_export.desktop
 usr/share/kde4/services/calligra/krita_jpeg_import.desktop
-usr/share/kde4/services/krita_kra_thumbnail.desktop
 usr/share/kde4/services/calligra/krita_lutdocker.desktop
 usr/share/kde4/services/calligra/krita_odg_import.desktop
 usr/share/kde4/services/calligra/krita_ora_export.desktop
@@ -88,7 +86,6 @@ usr/share/kde4/services/calligra/kritadefaultpaintops.desktop
 usr/share/kde4/services/calligra/kritadefaulttools.desktop
 usr/share/kde4/services/calligra/kritadeformpaintop.desktop
 usr/share/kde4/services/calligra/kritadodgeburn.desktop
-#usr/share/kde4/services/calligra/kritadropshadow.desktop
 usr/share/kde4/services/calligra/kritadynapaintop.desktop
 usr/share/kde4/services/calligra/kritaembossfilter.desktop
 usr/share/kde4/services/calligra/kritaexample.desktop
@@ -113,7 +110,6 @@ usr/share/kde4/services/calligra/kritamodifyselection.desktop
 usr/share/kde4/services/calligra/kritanoisefilter.desktop
 usr/share/kde4/services/calligra/kritaoffsetimage.desktop
 usr/share/kde4/services/calligra/kritaoilpaintfilter.desktop
-#usr/share/kde4/services/calligra/kritapart.desktop
 usr/share/kde4/services/calligra/kritaparticlepaintop.desktop
 usr/share/kde4/services/calligra/kritapatterngenerator.desktop
 usr/share/kde4/services/calligra/kritaphongbumpmapfilter.desktop
@@ -140,8 +136,12 @@ usr/share/kde4/services/calligra/kritatooltext.desktop
 usr/share/kde4/services/calligra/kritatooltransform.desktop
 usr/share/kde4/services/calligra/kritaunsharpfilter.desktop
 usr/share/kde4/services/calligra/kritawavefilter.desktop
+usr/share/kde4/services/krita_kra_thumbnail.desktop
+usr/share/kde4/services/qimageioplugins/kra.desktop
+usr/share/kde4/services/qimageioplugins/ora.desktop
 usr/share/kde4/servicetypes/krita_brush.desktop
 usr/share/kde4/servicetypes/krita_dock.desktop
+usr/share/kde4/servicetypes/krita_filefilter.desktop
 usr/share/kde4/servicetypes/krita_filter.desktop
 usr/share/kde4/servicetypes/krita_generator.desktop
 usr/share/kde4/servicetypes/krita_paintop.desktop

-- 
Calligra suite packaging

More information about the pkg-kde-commits mailing list