rev 17543 - in branches/akonadi-trunk/debian: . patches
Modestas Vainius
modax at alioth.debian.org
Sun Mar 28 23:32:27 UTC 2010
Author: modax
Date: 2010-03-28 23:32:26 +0000 (Sun, 28 Mar 2010)
New Revision: 17543
Added:
branches/akonadi-trunk/debian/NEWS
branches/akonadi-trunk/debian/README.Debian
branches/akonadi-trunk/debian/akonadi-mysql.install
branches/akonadi-trunk/debian/akonadi-sqlite.install
Removed:
branches/akonadi-trunk/debian/patches/03_disable_usr_lib_install_rpath.diff
Modified:
branches/akonadi-trunk/debian/akonadi-server.install
branches/akonadi-trunk/debian/changelog
branches/akonadi-trunk/debian/control
branches/akonadi-trunk/debian/libakonadi-dev.install
branches/akonadi-trunk/debian/patches/02_hardcode_debian_mysqld_path.diff
branches/akonadi-trunk/debian/patches/series
Log:
* New upstream development snapshost.
* Add libsqlite3-dev to build depends. This build has support for SQLite
backend.
* Drop 03_disable_usr_lib_install_rpath.diff patch, no longer needed as
the problem was fixed upstream differently.
* Add new packages for multiple backend split:
- akonadi-mysql - a package which depends on the stuff needed for MySQL
backend (server and Qt module) and installs a configuration file
previously in akonadi-server.
- akonadi-sqlite - a package with improved SQLite driver that is needed for
Akonadi SQLite backend.
* Make akonadi-server on both backends with | relation preferring MySQL for
now. Also suggest both backends.
* Move akonadi-dbg to the end of debian/control.
* Update install files.
* Add NEWS and README.Debian about SQLite (and MySQL) backends.
Added: branches/akonadi-trunk/debian/NEWS
===================================================================
--- branches/akonadi-trunk/debian/NEWS (rev 0)
+++ branches/akonadi-trunk/debian/NEWS 2010-03-28 23:32:26 UTC (rev 17543)
@@ -0,0 +1,8 @@
+akonadi (1.3.60~svn1108044-0r1) UNRELEASED; urgency=low
+
+ Akonadi gained support for SQLite backend. In order to use it, install
+ akonadi-sqlite package and change General/Driver value to QSQLITE3 in your
+ ~/.config/akonadi/akonadiserverrc. Please consult
+ /usr/share/doc/akonadi-server/README.Debian for more information.
+
+ -- Modestas Vainius <modax at debian.org> Mon, 29 Mar 2010 02:16:30 +0300
Added: branches/akonadi-trunk/debian/README.Debian
===================================================================
--- branches/akonadi-trunk/debian/README.Debian (rev 0)
+++ branches/akonadi-trunk/debian/README.Debian 2010-03-28 23:32:26 UTC (rev 17543)
@@ -0,0 +1,17 @@
+Selecting Akonadi storage backend
+---------------------------------
+
+Akonadi has support for multiple backends for its cache and index storage. At
+the moment, the following backends are supported:
+
+* MySQL backend (default). Support for this backend is provided by the
+ akonadi-mysql package. The backend either starts MySQL Server instance with
+ privilegies of the user that started akonadiserver (no manual configuration
+ needed) or alternatively requires access to an already running MySQL server
+ (manual configuration required in akonadiserverrc). In order to use this
+ backend, set the value of the General/Driver option to QMYSQL in
+ ~/.config/akonadi/akonadiserverrc.
+
+* SQLite backend. Support for this backend is provided by the akonadi-sqlite
+ package. In order to use it, you will also need to set the value of the
+ General/Driver option to QSQLITE3 in ~/.config/akonadi/akonadiserverrc.
Added: branches/akonadi-trunk/debian/akonadi-mysql.install
===================================================================
--- branches/akonadi-trunk/debian/akonadi-mysql.install (rev 0)
+++ branches/akonadi-trunk/debian/akonadi-mysql.install 2010-03-28 23:32:26 UTC (rev 17543)
@@ -0,0 +1 @@
+etc/akonadi/mysql-global.conf
Modified: branches/akonadi-trunk/debian/akonadi-server.install
===================================================================
--- branches/akonadi-trunk/debian/akonadi-server.install 2010-03-28 23:27:33 UTC (rev 17542)
+++ branches/akonadi-trunk/debian/akonadi-server.install 2010-03-28 23:32:26 UTC (rev 17543)
@@ -1,5 +1,5 @@
-etc/akonadi/mysql-global.conf
usr/bin/akonadi_control
+usr/bin/akonadi_rds
usr/bin/akonadictl
usr/bin/akonadiserver
usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service
Added: branches/akonadi-trunk/debian/akonadi-sqlite.install
===================================================================
--- branches/akonadi-trunk/debian/akonadi-sqlite.install (rev 0)
+++ branches/akonadi-trunk/debian/akonadi-sqlite.install 2010-03-28 23:32:26 UTC (rev 17543)
@@ -0,0 +1 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlite3.so
Modified: branches/akonadi-trunk/debian/changelog
===================================================================
--- branches/akonadi-trunk/debian/changelog 2010-03-28 23:27:33 UTC (rev 17542)
+++ branches/akonadi-trunk/debian/changelog 2010-03-28 23:32:26 UTC (rev 17543)
@@ -1,3 +1,24 @@
+akonadi (1.3.60~svn1108044-0r2) UNRELEASED; urgency=low
+
+ * New upstream development snapshost.
+ * Add libsqlite3-dev to build depends. This build has support for SQLite
+ backend.
+ * Drop 03_disable_usr_lib_install_rpath.diff patch, no longer needed as
+ the problem was fixed upstream differently.
+ * Add new packages for multiple backend split:
+ - akonadi-mysql - a package which depends on the stuff needed for MySQL
+ backend (server and Qt module) and installs a configuration file
+ previously in akonadi-server.
+ - akonadi-sqlite - a package with improved SQLite driver that is needed for
+ Akonadi SQLite backend.
+ * Make akonadi-server on both backends with | relation preferring MySQL for
+ now. Also suggest both backends.
+ * Move akonadi-dbg to the end of debian/control.
+ * Update install files.
+ * Add NEWS and README.Debian about SQLite (and MySQL) backends.
+
+ -- Modestas Vainius <modax at debian.org> Mon, 29 Mar 2010 00:37:56 +0300
+
akonadi (1.3.1-2) unstable; urgency=low
[ Modestas Vainius ]
Modified: branches/akonadi-trunk/debian/control
===================================================================
--- branches/akonadi-trunk/debian/control 2010-03-28 23:27:33 UTC (rev 17542)
+++ branches/akonadi-trunk/debian/control 2010-03-28 23:32:26 UTC (rev 17543)
@@ -6,7 +6,8 @@
Fathi Boudra <fabo at debian.org>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), automoc, quilt, pkg-kde-tools (>= 0.6.4),
libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient-dev,
- libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev
+ libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev,
+ libsqlite3-dev
Standards-Version: 3.8.4
Homepage: http://pim.kde.org/akonadi
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/akonadi/#_trunk_packages_akonadi_
@@ -26,19 +27,6 @@
This package contains private libraries used by the Akonadi PIM storage
service.
-Package: akonadi-dbg
-Section: debug
-Architecture: any
-Depends: ${misc:Depends}
-Suggests: akonadi-server (= ${binary:Version})
-Description: debugging symbols for the Akonadi PIM storage service
- 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 contains debugging files used to investigate problems with
- the Akonadi PIM storage service.
-
Package: libakonadi-dev
Section: libdevel
Architecture: any
@@ -56,10 +44,54 @@
Package: akonadi-server
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-server, libqt4-sql-mysql
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ akonadi-mysql (= ${binary:Version}) | akonadi-sqlite (= ${binary:Version})
+Suggests: akonadi-mysql (= ${binary:Version}), akonadi-sqlite (= ${binary:Version})
Description: Akonadi PIM storage service
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 contains the Akonadi PIM storage server and associated programs.
+
+Package: akonadi-mysql
+Section: libs
+Architecture: all
+Depends: ${misc:Depends}, mysql-server, libqt4-sql-mysql
+Suggests: akonadi-server
+Replaces: akonadi-server (<< 1.3.60~)
+Description: Akonadi MySQL backend
+ 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 allows to use Akonadi with MySQL backend. It pulls in all
+ required dependencies including MySQL server.
+
+Package: akonadi-sqlite
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: akonadi-server
+Description: Akonadi SQLite backend
+ 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 contains advanced SQLite 3 module for Qt 4. It is primarily
+ intended to be used by akonadi-server as SQLite backend but it should also
+ be usable by other applications which implement database access via standard
+ Qt SQL framework.
+
+Package: akonadi-dbg
+Section: debug
+Architecture: any
+Depends: ${misc:Depends}
+Suggests: akonadi-server (= ${binary:Version})
+Description: debugging symbols for the Akonadi PIM storage service
+ 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 contains debugging files used to investigate problems with
+ the Akonadi PIM storage service.
Modified: branches/akonadi-trunk/debian/libakonadi-dev.install
===================================================================
--- branches/akonadi-trunk/debian/libakonadi-dev.install 2010-03-28 23:27:33 UTC (rev 17542)
+++ branches/akonadi-trunk/debian/libakonadi-dev.install 2010-03-28 23:32:26 UTC (rev 17543)
@@ -11,13 +11,13 @@
usr/lib/libakonadiprotocolinternals.so
usr/lib/pkgconfig/akonadi.pc
usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml
usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml
usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml
usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml
usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
Modified: branches/akonadi-trunk/debian/patches/02_hardcode_debian_mysqld_path.diff
===================================================================
--- branches/akonadi-trunk/debian/patches/02_hardcode_debian_mysqld_path.diff 2010-03-28 23:27:33 UTC (rev 17542)
+++ branches/akonadi-trunk/debian/patches/02_hardcode_debian_mysqld_path.diff 2010-03-28 23:32:26 UTC (rev 17543)
@@ -2,7 +2,7 @@
+++ b/server/CMakeLists.txt
@@ -1,5 +1,6 @@
--find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin )
+-find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin )
+# MySQLd can be found here on Debian systems
+set( MYSQLD_EXECUTABLE "/usr/sbin/mysqld" CACHE STRING "MySQL Server path" )
if( MYSQLD_EXECUTABLE)
Modified: branches/akonadi-trunk/debian/patches/series
===================================================================
--- branches/akonadi-trunk/debian/patches/series 2010-03-28 23:27:33 UTC (rev 17542)
+++ branches/akonadi-trunk/debian/patches/series 2010-03-28 23:32:26 UTC (rev 17543)
@@ -1,3 +1,2 @@
01_x11_not_required.diff
02_hardcode_debian_mysqld_path.diff
-03_disable_usr_lib_install_rpath.diff
More information about the pkg-kde-commits
mailing list