--- akonadi-1.0.0.orig/KUBUNTU-DEBIAN-DIFFERENCES +++ akonadi-1.0.0/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,8 @@ +* Add mysql-server-5.0 as build dependency +* Add mysql-server-5.0 as dependency for akonadi-server +* Add kubuntu_01_mysqldakonadi.diff ensuring that akonadiserver uses + mysqld-akonadi instead of mysqld itself (to bypass apparmor) +* Hardlink mysqld to mysqld-akonadi (rules) +* Add apparmor profile for mysqld-akonadi (usr.sbin.mysqld-akonadi) + +libakonadiprivate0 suggests not recommends akonadi-server --- akonadi-1.0.0.orig/debian/akonadi-server.installgen +++ akonadi-1.0.0/debian/akonadi-server.installgen @@ -0,0 +1,6 @@ +# Install dbus XMLs to libakonadi-dev first +depends libakonadi-dev + +dst:usr/bin +dst:etc/ +dst:usr/share --- akonadi-1.0.0.orig/debian/copyright +++ akonadi-1.0.0/debian/copyright @@ -0,0 +1,97 @@ +This package was debianized by Sune Vuorela on +Fri, 24 april 2008 09:49:34 +0200. + +It was downloaded from http://download.akonadi-project.org/ + +Copyright: © 2006-2008 Volker Krause +Copyright: © 2006-2008 Tobias Koenig +Copyright: © 2006 Till Adam +Copyright: © 2007 Robert Zwerus +Copyright: © 2006-2007 David Faure +Copyright: © 2007 Will Stephenson +Copyright: © 2006, 2008 Alexander Neundorf +Copyright: © 2006 Andreas Gungl +Copyright: © 2006 Ingo Kloecker +Copyright: © 2007-2008 Kevin Krammer +Copyright: © 2000 Timo Hummel +Copyright: © 2000 Tom Braun +Copyright: © 2002 Kitware, Inc., Insight Consortium. All Rights Reserved. +Copyright: © 2006 Allen Winter +Copyright: © 2007 Pino Toscano +Copyright: © 2007 Christian Schaarschmidt + + +Upstream authors: + + Main Authors: + - Volker Krause + - Till Adam + - Tobias Koenig + - Kevin Krammer + + Contributors: + - Alexander Neundorf + - Allen Winter + - Andreas Gungl + - Christian Schaarschmidt + - David Faure + - Ingo Kloecker + - Kitware, Inc., Insight Consortium. + - Laurent Montel + - Matthias Kretz + - Pino Toscano + - Robert Zwerus + - Timo Hummel + - Will Stephenson + +Some cmake modules references a nonexistant file. That file is in kdelibs +source package and in cmake source package with the following content: + + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +The rest is according to the file lgpl-license: + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Library General +Public License can be found in `/usr/share/common-licenses/LGPL-2-1'. + +The Debian packaging is © 2008, Debian Qt/KDE Maintainers and +is licensed under the same license as the software, LGPL-2-1, see above. --- akonadi-1.0.0.orig/debian/akonadi-server.postinst +++ akonadi-1.0.0/debian/akonadi-server.postinst @@ -0,0 +1,26 @@ +#! /bin/sh + +set -e + +case "$1" in + configure) + if [ -x /etc/init.d/apparmor ]; then + invoke-rc.d apparmor force-reload || true + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + + --- akonadi-1.0.0.orig/debian/control +++ akonadi-1.0.0/debian/control @@ -0,0 +1,65 @@ +Source: akonadi +Section: libs +Priority: extra +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Uploaders: Sune Vuorela , Modestas Vainius , + Ana Beatriz Guerrero Lopez +Build-Depends: cdbs (>= 0.4.51), debhelper (>= 5), cmake (>= 2.6.0~), automoc, quilt, + libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient15-dev, + libxslt-dev, libsoprano-dev (>= 2.0.98), xsltproc, libdbus-1-dev, mysql-server-5.0 +Standards-Version: 3.7.3 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/akonadi +Vcs-Svn: svn://svn.debian.org/pkg-kde/branches/kde4/packages/akonadi +Homepage: http://pim.kde.org/akonadi + +Package: libakonadiprivate1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: akonadi-server +Conflicts: kdepimlibs5 (<< 4:4.0.84) +Description: libraries 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 private libraries used by the Akonadi PIM storage + service. + +Package: akonadi-dbg +Section: libdevel +Architecture: any +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 +Depends: ${shlibs:Depends}, ${misc:Depends}, libakonadiprivate1 (= ${binary:Version}) +Replaces: kdepimlibs-data (<= 4:4.0.68+svn794641-1), kdepimlibs5-dev (<= 4:4.0.68+svn794641-1) +Suggests: pkg-config +Description: development files 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 development files for building software that uses the + Akonadi PIM storage service. + +Package: akonadi-server +Section: net +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-server, libqt4-sql-mysql, mysql-server-5.0 +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. --- akonadi-1.0.0.orig/debian/akonadi-dbg.lintian +++ akonadi-1.0.0/debian/akonadi-dbg.lintian @@ -0,0 +1 @@ +akonadi-dbg: dbg-package-missing-depends akonadi --- akonadi-1.0.0.orig/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ akonadi-1.0.0/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,7 @@ +* Add mysql-server-5.0 as build dependency +* Add mysql-server-5.0 as dependency for akonadi-server +* Add kubuntu_01_mysqldakonadi.diff ensuring that akonadiserver uses + mysqld-akonadi instead of mysqld itself (to bypass apparmor) +* Hardlink mysqld to mysqld-akonadi (rules) +* Add apparmor profile for mysqld-akonadi (usr.sbin.mysqld-akonadi) +* Add pre and postinst scripts for akonadi-server --- akonadi-1.0.0.orig/debian/libakonadi-dev.installgen +++ akonadi-1.0.0/debian/libakonadi-dev.installgen @@ -0,0 +1,4 @@ +dst:usr/include +dst:usr/lib/.*\.so$ +dst:usr/share/dbus.*/interfaces/.*\.xml$ +dst:.*\.pc$ --- akonadi-1.0.0.orig/debian/compat +++ akonadi-1.0.0/debian/compat @@ -0,0 +1 @@ +5 --- akonadi-1.0.0.orig/debian/usr.sbin.mysqld-akonadi +++ akonadi-1.0.0/debian/usr.sbin.mysqld-akonadi @@ -0,0 +1,17 @@ +# vim:syntax=apparmor +# Last Modified: Thu Jun 26 14:53:42 2008 +#include + +/usr/sbin/mysqld-akonadi { + #include + #include + #include + + capability setgid, + capability setuid, + + /usr/sbin/mysqld-akonadi mr, + /usr/share/mysql/** r, + + @{HOME}/.local/share/akonadi/** rwk, +} --- akonadi-1.0.0.orig/debian/libakonadiprivate1.lintian +++ akonadi-1.0.0/debian/libakonadiprivate1.lintian @@ -0,0 +1 @@ +libakonadiprivate1: package-name-doesnt-match-sonames libakonadiprivate1 libakonadiprotocolinternals1 --- akonadi-1.0.0.orig/debian/libakonadi-dev.install +++ akonadi-1.0.0/debian/libakonadi-dev.install @@ -0,0 +1,21 @@ +usr/include/akonadi/private/akonadiprotocolinternals_export.h +usr/include/akonadi/private/imapparser_p.h +usr/include/akonadi/private/imapset_p.h +usr/include/akonadi/private/notificationmessage_p.h +usr/include/akonadi/private/protocol_p.h +usr/include/akonadi/private/xdgbasedirs_p.h +usr/lib/libakonadiprivate.so +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.ControlManager.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.Search.xml +usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.SearchQuery.xml +usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.SearchQueryIterator.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 --- akonadi-1.0.0.orig/debian/rules +++ akonadi-1.0.0/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f +THIS_SHOULD_GO_TO_UNSTABLE=1 + +DEB_CONFIG_INSTALL_DIR = /etc +DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate0 := -V'libakonadiprivate1 (>= 1.0.0)' + +DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld + +DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld-akonadi + +include debian/cdbs/kde.mk + +binary-install/akonadi-server:: + install -p -D debian/usr.sbin.mysqld-akonadi \ + debian/akonadi-server/etc/apparmor.d/usr.sbin.mysqld-akonadi + mkdir debian/akonadi-server/usr/sbin + ln /usr/sbin/mysqld \ + debian/akonadi-server/usr/sbin/mysqld-akonadi --- akonadi-1.0.0.orig/debian/libakonadiprivate1.install +++ akonadi-1.0.0/debian/libakonadiprivate1.install @@ -0,0 +1,4 @@ +usr/lib/libakonadiprivate.so.1 +usr/lib/libakonadiprivate.so.1.* +usr/lib/libakonadiprotocolinternals.so.1 +usr/lib/libakonadiprotocolinternals.so.1.* --- akonadi-1.0.0.orig/debian/changelog +++ akonadi-1.0.0/debian/changelog @@ -0,0 +1,190 @@ +akonadi (1.0.0-2ubuntu2) jaunty; urgency=low + + * Remove kubuntu_01_mysqldakonadi.diff, + set -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld-akonadi + + -- Jonathan Riddell Wed, 05 Nov 2008 19:57:19 +0000 + +akonadi (1.0.0-2ubuntu1) jaunty; urgency=low + + * Merge with Debian, remaining changes: + - Make akonadi-server depend on libqt4-sql-mysql + - Add mysql-server-5.0 as build dependency + - Add mysql-server-5.0 as dependency for akonadi-server + - Add kubuntu_01_mysqldakonadi.diff ensuring that akonadiserver uses + mysqld-akonadi instead of mysqld itself (to bypass apparmor) + - Hardlink mysqld to mysqld-akonadi (rules) + - Add apparmor profile for mysqld-akonadi (usr.sbin.mysqld-akonadi) + - Add pre and postinst scripts for akonadi-server + + -- Jonathan Riddell Wed, 05 Nov 2008 16:35:03 +0000 + +akonadi (1.0.0-2) unstable; urgency=low + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Make libakonadi-dev depend on libakonadiprivate1 instead of + libakonadiprivate0. + + +++ Changes by Sune Vuorela: + + * Copyright file. Thanks Thomas. + + -- Debian Qt/KDE Maintainers Thu, 24 Jul 2008 16:35:45 +0200 + +akonadi (1.0.0-1) unstable; urgency=low + + * New upstream release. + + +++ Changes by Modestas Vainius: + + * Update debian/copyright: download URL and copyright/license check. + * libakonadiprivate SONAME was changed to 1. Rename library package, update + debian/libakonadiprivate* files, update control and rules. + * Make akonadi-server depend on mysql-server. + * libakonadiprivate suggests akonadi-server instead of Recommends. + + -- Debian Qt/KDE Maintainers Wed, 23 Jul 2008 20:27:52 +0300 + +akonadi (0.82.0-1) unstable; urgency=low + + * New upstream snapshot. + * Protocol changed in akonadi, add appropriate conflicts. + * Hardcode mysqld path in debian/rules. + + -- Sune Vuorela Fri, 27 Jun 2008 19:30:34 +0200 + +akonadi (1.0.0-0ubuntu5) intrepid; urgency=low + + * Reprofile mysqld-akonadi (LP: #280404) + + -- Harald Sitter Thu, 09 Oct 2008 16:20:47 +0200 + +akonadi (1.0.0-0ubuntu4) intrepid; urgency=low + + * Fix duplicated variable in akonadiserver apparmor profile + (LP: #271643) + + -- Steve Beattie Mon, 06 Oct 2008 20:53:43 -0700 + +akonadi (1.0.0-0ubuntu3) intrepid; urgency=low + + * Apparmor shouldn't hate akonadiserver when it tries to create directories + (also add locking permissions in case it's necessary some day) + * Make the Apparmor profile also work as root + * Add postinst and postrm for akonadi-server, invoking an apparmor reload to + get immediate access permissions for the daemon + + -- Harald Sitter Fri, 05 Sep 2008 16:44:44 +0200 + +akonadi (1.0.0-0ubuntu2) intrepid; urgency=low + + * Add akonadi-server dependency on libqt4-sql-mysql + + -- Harald Sitter Tue, 19 Aug 2008 00:05:05 +0200 + +akonadi (1.0.0-0ubuntu1) intrepid; urgency=low + + * New upstream release + * libakonadiprivate0 -> libakonadiprivate1 + + -- Harald Sitter Thu, 24 Jul 2008 02:21:18 +0200 + +akonadi (0.82.0-0ubuntu3) intrepid; urgency=low + + * libakonadiprivate0 suggests not recommends akonadi-server + + -- Jonathan Riddell Fri, 18 Jul 2008 09:31:54 +0100 + +akonadi (0.82.0-0ubuntu2) intrepid; urgency=low + + * Add mysql-server-5.0 as build dependency + * Add mysql-server-5.0 as dependency for akonadi-server + * Add kubuntu_01_mysqldakonadi.diff ensuring that akonadiserver uses + mysqld-akonadi instead of mysqld itself (to bypass apparmor) + * Hardlink mysqld to mysqld-akonadi + * Add apparmor profile for mysqld-akonadi + * Bump Standards-Version to 3.8.0 + + -- Harald Sitter Thu, 26 Jun 2008 14:48:49 +0200 + +akonadi (0.82.0-0ubuntu1) intrepid; urgency=low + + * New upstream beta release + + -- Jonathan Riddell Thu, 19 Jun 2008 14:03:43 +0000 + +akonadi (0.81.0+svn814221-1) UNRELEASED; urgency=low + + * New upstream development snapshot. + + -- Debian Qt/KDE Maintainers Tue, 03 Jun 2008 20:10:37 +0200 + +akonadi (0.81.0-1) experimental; urgency=low + + * New upstream snapshot. + + -- Debian Qt/KDE Maintainers Thu, 22 May 2008 11:22:26 +0200 + +akonadi (0.80.0+svn807399-1) experimental; urgency=low + + * New upstream development snapshot: + - The latest upstream commit is r807399 by qbast + - Date: Tue May 13 19:03:19 2008 UTC + + -- Debian Qt/KDE Maintainers Fri, 16 May 2008 12:23:43 +0200 + +akonadi (0.80.0+svn804999-1) experimental; urgency=low + + * New upstream development snapshot: + - The latest upstream commit is r804999 by mlaurent + - Date: Wed May 7 10:59:48 2008 UTC + + +++ Changes by Modestas Vainius: + + * Corrections to *.install files: + - libakonadi-dev.install: 12 new file(s) added; 12 file(s) removed; + - akonadi-server.install: 1 new file(s) added; 1 file(s) removed; + + -- Debian Qt/KDE Maintainers Mon, 05 May 2008 21:13:37 +0300 + +akonadi (0.80.0+svn802602-1) experimental; urgency=low + + * New upstream development snapshot: + - The latest upstream commit is r802602 by toma + - Date: Wed, 30 Apr 2008 08:45:32 -0000 + + +++ Changes by Sune Vuorela + + * Update debian/copyright. + + +++ Changes by Modestas Vainius: + + * Build depend on automoc. + * Add akonadi.pc, suggest pkg-config. + + +++ Changes by Armin Berres: + + * Add replaces to libakonadi-dev, to make it possible to install it before + upgrading kdepimlibs. + + -- Debian Qt/KDE Maintainers Wed, 30 Apr 2008 11:40:52 +0300 + +akonadi (0.80.0-1) experimental; urgency=low + + +++ Changes by Sune Vuorela: + + * Initial packaging. + * Split from unuploaded kdepim. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Rework descriptions and add Homepage field. + + +++ Changes by Modestas Vainius: + + * Patch FindQt4.cmake to make X11 optional. + * Add myself to uploaders. + * Add installgen files. + + -- Debian Qt/KDE Maintainers Fri, 25 Apr 2008 16:29:05 +0300 --- akonadi-1.0.0.orig/debian/akonadi-server.install +++ akonadi-1.0.0/debian/akonadi-server.install @@ -0,0 +1,6 @@ +etc/akonadi/mysql-global.conf +usr/bin/akonadi_control +usr/bin/akonadictl +usr/bin/akonadiserver +usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service +usr/share/mime/packages/akonadi-mime.xml --- akonadi-1.0.0.orig/debian/akonadi-server.postrm +++ akonadi-1.0.0/debian/akonadi-server.postrm @@ -0,0 +1,20 @@ +#! /bin/sh + +set -e + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + if [ -x /etc/init.d/apparmor ]; then + invoke-rc.d apparmor force-reload || true + fi + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +#DEBHELPER# + +exit 0 --- akonadi-1.0.0.orig/debian/libakonadiprivate1.installgen +++ akonadi-1.0.0/debian/libakonadiprivate1.installgen @@ -0,0 +1 @@ +dst:usr/lib/.*\.so\. --- akonadi-1.0.0.orig/debian/cdbs/versions.mk +++ akonadi-1.0.0/debian/cdbs/versions.mk @@ -0,0 +1,14 @@ + +CDBS_MIN_VER:=0.4.52 +QUILT_MIN_VER:=0.40 +CMAKE_MIN_VER:=2.4.8 + + +KDELIBS_VERSION:=$(shell dpkg -l kdelibs5 | grep kdelibs5 | awk '{print $$3}') +KDELIBS_SOURCE_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/+b.*//') +KDELIBS_UPSTREAM_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/-.*//') + +KDEPIMLIBS_VERSION:=$(shell dpkg -l kdepimlibs5 | grep kdepimlibs5 | awk '{print $$3}') +KDEPIMLIBS_SOURCE_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/+b.*//') +KDEPIMLIBS_UPSTREAM_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/-.*//') + --- akonadi-1.0.0.orig/debian/cdbs/control.mk +++ akonadi-1.0.0/debian/cdbs/control.mk @@ -0,0 +1,19 @@ +include debian/cdbs/versions.mk +debian/control: debian/control.tmp + mv debian/control.tmp debian/control + +debian/control.tmp: update-versions + +update-versions: debian/control.in + sed "s/CDBS_MIN_VER/$(CDBS_MIN_VER)/;\ + s/QUILT_MIN_VER/$(QUILT_MIN_VER)/;\ + s/CMAKE_MIN_VER/$(CMAKE_MIN_VER)/;\ + s/KDELIBS_VERSION/$(KDELIBS_VERSION)/;\ + s/KDELIBS_UPSTREAM_VERSION/$(KDELIBS_UPSTREAM_VERSION)/;\ + s/KDELIBS_SOURCE_VERSION/$(KDELIBS_SOURCE_VERSION)/;\ + s/KDEPIMLIBS_VERSION/$(KDEPIMLIBS_VERSION)/;\ + s/KDEPIMLIBS_SOURCE_VERSION/$(KDEPIMLIBS_SOURCE_VERSION)/;\ + s/KDEPIMLIBS_UPSTREAM_VERSION/$(KDEPIMLIBS_UPSTREAM_VERSION)/;\ + " debian/control.in > debian/control.tmp + +.PHONY: update-versions --- akonadi-1.0.0.orig/debian/cdbs/kde.mk +++ akonadi-1.0.0/debian/cdbs/kde.mk @@ -0,0 +1,73 @@ +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +# Include default KDE 4 cmake configuration variables +include debian/cdbs/variables.mk +# Pass standard KDE 4 flags to cmake via appropriate CDBS variable +# (DEB_CMAKE_EXTRA_FLAGS) +DEB_CMAKE_EXTRA_FLAGS += $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS) + +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +#DEB_CMAKE_PREFIX = /usr/lib/kde4 +DEB_DH_INSTALL_SOURCEDIR = debian/tmp +#DEB_DH_SHLIBDEPS_ARGS = -l/usr/lib/kde4/lib/ +DEB_KDE_ENABLE_FINAL ?= +#DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share +#DEB_STRIP_EXCLUDE = so + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +clean:: +ifndef THIS_SHOULD_GO_TO_UNSTABLE + #guard against experimental uploads to unstable + dpkg-parsechangelog | grep ^Distribution | grep -q 'experimental\|UNRELEASED' +endif + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -f CMakeCache.txt + + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + meinproc4 $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + done + + +# Process "sameVersionDep:" substvars +DH_SAMEVERSIONDEPS=debian/cdbs/dh_sameversiondeps +common-binary-predeb-arch common-binary-predeb-indep:: + @if [ ! -x "$(DH_SAMEVERSIONDEPS)" ]; then chmod a+x "$(DH_SAMEVERSIONDEPS)"; fi + $(DH_SAMEVERSIONDEPS) --- akonadi-1.0.0.orig/debian/cdbs/dh_sameversiondeps +++ akonadi-1.0.0/debian/cdbs/dh_sameversiondeps @@ -0,0 +1,140 @@ +#!/usr/bin/perl -w + +use strict; +use Dpkg::Control; +use Dpkg::Substvars; +use Dpkg::ErrorHandling; +use File::Copy; + +use Debian::Debhelper::Dh_Lib; + +my $namespace = "sameVersionDep"; +my @fields = qw(Depends Recommends Suggests Enhances Pre-Depends); +my $re_fields = join("|", @fields); +my $re_pkgname = qr/[a-z0-9][a-z0-9+.-]*/; +my $re_oursubstvar = qr/\$\{($namespace:($re_pkgname):($re_pkgname)-($re_fields)-($re_pkgname))\}/; + +# Global substvars file +my $g_substvars = new Dpkg::Substvars; +$g_substvars->parse("debian/substvars") if (-r "debian/substvars"); + +sub Shlibsvars::new { + my ($cls, $package, $control, $substvars_file) = @_; + my $self = bless ( { + "package" => $package, + "control" => $control, + "file" => $substvars_file, + }, $cls); + $self->{substvars} = new Dpkg::Substvars; + if (-r $self->{file}) { + $self->{substvars}->parse($self->{file}); + } + return $self; +} + +sub Shlibsvars::get_fieldval { + my ($self, $field) = @_; + + my $pkg = $self->{control}->get_pkg_by_name($self->{package}); + return undef if (!defined $pkg || !exists $pkg->{$field}); + + # Turn of warnings for substvars runs + my $save_quiet = $Dpkg::ErrorHandling::quiet_warnings; + $Dpkg::ErrorHandling::quiet_warnings = 1; + + my $val = $pkg->{$field}; + $val = $self->{substvars}->substvars($val); + $val = $g_substvars->substvars($val); + + $Dpkg::ErrorHandling::quiet_warnings = $save_quiet; + return $val; +} + +sub Shlibsvars::extract_deps { + my ($self, $field, $deppkg) = @_; + + my $val = $self->get_fieldval($field); + return undef() unless defined $val; + + # Extract dependency fields we need + my @matched_deps; + for my $dep (split(/\s*,\s*/, $val)) { + if ($dep =~ /^\Q$deppkg\E(?:$|[\W])/) { + push @matched_deps, $dep; + } + } + return join(",", @matched_deps); +} + +sub write_substvar($$$$) { + my ($pkgname, $varname, $value, $substvars) = @_; + my @contents; + my $varset = 0; + + my $file = (-r $substvars) ? $substvars : "debian/substvars"; + if (-r $file) { + open(FILE, "<$file") or die "Unable to open substvars file '$file' for reading\n"; + while () { + if (!$varset && /^\s*\Q$varname=\E/) { + push @contents, "$varname=$value\n"; + $varset = 1; + } else { + push @contents, $_; + } + } + close(FILE); + } else { + # Fallback to default + $file = $substvars; + } + + open(FILE, ">$file.tmp") or die "Unable to open substvars file '$file.tmp' for writing\n"; + for (@contents) { + print FILE $_; + } + if (!$varset) { + print FILE "$varname=$value", "\n"; + } + close(FILE); + + File::Copy::move("$file.tmp", "$file"); +} + +init(); + +my $control = new Dpkg::Control; +my %shlibsvars; + +foreach my $package (@{$dh{DOPACKAGES}}) { + my $pkg_substvars = sprintf("debian/%ssubstvars", pkgext($package)); + my $pkg = $control->get_pkg_by_name($package); + + for my $fieldname (@fields) { + if (exists $pkg->{$fieldname}) { + my $fieldval = $pkg->{$fieldname}; + my $pkgname = $pkg->{Package}; + + while ($fieldval =~ m/\G.*?$re_oursubstvar/gs) { + my $varname = $1; + my $dep2add = $2; + my $basepkg = $3; + my $deptype = $4; + my $deppkg = $5; + + if (!exists $shlibsvars{$basepkg}) { + my $base_substvars = sprintf("debian/%ssubstvars", pkgext($basepkg)); + $shlibsvars{$basepkg} = new Shlibsvars($basepkg, $control, $base_substvars); + } + my $vars = $shlibsvars{$basepkg}; + my $deps = $vars->extract_deps($deptype, $deppkg); + $deps = "" unless($deps); + $deps =~ s/\b\Q$deppkg\E\b/$dep2add/g; + + # Write substvar for the package + write_substvar($pkgname, $varname, $deps, $pkg_substvars); + } + } + } +} + +exit 0 --- akonadi-1.0.0.orig/debian/cdbs/variables.mk +++ akonadi-1.0.0/debian/cdbs/variables.mk @@ -0,0 +1,49 @@ +# KDE 4 global configuration file installation directory +DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config + +# Standard Debian KDE 4 cmake flags +DEB_CMAKE_KDE4_FLAGS += \ + -DCMAKE_BUILD_TYPE=Debian \ + -DKDE4_ENABLE_FINAL=$(KDE4-ENABLE-FINAL) \ + -DKDE4_BUILD_TESTS=false \ + -DKDE_DISTRIBUTION_TEXT="Debian packages" \ + -DKDE_DEFAULT_HOME=.kde4 \ + -DCMAKE_SKIP_RPATH=true \ + -DKDE4_USE_ALWAYS_FULL_RPATH=false \ + -DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \ + -DDATA_INSTALL_DIR=/usr/share/kde4/apps \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \ + -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \ + -DLIB_INSTALL_DIR=/usr/lib \ + -DSYSCONF_INSTALL_DIR=/etc + +# Support building with enable final (disabled by default) +DEB_KDE_ENABLE_FINAL ?= +KDE4-ENABLE-FINAL := false +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(treat_me_gently_arches))) + KDE4-ENABLE-FINAL := $(if $(DEB_KDE_ENABLE_FINAL),true,false) + endif +endif + +#### Default additional (custom) cmake flags #### +DEB_CMAKE_CUSTOM_FLAGS ?= + +# Set the one below to something else than 'yes' to disable linking +# with --as-needed (on by default) +DEB_KDE_LINK_WITH_AS_NEEDED ?= yes +ifneq (,$(findstring yes, $(DEB_KDE_LINK_WITH_AS_NEEDED))) + ifeq (,$(findstring no-as-needed, $(DEB_BUILD_OPTIONS))) + DEB_KDE_LINK_WITH_AS_NEEDED := yes + DEB_CMAKE_CUSTOM_FLAGS += \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" + else + DEB_KDE_LINK_WITH_AS_NEEDED := no + endif +else + DEB_KDE_LINK_WITH_AS_NEEDED := no +endif --- akonadi-1.0.0.orig/debian/patches/series +++ akonadi-1.0.0/debian/patches/series @@ -0,0 +1 @@ +01_x11_not_required.diff --- akonadi-1.0.0.orig/debian/patches/01_x11_not_required.diff +++ akonadi-1.0.0/debian/patches/01_x11_not_required.diff @@ -0,0 +1,13 @@ +Index: b/cmake/modules/FindQt4.cmake +=================================================================== +--- a/cmake/modules/FindQt4.cmake ++++ b/cmake/modules/FindQt4.cmake +@@ -1341,7 +1341,7 @@ + IF(UNIX) + # on OS X X11 may not be required + IF (Q_WS_X11) +- FIND_PACKAGE(X11 REQUIRED) ++ FIND_PACKAGE(X11) + ENDIF (Q_WS_X11) + FIND_PACKAGE(Threads) + SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})