diff -Nru akonadi-1.5.0/debian/changelog akonadi-1.5.0/debian/changelog --- akonadi-1.5.0/debian/changelog 2011-01-24 10:48:44.000000000 +0100 +++ akonadi-1.5.0/debian/changelog 2011-03-03 18:44:16.000000000 +0100 @@ -1,3 +1,12 @@ +akonadi (1.5.0-0ubuntu2) natty; urgency=low + + * Use a wrapper script instead of copying mysqld to mysqld-akonadi. + (LP: #728584) + - Update the AppArmor profile accordingly. + - Drop mysql-server-core-5.1 from build-deps. + + -- Felix Geyer Thu, 03 Mar 2011 18:06:42 +0100 + akonadi (1.5.0-0ubuntu1) natty; urgency=low * New upstream release @@ -180,6 +189,7 @@ [ Fathi Boudra ] * Bump Standards-Version to 3.8.4 (no changes needed). + -- Debian Qt/KDE Maintainers Sat, 30 Jan 2010 22:09:48 -0300 akonadi (1.3.0-0ubuntu1) lucid; urgency=low diff -Nru akonadi-1.5.0/debian/control akonadi-1.5.0/debian/control --- akonadi-1.5.0/debian/control 2011-01-24 10:48:31.000000000 +0100 +++ akonadi-1.5.0/debian/control 2011-03-03 18:03:48.000000000 +0100 @@ -7,8 +7,7 @@ Fathi Boudra Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.3.16), cmake (>= 2.6.2), automoc, pkg-kde-tools (>= 0.6.4), libqt4-dev (>= 4:4.7.0~beta1+git20100522), shared-mime-info, libmysqlclient-dev, - libxslt-dev, libsoprano-dev (>= 2.4.63), xsltproc, libdbus-1-dev, libboost-program-options1.42-dev, - mysql-server-core-5.1 + libxslt-dev, libsoprano-dev (>= 2.4.63), xsltproc, libdbus-1-dev, libboost-program-options1.42-dev Standards-Version: 3.8.4 Homepage: http://pim.kde.org/akonadi Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/akonadi/ubuntu diff -Nru akonadi-1.5.0/debian/KUBUNTU-DEBIAN-DIFFERENCES akonadi-1.5.0/debian/KUBUNTU-DEBIAN-DIFFERENCES --- akonadi-1.5.0/debian/KUBUNTU-DEBIAN-DIFFERENCES 2011-01-24 10:48:31.000000000 +0100 +++ akonadi-1.5.0/debian/KUBUNTU-DEBIAN-DIFFERENCES 2011-03-03 18:07:44.000000000 +0100 @@ -1,9 +1,7 @@ - - Build-depend on mysql-server-core-5.1 - Use versioned boost build-depends - - Copy mysqld to mysqld-akonadi (rules) + - Add a mysqld-akonadi wrapper script - Make akonadi-server depend on mysql-server-core-5.1 rather than mysql-server - Add apparmor profile for mysqld-akonadi (usr.sbin.mysqld-akonadi) - Add pre and postinst scripts for akonadi-server - - Keep kubuntu_01_fix_init.diff - Don't apply 02_hardcode_debian_mysqld_path.diff, we set it in our debian/rules file diff -Nru akonadi-1.5.0/debian/mysqld-akonadi akonadi-1.5.0/debian/mysqld-akonadi --- akonadi-1.5.0/debian/mysqld-akonadi 1970-01-01 01:00:00.000000000 +0100 +++ akonadi-1.5.0/debian/mysqld-akonadi 2011-03-03 18:05:26.000000000 +0100 @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/sbin/mysqld $@ diff -Nru akonadi-1.5.0/debian/rules akonadi-1.5.0/debian/rules --- akonadi-1.5.0/debian/rules 2011-01-24 10:48:31.000000000 +0100 +++ akonadi-1.5.0/debian/rules 2011-03-03 18:19:12.000000000 +0100 @@ -1,17 +1,12 @@ #!/usr/bin/make -f DEB_CONFIG_INSTALL_DIR = /etc -DEB_DH_MAKESHLIBS_ARGS_libakonadiprivate1 := -V +DEB_DH_MAKESHLIBS_ARGS_libakonadiprotocolinternals1 := -V DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES) -# Fix FTBFS on Kubuntu for armel. -ifeq ($(DEB_HOST_ARCH),armel) - CXXFLAGS += -Wa,-mimplicit-it=thumb -endif - include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk @@ -19,7 +14,7 @@ DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld-akonadi binary-install/akonadi-server:: - install -p -D debian/usr.sbin.mysqld-akonadi \ + install -m 644 -p -D debian/usr.sbin.mysqld-akonadi \ debian/akonadi-server/etc/apparmor.d/usr.sbin.mysqld-akonadi - mkdir debian/akonadi-server/usr/sbin - cp /usr/sbin/mysqld debian/akonadi-server/usr/sbin/mysqld-akonadi + install -m 755 -p -D debian/mysqld-akonadi \ + debian/akonadi-server/usr/sbin/mysqld-akonadi diff -Nru akonadi-1.5.0/debian/usr.sbin.mysqld-akonadi akonadi-1.5.0/debian/usr.sbin.mysqld-akonadi --- akonadi-1.5.0/debian/usr.sbin.mysqld-akonadi 2011-01-24 10:48:31.000000000 +0100 +++ akonadi-1.5.0/debian/usr.sbin.mysqld-akonadi 2011-03-03 18:05:08.000000000 +0100 @@ -1,23 +1,30 @@ # vim:syntax=apparmor -# Last Modified: Mon Apr 12 15:03:13 2010 + #include /usr/sbin/mysqld-akonadi { #include - #include - #include - capability setgid, - capability setuid, + /usr/sbin/mysqld-akonadi r, + /usr/sbin/mysqld cx, + + profile /usr/sbin/mysqld { + #include + #include + #include + + capability setgid, + capability setuid, - /etc/mysql/conf.d/ r, - /etc/mysql/conf.d/* r, - /etc/mysql/my.cnf r, + /etc/mysql/conf.d/ r, + /etc/mysql/conf.d/* r, + /etc/mysql/my.cnf r, - /sys/devices/system/cpu/ r, + /sys/devices/system/cpu/ r, - /usr/sbin/mysqld-akonadi mr, - /usr/share/mysql/** r, + /usr/sbin/mysqld mr, + /usr/share/mysql/** r, - @{HOME}/.local/share/akonadi/** rwk, + @{HOME}/.local/share/akonadi/** rwk, + } }