[SCM] Calligra suite packaging branch, experimental, updated. debian/2.6.4-1-13-g63d7193

Adrien Grellier adrien-guest at alioth.debian.org
Sat Jul 27 16:20:45 UTC 2013


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

The following commit has been merged in the experimental branch:
commit 9f87287bbbdf310507f4dc5dfa36d0f664a10c6a
Author: Adrien Grellier <perso at adrieng.fr>
Date:   Sat Jul 27 17:54:52 2013 +0200

    split kexi to kexi-data for arch-indep files
---
 debian/changelog         |    1 +
 debian/control           |   16 +++++++++++++++-
 debian/kexi-data.install |   24 ++++++++++++++++++++++++
 debian/kexi.install      |   24 ------------------------
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56e0980..7d3dce3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ calligra (1:2.7.0-0r1.1) UNRELEASED; urgency=low
   * change the priority from optional to extra (calligra-libs depends on
     extra packages)
   * update to my new official email address
+  * split kexi to kexi-data for arch-indep files
 
 
  -- Adrien Grellier <perso at adrieng.fr>  Sat, 27 Jul 2013 17:54:00 +0200
diff --git a/debian/control b/debian/control
index bdbaede..fcc8587 100644
--- a/debian/control
+++ b/debian/control
@@ -120,7 +120,8 @@ Package: kexi
 Architecture: any
 Section: database
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
-Suggests: kexi-calligrasheets-driver, kexi-mysql-driver, kexi-postgresql-driver, kexi-xbase-driver, kexi-sybase-driver
+Suggests: kexi-calligrasheets-driver, kexi-mysql-driver, kexi-postgresql-driver,
+ kexi-xbase-driver, kexi-sybase-driver, kexi-data (>= ${source:Version})
 Replaces: koffice-doc-html
 Conflicts: koffice-doc-html
 Homepage: http://www.calligra-suite.org/kexi/
@@ -139,6 +140,19 @@ Description: integrated database environment for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
+Package: kexi-data
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: kexi (<< 1:2.6.4-1~)
+Replaces: kexi (<< 1:2.6.4-1~)
+Description: data files for Kexi
+ This package contains architecture-independent data files for Kexi, the
+ database program shipped with the Calligra Suite.
+ .
+ See the kexi package for further information.
+ .
+ This package is part of the Calligra Suite.
+
 Package: kexi-calligrasheets-driver
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, kexi (= ${binary:Version}),
diff --git a/debian/kexi-data.install b/debian/kexi-data.install
new file mode 100644
index 0000000..f3b535e
--- /dev/null
+++ b/debian/kexi-data.install
@@ -0,0 +1,24 @@
+usr/share/applications/kde4/kexi.desktop
+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/scalable/apps/calligrakexi.svgz
+usr/share/kde4/apps/kexi
+usr/share/kde4/config/kexirc
+usr/share/kde4/services/kexi
+usr/share/kde4/services/keximigrate_mdb.desktop
+usr/share/kde4/services/keximigrate_txt.desktop
+usr/share/kde4/services/kexirelationdesignshape.desktop
+usr/share/kde4/services/kformdesigner/kformdesigner_containers.desktop
+usr/share/kde4/services/kformdesigner/kformdesigner_kexidbfactory.desktop
+usr/share/kde4/services/kformdesigner/kformdesigner_stdwidgets.desktop
+usr/share/kde4/servicetypes/kexihandler.desktop
+usr/share/kde4/servicetypes/keximigration_driver.desktop
+usr/share/kde4/servicetypes/widgetfactory.desktop
diff --git a/debian/kexi.install b/debian/kexi.install
index bcb098a..807180c 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -37,27 +37,3 @@ usr/lib/libkexiutils.so.12
 usr/lib/libkexiutils.so.12.0.0
 usr/lib/libkformdesigner.so.12
 usr/lib/libkformdesigner.so.12.0.0
-usr/share/applications/kde4/kexi.desktop
-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/scalable/apps/calligrakexi.svgz
-usr/share/kde4/apps/kexi
-usr/share/kde4/config/kexirc
-usr/share/kde4/services/kexi
-usr/share/kde4/services/keximigrate_mdb.desktop
-usr/share/kde4/services/keximigrate_txt.desktop
-usr/share/kde4/services/kexirelationdesignshape.desktop
-usr/share/kde4/services/kformdesigner/kformdesigner_containers.desktop
-usr/share/kde4/services/kformdesigner/kformdesigner_kexidbfactory.desktop
-usr/share/kde4/services/kformdesigner/kformdesigner_stdwidgets.desktop
-usr/share/kde4/servicetypes/kexihandler.desktop
-usr/share/kde4/servicetypes/keximigration_driver.desktop
-usr/share/kde4/servicetypes/widgetfactory.desktop

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list