[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-34-ga498ecd
Pino Toscano
pino at moszumanska.debian.org
Sun Mar 2 12:28:19 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=a498ecd
The following commit has been merged in the master branch:
commit a498ecde8db62a11974172f774eeefe49e63bbd7
Author: Pino Toscano <pino at debian.org>
Date: Sun Mar 2 13:28:04 2014 +0100
simplify .install files
---
debian/braindump.install | 10 +-------
debian/calligra-map-shape.install | 3 +--
debian/calligra-reports-map-element.install | 3 +--
debian/calligra-reports-web-element.install | 3 +--
debian/calligraauthor.install | 10 +-------
debian/calligraflow-data.install | 10 +-------
debian/calligraplan.install | 37 +++++------------------------
debian/calligrasheets.install | 10 +-------
debian/calligrastage-data.install | 10 +-------
debian/calligrawords-data.install | 10 +-------
debian/karbon.install | 10 +-------
debian/kexi-data.install | 10 +-------
debian/krita-data.install | 10 +-------
debian/krita-gemini.install | 3 +--
debian/krita-sketch.install | 1 -
15 files changed, 19 insertions(+), 121 deletions(-)
diff --git a/debian/braindump.install b/debian/braindump.install
index b81488f..5bb64bc 100644
--- a/debian/braindump.install
+++ b/debian/braindump.install
@@ -4,17 +4,9 @@ usr/lib/kde4/braindump_shape_web.so
usr/lib/libbraindumpcore.so.13
usr/lib/libbraindumpcore.so.13.0.0
usr/share/applications/kde4/braindump.desktop
-usr/share/icons/hicolor/1024x1024/apps/braindump.png
-usr/share/icons/hicolor/128x128/apps/braindump.png
-usr/share/icons/hicolor/16x16/apps/braindump.png
+usr/share/icons/hicolor/*/apps/braindump.png
usr/share/icons/hicolor/22x22/actions/stateshape.png
usr/share/icons/hicolor/22x22/actions/statetool.png
-usr/share/icons/hicolor/22x22/apps/braindump.png
-usr/share/icons/hicolor/256x256/apps/braindump.png
-usr/share/icons/hicolor/32x32/apps/braindump.png
-usr/share/icons/hicolor/48x48/apps/braindump.png
-usr/share/icons/hicolor/512x512/apps/braindump.png
-usr/share/icons/hicolor/64x64/apps/braindump.png
usr/share/icons/hicolor/scalable/apps/braindump.svgz
usr/share/kde4/apps/braindump
usr/share/kde4/apps/stateshape
diff --git a/debian/calligra-map-shape.install b/debian/calligra-map-shape.install
index 1e9f193..2462690 100644
--- a/debian/calligra-map-shape.install
+++ b/debian/calligra-map-shape.install
@@ -1,4 +1,3 @@
usr/lib/kde4/mapshape.so
-usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/map_shape.png
-usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/map_shape.png
+usr/share/kde4/apps/calligra/icons/hicolor/*/actions/map_shape.png
usr/share/kde4/services/mapshape.desktop
diff --git a/debian/calligra-reports-map-element.install b/debian/calligra-reports-map-element.install
index 2825f4c..d1ce73d 100644
--- a/debian/calligra-reports-map-element.install
+++ b/debian/calligra-reports-map-element.install
@@ -1,4 +1,3 @@
usr/lib/kde4/koreport_mapsplugin.so
-usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/report_map_element.png
-usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/report_map_element.png
+usr/share/kde4/apps/calligra/icons/hicolor/*/actions/report_map_element.png
usr/share/kde4/services/koreport_mapsplugin.desktop
diff --git a/debian/calligra-reports-web-element.install b/debian/calligra-reports-web-element.install
index 27d7d76..6019c81 100644
--- a/debian/calligra-reports-web-element.install
+++ b/debian/calligra-reports-web-element.install
@@ -1,4 +1,3 @@
usr/lib/kde4/koreport_webplugin.so
-usr/share/kde4/apps/calligra/icons/hicolor/16x16/actions/report_web_element.png
-usr/share/kde4/apps/calligra/icons/hicolor/22x22/actions/report_web_element.png
+usr/share/kde4/apps/calligra/icons/hicolor/*/actions/report_web_element.png
usr/share/kde4/services/koreport_webplugin.desktop
diff --git a/debian/calligraauthor.install b/debian/calligraauthor.install
index 1dc5a85..4d77b07 100644
--- a/debian/calligraauthor.install
+++ b/debian/calligraauthor.install
@@ -2,15 +2,7 @@ usr/bin/calligraauthor
usr/lib/kde4/authorpart.so
usr/lib/libkdeinit4_calligraauthor.so
usr/share/applications/kde4/author.desktop
-usr/share/icons/hicolor/1024x1024/apps/calligraauthor.png
-usr/share/icons/hicolor/128x128/apps/calligraauthor.png
-usr/share/icons/hicolor/16x16/apps/calligraauthor.png
-usr/share/icons/hicolor/22x22/apps/calligraauthor.png
-usr/share/icons/hicolor/256x256/apps/calligraauthor.png
-usr/share/icons/hicolor/32x32/apps/calligraauthor.png
-usr/share/icons/hicolor/48x48/apps/calligraauthor.png
-usr/share/icons/hicolor/512x512/apps/calligraauthor.png
-usr/share/icons/hicolor/64x64/apps/calligraauthor.png
+usr/share/icons/hicolor/*/apps/calligraauthor.png
usr/share/icons/hicolor/scalable/apps/calligraauthor.svgz
usr/share/kde4/apps/author/
usr/share/kde4/config/authorrc
diff --git a/debian/calligraflow-data.install b/debian/calligraflow-data.install
index a83db00..4e58aa2 100644
--- a/debian/calligraflow-data.install
+++ b/debian/calligraflow-data.install
@@ -1,12 +1,4 @@
-usr/share/icons/hicolor/1024x1024/apps/calligraflow.png
-usr/share/icons/hicolor/128x128/apps/calligraflow.png
-usr/share/icons/hicolor/16x16/apps/calligraflow.png
-usr/share/icons/hicolor/22x22/apps/calligraflow.png
-usr/share/icons/hicolor/256x256/apps/calligraflow.png
-usr/share/icons/hicolor/32x32/apps/calligraflow.png
-usr/share/icons/hicolor/48x48/apps/calligraflow.png
-usr/share/icons/hicolor/512x512/apps/calligraflow.png
-usr/share/icons/hicolor/64x64/apps/calligraflow.png
+usr/share/icons/hicolor/*/apps/calligraflow.png
usr/share/icons/hicolor/scalable/apps/calligraflow.svgz
usr/share/kde4/apps/flow
usr/share/kde4/config/flow_stencils.knsrc
diff --git a/debian/calligraplan.install b/debian/calligraplan.install
index ad038d9..84fbee0 100644
--- a/debian/calligraplan.install
+++ b/debian/calligraplan.install
@@ -29,37 +29,12 @@ usr/lib/librcps_plan.so.13
usr/lib/librcps_plan.so.13.0.0
usr/share/applications/kde4/plan.desktop
usr/share/applications/kde4/planwork.desktop
-usr/share/icons/hicolor/1024x1024/apps/calligraplan.png
-usr/share/icons/hicolor/128x128/apps/calligraplan.png
-usr/share/icons/hicolor/128x128/apps/calligraplanwork.png
-usr/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.png
-usr/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.work.png
-usr/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.png
-usr/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/16x16/apps/calligraplan.png
-usr/share/icons/hicolor/16x16/apps/calligraplanwork.png
-usr/share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.kplato.work.png
-usr/share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/22x22/apps/calligraplan.png
-usr/share/icons/hicolor/22x22/apps/calligraplanwork.png
-usr/share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.work.png
-usr/share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/256x256/apps/calligraplan.png
-usr/share/icons/hicolor/32x32/apps/calligraplan.png
-usr/share/icons/hicolor/32x32/apps/calligraplanwork.png
-usr/share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.work.png
-usr/share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/48x48/apps/calligraplan.png
-usr/share/icons/hicolor/48x48/apps/calligraplanwork.png
-usr/share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.kplato.work.png
-usr/share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/512x512/apps/calligraplan.png
-usr/share/icons/hicolor/64x64/apps/calligraplan.png
-usr/share/icons/hicolor/64x64/apps/calligraplanwork.png
-usr/share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.png
-usr/share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.work.png
-usr/share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.png
-usr/share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.work.png
+usr/share/icons/hicolor/*/apps/calligraplan.png
+usr/share/icons/hicolor/*/apps/calligraplanwork.png
+usr/share/icons/hicolor/*/mimetypes/application-x-vnd.kde.kplato.png
+usr/share/icons/hicolor/*/mimetypes/application-x-vnd.kde.kplato.work.png
+usr/share/icons/hicolor/*/mimetypes/application-x-vnd.kde.plan.png
+usr/share/icons/hicolor/*/mimetypes/application-x-vnd.kde.plan.work.png
usr/share/icons/hicolor/scalable/apps/calligraplan.svgz
usr/share/icons/hicolor/scalable/apps/calligraplanwork.svgz
usr/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.kplato.svgz
diff --git a/debian/calligrasheets.install b/debian/calligrasheets.install
index 392810e..55125c8 100644
--- a/debian/calligrasheets.install
+++ b/debian/calligrasheets.install
@@ -39,15 +39,7 @@ usr/lib/libcalligrasheetsodf.so.13.0.0
usr/lib/libkdeinit4_calligrasheets.so
usr/share/applications/kde4/sheets.desktop
usr/share/doc/kde/HTML/en/sheets
-usr/share/icons/hicolor/1024x1024/apps/calligrasheets.png
-usr/share/icons/hicolor/128x128/apps/calligrasheets.png
-usr/share/icons/hicolor/16x16/apps/calligrasheets.png
-usr/share/icons/hicolor/22x22/apps/calligrasheets.png
-usr/share/icons/hicolor/256x256/apps/calligrasheets.png
-usr/share/icons/hicolor/32x32/apps/calligrasheets.png
-usr/share/icons/hicolor/48x48/apps/calligrasheets.png
-usr/share/icons/hicolor/512x512/apps/calligrasheets.png
-usr/share/icons/hicolor/64x64/apps/calligrasheets.png
+usr/share/icons/hicolor/*/apps/calligrasheets.png
usr/share/icons/hicolor/scalable/apps/calligrasheets.svgz
usr/share/kde4/apps/sheets/
usr/share/kde4/config.kcfg/sheets.kcfg
diff --git a/debian/calligrastage-data.install b/debian/calligrastage-data.install
index 47928e0..62c21ec 100644
--- a/debian/calligrastage-data.install
+++ b/debian/calligrastage-data.install
@@ -1,17 +1,9 @@
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/*/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/512x512/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
diff --git a/debian/calligrawords-data.install b/debian/calligrawords-data.install
index cd6799c..c23c13b 100644
--- a/debian/calligrawords-data.install
+++ b/debian/calligrawords-data.install
@@ -1,12 +1,4 @@
-usr/share/icons/hicolor/1024x1024/apps/calligrawords.png
-usr/share/icons/hicolor/128x128/apps/calligrawords.png
-usr/share/icons/hicolor/16x16/apps/calligrawords.png
-usr/share/icons/hicolor/22x22/apps/calligrawords.png
-usr/share/icons/hicolor/256x256/apps/calligrawords.png
-usr/share/icons/hicolor/32x32/apps/calligrawords.png
-usr/share/icons/hicolor/48x48/apps/calligrawords.png
-usr/share/icons/hicolor/512x512/apps/calligrawords.png
-usr/share/icons/hicolor/64x64/apps/calligrawords.png
+usr/share/icons/hicolor/*/apps/calligrawords.png
usr/share/icons/hicolor/scalable/apps/calligrawords.svgz
usr/share/kde4/apps/words
usr/share/kde4/config/wordsrc
diff --git a/debian/karbon.install b/debian/karbon.install
index bcb1892..f4d8d4d 100644
--- a/debian/karbon.install
+++ b/debian/karbon.install
@@ -23,15 +23,7 @@ usr/lib/libkarbonui.so.13
usr/lib/libkarbonui.so.13.0.0
usr/lib/libkdeinit4_karbon.so
usr/share/applications/kde4/karbon.desktop
-usr/share/icons/hicolor/1024x1024/apps/calligrakarbon.png
-usr/share/icons/hicolor/128x128/apps/calligrakarbon.png
-usr/share/icons/hicolor/16x16/apps/calligrakarbon.png
-usr/share/icons/hicolor/22x22/apps/calligrakarbon.png
-usr/share/icons/hicolor/256x256/apps/calligrakarbon.png
-usr/share/icons/hicolor/32x32/apps/calligrakarbon.png
-usr/share/icons/hicolor/48x48/apps/calligrakarbon.png
-usr/share/icons/hicolor/512x512/apps/calligrakarbon.png
-usr/share/icons/hicolor/64x64/apps/calligrakarbon.png
+usr/share/icons/hicolor/*/apps/calligrakarbon.png
usr/share/icons/hicolor/scalable/apps/calligrakarbon.svgz
usr/share/kde4/apps/karbon
usr/share/kde4/config/karbonrc
diff --git a/debian/kexi-data.install b/debian/kexi-data.install
index 808fca1..afb87b1 100644
--- a/debian/kexi-data.install
+++ b/debian/kexi-data.install
@@ -1,13 +1,5 @@
usr/share/doc/kde/HTML/en/kexi
-usr/share/icons/hicolor/1024x1024/apps/calligrakexi.png
-usr/share/icons/hicolor/128x128/apps/calligrakexi.png
-usr/share/icons/hicolor/16x16/apps/calligrakexi.png
-usr/share/icons/hicolor/22x22/apps/calligrakexi.png
-usr/share/icons/hicolor/256x256/apps/calligrakexi.png
-usr/share/icons/hicolor/32x32/apps/calligrakexi.png
-usr/share/icons/hicolor/48x48/apps/calligrakexi.png
-usr/share/icons/hicolor/512x512/apps/calligrakexi.png
-usr/share/icons/hicolor/64x64/apps/calligrakexi.png
+usr/share/icons/hicolor/*/apps/calligrakexi.png
usr/share/icons/hicolor/scalable/apps/calligrakexi.svgz
usr/share/kde4/apps/kexi
usr/share/kde4/config/kexirc
diff --git a/debian/krita-data.install b/debian/krita-data.install
index 96efeb6..453350a 100644
--- a/debian/krita-data.install
+++ b/debian/krita-data.install
@@ -1,14 +1,6 @@
usr/share/appdata/krita.appdata.xml
usr/share/color/icc/krita/
-usr/share/icons/hicolor/1024x1024/apps/calligrakrita.png
-usr/share/icons/hicolor/128x128/apps/calligrakrita.png
-usr/share/icons/hicolor/16x16/apps/calligrakrita.png
-usr/share/icons/hicolor/22x22/apps/calligrakrita.png
-usr/share/icons/hicolor/256x256/apps/calligrakrita.png
-usr/share/icons/hicolor/32x32/apps/calligrakrita.png
-usr/share/icons/hicolor/48x48/apps/calligrakrita.png
-usr/share/icons/hicolor/512x512/apps/calligrakrita.png
-usr/share/icons/hicolor/64x64/apps/calligrakrita.png
+usr/share/icons/hicolor/*/apps/calligrakrita.png
usr/share/icons/hicolor/scalable/apps/calligrakrita.svgz
usr/share/kde4/apps/calligra/icons/hicolor/128x128/actions/template_DIN_A3_landscape.png
usr/share/kde4/apps/calligra/icons/hicolor/128x128/actions/template_DIN_A4_portrait.png
diff --git a/debian/krita-gemini.install b/debian/krita-gemini.install
index a4d0361..c9ea182 100644
--- a/debian/krita-gemini.install
+++ b/debian/krita-gemini.install
@@ -1,6 +1,5 @@
usr/bin/kritagemini
usr/share/applications/kde4/kritagemini.desktop
-usr/share/kde4/apps/kritagemini/input/kritadefault.profile
-usr/share/kde4/apps/kritagemini/kritagemini.qml
+usr/share/kde4/apps/kritagemini/
usr/share/kde4/config/kritageminipanelsrc
usr/share/kde4/config/kritageminirc
diff --git a/debian/krita-sketch.install b/debian/krita-sketch.install
index 5fb1be3..980f69a 100644
--- a/debian/krita-sketch.install
+++ b/debian/krita-sketch.install
@@ -3,6 +3,5 @@ usr/lib/*/calligra/imports/org/krita/sketch/
usr/lib/libkritasketchlib.so
usr/share/applications/kde4/kritasketch.desktop
usr/share/kde4/apps/kritasketch/
-usr/share/kde4/apps/kritasketch/kritasketch.qml
usr/share/kde4/config/kritasketchpanelsrc
usr/share/kde4/config/kritasketchrc
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list