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

Dmitry Smirnov onlyjob at moszumanska.debian.org
Sat Sep 19 05:31:38 UTC 2015


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

The following commit has been merged in the master branch:
commit 52ff9a68ef669c8b03ae69246dbbf4f10e82a869
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Sep 19 15:29:06 2015 +1000

    Merge "calligragemini.install" into "calligra-gemini.install" and update the latter.
---
 debian/calligra-gemini.install | 11 +++++------
 debian/calligragemini.install  |  5 -----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/debian/calligra-gemini.install b/debian/calligra-gemini.install
index cb482ed..16f085f 100644
--- a/debian/calligra-gemini.install
+++ b/debian/calligra-gemini.install
@@ -1,9 +1,8 @@
 usr/bin/calligragemini
 usr/bin/calligrageminithumbnailhelper
-usr/lib/x86_64-linux-gnu/calligra/imports/Calligra/Gemini/
-usr/lib/x86_64-linux-gnu/calligra/imports/org/calligra/CalligraComponents/libcalligraqtquickcomponentsplugin.so
-usr/lib/x86_64-linux-gnu/calligra/imports/org/calligra/CalligraComponents/qmldir
+usr/lib/*/calligra/imports/Calligra/Gemini/
+usr/lib/*/calligra/imports/org/calligra/CalligraComponents/libcalligraqtquickcomponentsplugin.so
+usr/lib/*/calligra/imports/org/calligra/CalligraComponents/qmldir
 usr/share/applications/kde4/calligragemini.desktop
-usr/share/icons/hicolor/*/apps/calligragemini.png
-usr/share/kde4/apps/calligragemini/
-
+usr/share/icons/hicolor/*x*/apps/calligragemini.png
+usr/share/kde4/apps/calligragemini
diff --git a/debian/calligragemini.install b/debian/calligragemini.install
deleted file mode 100644
index b7dee60..0000000
--- a/debian/calligragemini.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/calligragemini
-usr/bin/calligrageminithumbnailhelper
-usr/share/applications/kde4/calligragemini.desktop
-usr/share/icons/hicolor/*x*/apps/calligragemini.png
-usr/share/kde4/apps/calligragemini

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list