[SCM] Akonadi packaging branch, master, updated. debian/1.13.0-8-27-g15d9dd9
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Sep 5 22:19:01 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi.git;a=commitdiff;h=32cc213
The following commit has been merged in the master branch:
commit 32cc2138659ab82d97c12da9bf7b2c9306548601
Merge: b336ad5e22abda3cec5a3cdfad6875a2cb2e3936 015d075d47275cb793e1e093b4fdf27efceb1295
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sat Sep 5 14:53:36 2015 +0200
Merge remote-tracking branch 'origin/kubuntu_stable'
debian/.gitattributes | 1 -
debian/akonadi-backend-mysql.install | 6 +-
debian/akonadi-backend-sqlite.install | 2 +-
debian/akonadi-server.install | 2 +
debian/changelog | 872 +++++++++++++++++++
debian/control | 36 +-
debian/libakonadi-dev.dirs | 1 -
debian/libakonadi-dev.install | 30 -
debian/libakonadiprotocolinternals1.acc | 17 -
debian/libakonadiprotocolinternals1.install | 2 -
debian/libakonadiprotocolinternals1.symbols | 169 ----
debian/libkf5akonadiprivate5.install | 2 +
debian/libkf5akonadiprivate5.symbols | 1227 +++++++++++++++++++++++++++
debian/libkf5akonadiserver-dev.install | 4 +
debian/mysqld-akonadi | 3 +
debian/rules | 10 +-
debian/usr.sbin.mysqld-akonadi | 33 +
17 files changed, 2170 insertions(+), 247 deletions(-)
diff --cc debian/changelog
index 6e6e9e8,0eb2cdb..a8978b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,71 -1,62 +1,130 @@@
+ akonadi (4:15.08.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 26 Aug 2015 16:52:58 +0100
+
+ akonadi (4:15.07.90-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+ * new upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 18 Aug 2015 08:53:42 +0100
+
+akonadi (15.08.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (15.07.90).
+ * New upstream release (15.08.0).
+ * Remove upstream patches.
+ * Refresh patches.
+
+ -- Maximiliano Curia <maxy at debian.org> Sat, 05 Sep 2015 12:40:38 +0200
+
+akonadi (1.13.0-8) unstable; urgency=medium
+
+ * Team upload.
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Sat, 29 Aug 2015 00:41:28 +0200
+
+akonadi (1.13.0-7) unstable; urgency=medium
+
+ * Team upload.
+ * Removed some patches introduced in previous upload due to regressions
+ causing invalid SQL commands.
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Mon, 20 Jul 2015 12:30:32 +1000
+
+akonadi (1.13.0-6) unstable; urgency=medium
+
+ * Team upload.
+ * New "upstream-MOVEcomplete.patch" (fixes deadlock).
+ * Bunch of optimisation patches from upstream 1.13 branch.
+ * Install "akonadictl.1" man page.
+ * copyright: reviewed, converted to copyright-format-1.0 and updated.
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Mon, 20 Jul 2015 03:26:42 +1000
+
+akonadi (1.13.0-5) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream patches:
+ + upstream-use-QAtomicInt.patch
+ + upstream-prevent-QTimer-negative-interval.patch
+ * Initialise PSQL database with "--data-checksums" (Closes: #791807).
+ * Build-Depends: removed "mysql-server-core" (not needed on build time).
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Sun, 19 Jul 2015 20:31:33 +1000
+
+akonadi (1.13.0-4) unstable; urgency=medium
+
+ * Team upload.
+ * backend-mysql: depend on MySQL-5.6 or any MySQL flavour (Closes: #746651)
+ Depends:
+ - mysql-server-core-5.5 | mysql-server-core
+ + mysql-server-core-5.6 | virtual-mysql-server-core
+ * Standards-Version: 3.9.6.
+ * xs-testsuite-header-in-debian-control: removed "XS-Testsuite" header.
+ * Updated Vcs-Browser URL.
+ * Patches renamed to consistently end with ".patch".
+ * New patch to add PostgreSQL 9.4 search path (Closes: #791805).
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Mon, 13 Jul 2015 23:56:38 +1000
+
+akonadi (1.13.0-3) unstable; urgency=medium
+
+ * Team upload.
+ * Apply upstream_dont_leak_old_external_payload_files.patch which fixes a bug
+ that let old files be kept when they should be removed.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Tue, 30 Jun 2015 12:03:32 -0300
+
+ akonadi (1.13.0-2ubuntu5) wily; urgency=medium
+
+ * No change rebuild for boost1.58/libstdc++6.
+
+ -- Dimitri John Ledkov <dimitri.j.ledkov at linux.intel.com> Sun, 02 Aug 2015 11:57:02 +0100
+
+ akonadi (1.13.0-2ubuntu4) vivid; urgency=medium
+
+ * debian/rules: re-enable the override_dh_installinit target, disabled
+ in an earlier merge from debian. This allows dh-apparmor to create
+ the postinst for the akonadi-backend-mysql package, which creates
+ the missing part of that package's apparmor profile at install time
+ (LP: #1440501)
+
+ -- Steve Beattie <sbeattie at ubuntu.com> Wed, 15 Apr 2015 10:48:33 -0700
+
+ akonadi (1.13.0-2ubuntu3) vivid; urgency=medium
+
+ * Still prefer mysql 5.6, but allow any mysql implementation that provides
+ virtual-mysql-server-core and virtual-mysql-client-core
+ (LP: #1336005)
+ * Force dependency on akonadi-backend-mysql for akonadi-server.
+ (was accidentally dropped in the last debian merge)
+
+ -- Philip Muškovac <yofel at kubuntu.org> Wed, 15 Apr 2015 16:57:20 +0200
+
+ akonadi (1.13.0-2ubuntu2) vivid; urgency=medium
+
+ * Allow using mariadb 10.0 as backend for akonadi-backend-mysql
+ (LP: #1441119)
+
+ -- Philip Muškovac <yofel at kubuntu.org> Thu, 09 Apr 2015 18:25:44 +0200
+
+ akonadi (1.13.0-2ubuntu1) vivid; urgency=medium
+
+ * Merge from Debian unstable. Remaining changes:
+ - Add a mysqld-akonadi wrapper script.
+ - Add apparmor profile for mysqld-akonadi (usr.sbin.mysqld-akonadi).
+ - Make akonadi-backend-mysql depend on mysql-server-core-5.5 and
+ mysql-client-core-5.5 or *5.6 instead of mysql-server-core.
+ - Force dependency on akonadi-backend-mysql for akonadi-server.
+ - Keep debian/libakonadiprotocolinternals1.symbols from Ubuntu
+ - Add Kubuntu to the maintainers as we are moving to debian git.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 31 Oct 2014 14:50:27 +0000
+
akonadi (1.13.0-2) unstable; urgency=medium
[ Pino Toscano ]
diff --cc debian/control
index 80323f6,af95327..fc0f55a
--- a/debian/control
+++ b/debian/control
@@@ -20,9 -20,10 +20,9 @@@ Build-Depends: automoc
shared-mime-info (>= 0.20),
xsltproc
Standards-Version: 3.9.6
-XS-Testsuite: autopkgtest
Homepage: http://pim.kde.org/akonadi
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-req/akonadi.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-req/akonadi.git
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/akonadi.git
+ Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/akonadi.git
Package: akonadi-server
Section: net
@@@ -72,8 -66,9 +66,8 @@@ Description: development files for the
Package: akonadi-backend-mysql
Section: misc
Architecture: all
- Depends: libqt4-sql-mysql,
- mysql-server-core-5.6 | virtual-mysql-server-core,
+ Depends: libqt5sql5-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~)
diff --cc debian/rules
index f43b355,60e4630..37c63b9
--- a/debian/rules
+++ b/debian/rules
@@@ -10,10 -10,12 +10,14 @@@ include /usr/share/pkg-kde-tools/qt-kde
backend_packages = $(filter akonadi-backend-%,$(shell dh_listpackages))
override_dh_auto_configure:
- $(overridden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld \
- $(overridden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld-akonadi
++ $(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
--
Akonadi packaging
More information about the pkg-kde-commits
mailing list