[SCM] akonadi1 packaging branch, kubuntu_wily_archive, updated. 628b438b5c68165d1bdc084096a7b42923238235
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Wed Sep 2 08:20:20 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/akonadi1.git;a=commitdiff;h=fd6edb9
The following commit has been merged in the kubuntu_wily_archive branch:
commit fd6edb9b9455ae8e93221650a88b76eb74faeff9
Author: Harald Sitter <sitter at kde.org>
Date: Wed Sep 2 10:17:00 2015 +0200
rename packages to akonadi1 and remove runtime packages
+ Rename all packages to reflect their association with akonadi1
+ Rip out all runtime packages (-server -backend-*) as we do not support
actually running the akonadi1 server
---
debian/akonadi-backend-mysql.install | 5 --
debian/akonadi-backend-sqlite.docs | 1 -
debian/akonadi-backend-sqlite.install | 1 -
debian/akonadi-server.install | 9 ---
debian/akonadi-server.manpages | 1 -
debian/changelog | 3 +
debian/control | 82 ++--------------------
.../{libakonadi-dev.dirs => libakonadi1-dev.dirs} | 0
...akonadi-dev.install => libakonadi1-dev.install} | 0
debian/mysqld-akonadi | 3 -
debian/rules | 13 +---
debian/usr.sbin.mysqld-akonadi | 33 ---------
12 files changed, 8 insertions(+), 143 deletions(-)
diff --git a/debian/akonadi-backend-mysql.install b/debian/akonadi-backend-mysql.install
deleted file mode 100644
index 59c5cf2..0000000
--- a/debian/akonadi-backend-mysql.install
+++ /dev/null
@@ -1,5 +0,0 @@
-
-debian/mysqld-akonadi /usr/sbin
-debian/usr.sbin.mysqld-akonadi /etc/apparmor.d
-etc/akonadi/mysql-global-mobile.conf
-etc/akonadi/mysql-global.conf
diff --git a/debian/akonadi-backend-sqlite.docs b/debian/akonadi-backend-sqlite.docs
deleted file mode 100644
index 13cc6a2..0000000
--- a/debian/akonadi-backend-sqlite.docs
+++ /dev/null
@@ -1 +0,0 @@
-README.sqlite
diff --git a/debian/akonadi-backend-sqlite.install b/debian/akonadi-backend-sqlite.install
deleted file mode 100644
index 1bac970..0000000
--- a/debian/akonadi-backend-sqlite.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlite3.so
diff --git a/debian/akonadi-server.install b/debian/akonadi-server.install
deleted file mode 100644
index fc94e23..0000000
--- a/debian/akonadi-server.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin/akonadi_agent_launcher
-usr/bin/akonadi_agent_server
-usr/bin/akonadi_control
-usr/bin/akonadi_rds
-usr/bin/akonadictl
-usr/bin/akonadiserver
-usr/bin/asapcat
-usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service
-usr/share/mime/packages/akonadi-mime.xml
diff --git a/debian/akonadi-server.manpages b/debian/akonadi-server.manpages
deleted file mode 100644
index 13cdaf4..0000000
--- a/debian/akonadi-server.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/*.1
diff --git a/debian/changelog b/debian/changelog
index ce70a9b..777e3a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ akonadi1 (1.13.0-8ubuntu1) UNRELEASED; urgency=medium
+ This is now a transitional source to allow kde4pimlibs applications to
install
+ Merge with debian unstable
+ + Rename all packages to reflect their association with akonadi1
+ + Rip out all runtime packages (-server -backend-*) as we do not support
+ actually running the akonadi1 server
-- Harald Sitter <sitter at kde.org> Wed, 02 Sep 2015 09:57:37 +0200
diff --git a/debian/control b/debian/control
index af44942..13783d6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: akonadi1
Section: libs
Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Debian/Kubuntu Krap Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Sune Vuorela <debian at pusling.com>,
Modestas Vainius <modax at debian.org>,
Fathi Boudra <fabo at debian.org>,
@@ -25,26 +25,9 @@ Homepage: http://pim.kde.org/akonadi
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/krap/akonadi1.git
Vcs-Git: git://anonscm.debian.org/pkg-kde/krap/akonadi1.git
-Package: akonadi-server
-Section: net
-Architecture: any
-Depends: akonadi-backend-mysql (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Suggests: akonadi-backend-mysql (= ${source:Version}),
- akonadi-backend-postgresql (= ${source:Version}),
- akonadi-backend-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: libakonadiprotocolinternals1
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: akonadi-server (= ${binary:Version})
Replaces: libakonadiprivate1 (<< 1.4.90)
Breaks: kdepim-runtime (<< 4:4.13), libakonadiprivate1 (<< 1.4.90)
Description: libraries for the Akonadi PIM storage service
@@ -54,7 +37,7 @@ Description: libraries for the Akonadi PIM storage service
.
This package contains libraries used by the Akonadi PIM storage service.
-Package: libakonadi-dev
+Package: libakonadi1-dev
Section: libdevel
Architecture: any
Depends: libakonadiprotocolinternals1 (= ${binary:Version}),
@@ -70,68 +53,11 @@ Description: development files for the Akonadi PIM storage service
This package contains development files for building software that uses the
Akonadi PIM storage service.
-Package: akonadi-backend-mysql
-Section: misc
-Architecture: all
-Depends: libqt4-sql-mysql,
- mysql-client-core-5.6 | virtual-mysql-client-core,
- mysql-server-core-5.6 | virtual-mysql-server-core,
- ${misc:Depends}
-Recommends: akonadi-server
-Replaces: akonadi-server (<< 1.3.60~)
-Breaks: akonadi-server (<< 1.3.60~)
-Description: MySQL 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 installs everything what's needed for Akonadi to work with MySQL
- as underlying data storage engine. By default, a local MySQL server instance
- will be started for each user. Alternatively, connection to an external MySQL
- database is supported as well.
-
-Package: akonadi-backend-postgresql
-Section: misc
-Architecture: all
-Depends: libqt4-sql-psql, ${misc:Depends}
-Recommends: akonadi-server, postgresql
-Replaces: akonadi-server (<< 1.3.60~)
-Breaks: akonadi-server (<< 1.3.60~)
-Description: PostgreSQL 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 installs everything what's needed for Akonadi to work with
- PostgreSQL as underlying data storage engine. By default, a local PostgreSQL
- server instance will be started for each user. Alternatively, connection to an
- external PostgreSQL database is supported as well.
-
-Package: akonadi-backend-sqlite
-Section: misc
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: akonadi-server
-Description: SQLite 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 installs everything what's needed for Akonadi to work with SQLite
- as underlying data storage engine. Since SQLite is an embedded database
- engine, a separate SQL server daemon is not necessary.
- .
- In addition, the package contains an improved QSql driver for SQLite named
- "QSQLite3". It can be used by any application that needs to access SQLite
- databases via standard Qt QSql framework.
-
-Package: akonadi-dbg
+Package: akonadi1-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: ${misc:Depends}
-Suggests: akonadi-server (= ${binary:Version})
+Depends: libakonadiprotocolinternals1 (= ${binary:Version}), ${misc:Depends}
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
diff --git a/debian/libakonadi-dev.dirs b/debian/libakonadi1-dev.dirs
similarity index 100%
rename from debian/libakonadi-dev.dirs
rename to debian/libakonadi1-dev.dirs
diff --git a/debian/libakonadi-dev.install b/debian/libakonadi1-dev.install
similarity index 100%
rename from debian/libakonadi-dev.install
rename to debian/libakonadi1-dev.install
diff --git a/debian/mysqld-akonadi b/debian/mysqld-akonadi
deleted file mode 100644
index a8dcd83..0000000
--- a/debian/mysqld-akonadi
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/sbin/mysqld $@
diff --git a/debian/rules b/debian/rules
index 4821a08..1393226 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,27 +7,16 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
-backend_packages = $(filter akonadi-backend-%,$(shell dh_listpackages))
-
override_dh_auto_configure:
$(overridden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld-akonadi \
-DINSTALL_QSQLITE_IN_QT_PREFIX=ON \
-DCONFIG_INSTALL_DIR=/etc
-override_dh_installinit:
- $(overridden_command)
- dh_apparmor -pakonadi-backend-mysql --profile-name=usr.sbin.mysqld-akonadi
-
-override_dh_installdocs:
- # Install README.Debian to backend packages
- $(overridden_command) -A -pakonadi-server $(foreach p,$(backend_packages),-p$(p)) debian/README.Debian
- $(overridden_command) --remaining-packages
-
override_dh_makeshlibs:
$(overridden_command) -V -- -c0
override_dh_strip:
- $(overridden_command) --dbg-package=akonadi-dbg
+ $(overridden_command) --dbg-package=akonadi1-dbg
override_dh_auto_test:
# Avoid tests extra build dependencies, check them with autopkgtests
diff --git a/debian/usr.sbin.mysqld-akonadi b/debian/usr.sbin.mysqld-akonadi
deleted file mode 100644
index cc74e2e..0000000
--- a/debian/usr.sbin.mysqld-akonadi
+++ /dev/null
@@ -1,33 +0,0 @@
-# vim:syntax=apparmor
-
-#include <tunables/global>
-
-/usr/sbin/mysqld-akonadi {
- #include <abstractions/base>
-
- /usr/sbin/mysqld-akonadi r,
- /usr/sbin/mysqld cx,
-
- profile /usr/sbin/mysqld {
- #include <abstractions/base>
- #include <abstractions/nameservice>
- #include <abstractions/user-tmp>
-
- capability setgid,
- capability setuid,
-
- /etc/mysql/conf.d/ r,
- /etc/mysql/conf.d/* r,
- /etc/mysql/my.cnf r,
-
- /sys/devices/system/cpu/ r,
-
- /usr/sbin/mysqld mr,
- /usr/share/mysql/** r,
-
- @{HOME}/.local/share/akonadi/** rwk,
-
- # Site-specific additions and overrides. See local/README for details.
- #include <local/usr.sbin.mysqld-akonadi>
- }
-}
--
akonadi1 packaging
More information about the pkg-kde-commits
mailing list