[SCM] Akonadi packaging branch, master, updated. debian/1.9.2-1-2-ge500354

Pino Toscano pino at alioth.debian.org
Fri May 17 13:15:37 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git;a=commitdiff;h=e500354

The following commit has been merged in the master branch:
commit e500354dc42db798b67b8853a013691083566618
Author: Pino Toscano <pino at debian.org>
Date:   Fri May 17 15:15:09 2013 +0200

    fix the qt plugins install dir (#708007)
---
 debian/akonadi-backend-sqlite.install |    2 +-
 debian/changelog                      |    3 +++
 debian/rules                          |    1 +
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/akonadi-backend-sqlite.install b/debian/akonadi-backend-sqlite.install
index fcfb8b9..1bac970 100644
--- a/debian/akonadi-backend-sqlite.install
+++ b/debian/akonadi-backend-sqlite.install
@@ -1 +1 @@
-usr/lib/plugins/sqldrivers/libqsqlite3.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqlite3.so
diff --git a/debian/changelog b/debian/changelog
index 610e40a..978ec44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 akonadi (1.9.2-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Force the installation of the Qt plugins (such as qsqlite3) within Qt's
+    plugin directory. (Closes: #708007)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 17 May 2013 15:04:26 +0200
 
diff --git a/debian/rules b/debian/rules
index d593834..b33d327 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ backend_packages = $(filter akonadi-backend-%,$(shell dh_listpackages))
 
 override_dh_auto_configure:
 	$(overridden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld \
+	    -DINSTALL_QSQLITE_IN_QT_PREFIX=ON \
 	    -DCONFIG_INSTALL_DIR=/etc
 
 override_dh_installdocs:

-- 
Akonadi packaging



More information about the pkg-kde-commits mailing list