[SCM] Akonadi packaging branch, master, updated. debian/1.6.2-1-2-g70ac677

Sune Vuorela pusling-guest at alioth.debian.org
Tue Dec 20 23:02:29 UTC 2011


The following commit has been merged in the master branch:
commit 70ac677886b5301e29740c6238432d3abbb36f56
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Wed Dec 21 00:02:23 2011 +0100

    Kill the odbc package. It won't currently work.
---
 debian/README.Debian |   17 -----------------
 debian/changelog     |    2 ++
 debian/control       |   16 ----------------
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index a86a611..fc6d9fc 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -86,23 +86,6 @@ At the moment, the following backends are supported:
   CleanServerShutdownCommand= ; a command to shutdown internal server cleanly,
                               ; default is reasonable
 
-* ODBC backend provided by the akonadi-backend-odbc package. By default, it
-  backend will try to connect to the Virtuoso server instance which is started
-  by Nepomuk in the KDE environment.
-
-  This backend uses official QSql ODBC driver. The following configuration
-  options are available:
-
-  [General]
-  Driver=QODBC
-
-  [QODBC]
-  Name=     ; ODBC connection string, defaults to
-            ; host=localhost:1111;uid=dba;pwd=dba;driver=/opt/virtuoso/lib/virtodbc.so
-  User=     ; dabatase user name if not specified in the connection string
-  Password= ; database user password if not specified in the connection string
-  Options=  ; options, defaults to SQL_ATTR_ODBC_VERSION=SQL_OV_ODBC3
-
 * SQLite backend provided by the akonadi-backend-sqlite package. It uses
   embedded SQLite database hence it does not need a separate instance of the
   SQL server.
diff --git a/debian/changelog b/debian/changelog
index 8449b90..cfff1c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 akonadi (1.6.2-2) UNRELEASED; urgency=low
 
+  * Kill the odbc package. It won't currently work.
+
  -- Sune Vuorela <sune at debian.org>  Tue, 20 Dec 2011 23:59:21 +0100
 
 akonadi (1.6.2-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 3aea6af..3703755 100644
--- a/debian/control
+++ b/debian/control
@@ -88,22 +88,6 @@ Description: PostgreSQL storage backend for Akonadi
  server instance will be started for each user. Alternatively, connection to an
  external PostgreSQL database is supported as well.
 
-Package: akonadi-backend-odbc
-Section: misc
-Architecture: all
-Depends: ${misc:Depends}, libqt4-sql-odbc
-Suggests: akonadi-server, libvirtodbc0, virtuoso-minimal
-Provides: akonadi-backend-virtuoso
-Description: ODBC storage backend for Akonadi
- Akonadi is an extensible cross-desktop Personal Information Management (PIM)
- storage service. It provides a common framework for applications to store and
- access mail, calendars, addressbooks, and other PIM data.
- .
- This package install everything what's needed for Akonadi to work with
- external SQL servers that implements ODBC interface. By default, the backend
- attempts to connect to the Virtuoso SQL server instance that's typically
- started by Nepomuk in KDE environment.
-
 Package: akonadi-backend-sqlite
 Section: misc
 Architecture: any

-- 
Akonadi packaging



More information about the pkg-kde-commits mailing list