[SCM] Calligra suite packaging branch, master, updated. debian/2.4.3-2-360-gee8ce7f

[Adrien Grellier]

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

The following commit has been merged in the master branch:
commit eec086d757e93fd6f8eed8bb3cdec4cb8051e884
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Sun Apr 15 00:25:33 2012 +0200

    kexi: bundle sqlite driver into kexi package since it's the default minimum required driver.
---
 debian/control                    |   17 -----------------
 debian/kexi-sqlite-driver.install |    4 ----
 debian/kexi.install               |    4 ++++
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index c09e697..5979be0 100644
--- a/debian/control
+++ b/debian/control
@@ -188,23 +188,6 @@ Description: PostgreSQL support for kexi
  .
  This package is part of the Calligra Office Suite.
 
-Package: kexi-sqlite-driver
-Architecture: any
-Section: database
-Depends: ${misc:Depends}, ${shlibs:Depends}, kexi (= ${binary:Version})
-Breaks: kexi (<< 1:2.3.70)
-Replaces: kexi (<< 1:2.3.70)
-Description: SQLite support for kexi
- Kexi is an integrated data management application. It can be used for
- creating database schemas, inserting data, performing queries, and
- processing data. Forms can be created to provide a custom interface to
- your data. All database objects - tables, queries and forms - are stored
- in the database, making it easy to share data and design.
- .
- This package provides support for SQLite in Kexi.
- .
- This package is part of the Calligra Office Suite.
-
 Package: kexi-xbase-driver
 Architecture: any
 Section: database
diff --git a/debian/kexi-sqlite-driver.install b/debian/kexi-sqlite-driver.install
deleted file mode 100644
index 17de560..0000000
--- a/debian/kexi-sqlite-driver.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/kexi_sqlite3_dump
-usr/lib/kde4/kexidb_sqlite3_icu.so
-usr/lib/kde4/kexidb_sqlite3driver.so
-usr/share/kde4/services/kexidb_sqlite3driver.desktop
diff --git a/debian/kexi.install b/debian/kexi.install
index 2578f24..86bb6ee 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -1,4 +1,7 @@
 usr/bin/kexi
+usr/bin/kexi_sqlite3_dump
+usr/lib/kde4/kexidb_sqlite3_icu.so
+usr/lib/kde4/kexidb_sqlite3driver.so
 usr/lib/kde4/kexihandler_csv_importexport.so
 usr/lib/kde4/kexihandler_form.so
 usr/lib/kde4/kexihandler_migration.so
@@ -42,6 +45,7 @@ usr/share/doc/kde/HTML/en/kexi
 usr/share/kde4/apps/kexi
 usr/share/kde4/config/kexirc
 usr/share/kde4/services/kexi
+usr/share/kde4/services/kexidb_sqlite3driver.desktop
 usr/share/kde4/services/keximigrate_mdb.desktop
 usr/share/kde4/services/keximigrate_txt.desktop
 usr/share/kde4/services/kexirelationdesignshape.desktop

-- 
Calligra suite packaging